Skip to content

Commit 299a200

Browse files
committed
UnityExamples: Release v2.24.0
1 parent 9d01123 commit 299a200

48 files changed

Lines changed: 375 additions & 322 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

UnityPopcornFXExamples/Assets/Editor/PKFxDividerVariantEditor.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
//--------------------------------------------------------------------------------------------------------
2-
// Copyright Persistant Studios, SARL. All Rights Reserved. https://www.popcornfx.com/terms-and-conditions/
3-
//--------------------------------------------------------------------------------------------------------
1+
//----------------------------------------------------------------------------
2+
// Copyright Persistant Studios, SARL.
3+
// https://popcornfx.com/popcornfx-community-license/
4+
//----------------------------------------------------------------------------
45
using System.Collections;
56
using System.Collections.Generic;
67
using UnityEngine;

UnityPopcornFXExamples/Assets/Editor/PKFxRoomGeneratorEditor.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
//--------------------------------------------------------------------------------------------------------
2-
// Copyright Persistant Studios, SARL. All Rights Reserved. https://www.popcornfx.com/terms-and-conditions/
3-
//--------------------------------------------------------------------------------------------------------
1+
//----------------------------------------------------------------------------
2+
// Copyright Persistant Studios, SARL.
3+
// https://popcornfx.com/popcornfx-community-license/
4+
//----------------------------------------------------------------------------
45
using System.Collections;
56
using System.Collections.Generic;
67
using UnityEngine;

UnityPopcornFXExamples/Assets/Editor/PKFxStandVariantEditor.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
//--------------------------------------------------------------------------------------------------------
2-
// Copyright Persistant Studios, SARL. All Rights Reserved. https://www.popcornfx.com/terms-and-conditions/
3-
//--------------------------------------------------------------------------------------------------------
1+
//----------------------------------------------------------------------------
2+
// Copyright Persistant Studios, SARL.
3+
// https://popcornfx.com/popcornfx-community-license/
4+
//----------------------------------------------------------------------------
45
using System.Collections;
56
using System.Collections.Generic;
67
using UnityEngine;

UnityPopcornFXExamples/Assets/Materials/Grid/Cable/M_Cable.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ Material:
2828
- PK_HAS_EMISSIVE_BASIC
2929
- PK_HAS_TRANSFORM_UVS_ON
3030
m_InvalidKeywords:
31+
- PK_HAS_DIFFUSE
3132
- PK_HAS_DIFFUSE_MAP
3233
- PK_HAS_DIFFUSE_MAP_ON
34+
- PK_HAS_DIFFUSE_ON
3335
- PK_HAS_EMISSIVE_BASIC_ON
3436
- PK_HAS_LIGHTING
3537
- PK_HAS_LIGHTING_ON

UnityPopcornFXExamples/Assets/PopcornFXAssets/Content/ContentExamples/00_Fountain.pkfx.asset

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

UnityPopcornFXExamples/Assets/PopcornFXAssets/Content/ContentExamples/05_BasicEmitter.pkfx.asset

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

UnityPopcornFXExamples/Assets/PopcornFXAssets/Content/ContentExamples/06_Burst.pkfx.asset

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

UnityPopcornFXExamples/Assets/PopcornFXAssets/Content/ContentExamples/07_Localspace.pkfx.asset

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

UnityPopcornFXExamples/Assets/PopcornFXAssets/Content/ContentExamples/08_ParticleEvents.pkfx.asset

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

UnityPopcornFXExamples/Assets/PopcornFXAssets/Content/ContentExamples/08_ParticleEvents_SpawnedMesh.pkfx.asset

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)