tschesky/AppleHillsProduction
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into DamianBranch and solved conflicts

Browse Source
This commit is contained in:
Damian-Fools
2025-11-27 17:10:51 +01:00
parent 47b04ceebc
commit d1f1416025
54 changed files with 30903 additions and 30294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/External/Plugins/codeandweb.com/Editor/SettingsTexturePackerImporter.txt vendored
View File

@@ -6,12 +6,13 @@ tpsheetFileNames:
- Assets/Art/Animations/UI/Booster/booster_explode-booster_open3.tpsheet
- Assets/Art/Animations/UI/Booster/booster_explode-booster_open4.tpsheet
- Assets/Art/Levels/CementFactory/Sprites/cement_floortiles.tpsheet
- Assets/Art/Levels/CementFactory/Sprites/Tiles/cement_floortiles.tpsheet
- Assets/Art/Sprites/Spritesheets/Characters/Annelise_Camera/Annelise_camera-AnneLise_1.tpsheet
- Assets/Art/Sprites/Spritesheets/Characters/Annelise_Camera/Annelise_camera-AnneLise_2.tpsheet
- Assets/Art/Sprites/Spritesheets/Characters/Gardener/Gardener-IdleRun.tpsheet
- Assets/Art/Sprites/Spritesheets/Characters/Gardener/Gardener-Scared01.tpsheet
- Assets/Art/Sprites/Spritesheets/Characters/Pulver/pulver.tpsheet
- Assets/Art/Sprites/Spritesheets/Characters/Pulver/Pulver.tpsheet
- Assets/Art/Sprites/Spritesheets/Characters/Pulver/pulver.tpsheet
- Assets/Art/Sprites/Spritesheets/Characters/Pulver/Pulver_Carry_1.tpsheet
- Assets/Art/Sprites/Spritesheets/Characters/Pulver/Pulver_Carry_2.tpsheet
- Assets/Art/Sprites/Spritesheets/Characters/Pulver/Pulver_Carry_Idle_1.tpsheet
@@ -42,6 +43,7 @@ textureFileNames:
- Assets/Art/Animations/UI/Booster/booster_explode-booster_open3.png
- Assets/Art/Animations/UI/Booster/booster_explode-booster_open4.png
- Assets/Art/Levels/CementFactory/Sprites/cement_floortiles.png
- Assets/Art/Levels/CementFactory/Sprites/Tiles/cement_floortiles.png
- Assets/Art/Sprites/Spritesheets/Characters/Annelise_Camera/Annelise_camera-AnneLise_1.png
- Assets/Art/Sprites/Spritesheets/Characters/Annelise_Camera/Annelise_camera-AnneLise_2.png
- Assets/Art/Sprites/Spritesheets/Characters/Gardener/Gardener-IdleRun.png
@@ -106,5 +108,6 @@ normalmapFileNames:
-
-
-
-
- Assets/External/Plugins/codeandweb.com/Example/SpriteSheet/sprites_n.png
enableDebugOutput: 0