Merge branch 'develop' of...
Merge branch 'develop' of https://gitlab.informatika.org/just_loud_stuff/if3210-2024-unity-bug into feature/main-mnu
Showing
- Assets/Materials/Shop/Pet Image/Bomb.png 0 additions, 0 deletionsAssets/Materials/Shop/Pet Image/Bomb.png
- Assets/Materials/Shop/Pet Image/Cactus.png 0 additions, 0 deletionsAssets/Materials/Shop/Pet Image/Cactus.png
- Assets/Materials/Shop/Pet Image/DogKnight.png 0 additions, 0 deletionsAssets/Materials/Shop/Pet Image/DogKnight.png
- Assets/Materials/Shop/Pet Image/Ghost.png 0 additions, 0 deletionsAssets/Materials/Shop/Pet Image/Ghost.png
- Assets/Materials/Shop/Pet Image/Mushroom.png 0 additions, 0 deletionsAssets/Materials/Shop/Pet Image/Mushroom.png
- Assets/Materials/Shop/Pet Image/Rabbit.png 0 additions, 0 deletionsAssets/Materials/Shop/Pet Image/Rabbit.png
- Assets/Materials/StarMaterial.mat 110 additions, 200 deletionsAssets/Materials/StarMaterial.mat
- Assets/Models/Characters/BombCharacter/mon_00/materials.meta 1 addition, 1 deletionAssets/Models/Characters/BombCharacter/mon_00/materials.meta
- Assets/Models/Characters/BombCharacter/mon_00/textures.meta 1 addition, 1 deletionAssets/Models/Characters/BombCharacter/mon_00/textures.meta
- Assets/Models/Characters/DogKnight/Animator/DogControl.controller 77 additions, 385 deletions...odels/Characters/DogKnight/Animator/DogControl.controller
- Assets/Models/Characters/GhostCharacter_Free/Animators/AnimatorGhost.controller 59 additions, 119 deletions...rs/GhostCharacter_Free/Animators/AnimatorGhost.controller
- Assets/Models/Characters/Level 1 Monster Pack/Models/bat.controller 226 additions, 0 deletions...els/Characters/Level 1 Monster Pack/Models/bat.controller
- Assets/Models/Characters/Level 1 Monster Pack/Models/bat.controller.meta 8 additions, 8 deletions...haracters/Level 1 Monster Pack/Models/bat.controller.meta
- Assets/Models/Characters/Level 1 Monster Pack/Models/rabbit.controller 226 additions, 0 deletions.../Characters/Level 1 Monster Pack/Models/rabbit.controller
- Assets/Models/Characters/Level 1 Monster Pack/Models/rabbit.controller.meta 8 additions, 0 deletions...acters/Level 1 Monster Pack/Models/rabbit.controller.meta
- Assets/Models/Characters/RPG Monster DUO PBR Polyart/Animators/Slime.controller 112 additions, 790 deletions...rs/RPG Monster DUO PBR Polyart/Animators/Slime.controller
- Assets/Models/Characters/RPG Monster DUO PBR Polyart/Animators/TurtleShell.controller 117 additions, 899 deletions... Monster DUO PBR Polyart/Animators/TurtleShell.controller
- Assets/Models/Characters/RPGMonsterBuddiesPBRPA/Animation/Cactus/Cactus.controller 111 additions, 723 deletions...RPGMonsterBuddiesPBRPA/Animation/Cactus/Cactus.controller
- Assets/Models/Characters/RPGMonsterBuddiesPBRPA/Animation/Mushroom/MushroomSmile.controller 59 additions, 838 deletions...rBuddiesPBRPA/Animation/Mushroom/MushroomSmile.controller
- Assets/Models/Characters/RPGMonsterBuddiesPBRPA/Scene/PBR.unity 213 additions, 56 deletions.../Models/Characters/RPGMonsterBuddiesPBRPA/Scene/PBR.unity
Please register or sign in to comment