Merge branch 'develop' of...
Merge branch 'develop' of https://gitlab.informatika.org/just_loud_stuff/if3210-2024-unity-bug into feature/exit_button_on_save
Branches feature/exit_button_on_save
Tags
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/Dog.png 0 additions, 0 deletionsAssets/Materials/Shop/Pet Image/Dog.png
- Assets/Materials/Shop/Pet Image/Dog.png.meta 127 additions, 0 deletionsAssets/Materials/Shop/Pet Image/Dog.png.meta
- 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/Models/Characters/GhostCharacter_Free/Animators/AnimatorGhost.controller 9 additions, 9 deletions...rs/GhostCharacter_Free/Animators/AnimatorGhost.controller
- Assets/Models/Characters/Level 1 Monster Pack/Models/bat.controller 9 additions, 9 deletions...els/Characters/Level 1 Monster Pack/Models/bat.controller
- Assets/Models/Characters/Level 1 Monster Pack/Models/rabbit.controller 9 additions, 9 deletions.../Characters/Level 1 Monster Pack/Models/rabbit.controller
- Assets/Models/Characters/RPG Monster DUO PBR Polyart/Animators/Slime.controller 9 additions, 9 deletions...rs/RPG Monster DUO PBR Polyart/Animators/Slime.controller
- Assets/Models/Characters/RPG Monster DUO PBR Polyart/Animators/TurtleShell.controller 9 additions, 9 deletions... Monster DUO PBR Polyart/Animators/TurtleShell.controller
- Assets/_CompletedAssets/Animation/Pet/bombAnimation/Mon_00.controller 9 additions, 9 deletions...letedAssets/Animation/Pet/bombAnimation/Mon_00.controller
- Assets/_CompletedAssets/Animation/Pet/cactusAnimation/Cactus.controller 12 additions, 12 deletions...tedAssets/Animation/Pet/cactusAnimation/Cactus.controller
- Assets/_CompletedAssets/Animation/Pet/dogAnimation/Attack01.anim 36762 additions, 3 deletions..._CompletedAssets/Animation/Pet/dogAnimation/Attack01.anim
- Assets/_CompletedAssets/Prefabs/Pet/Attacker/CactusPBR.prefab 1 addition, 30 deletions...ts/_CompletedAssets/Prefabs/Pet/Attacker/CactusPBR.prefab
- Assets/_CompletedAssets/Prefabs/Pet/Attacker/DogPBR.prefab 1 addition, 30 deletionsAssets/_CompletedAssets/Prefabs/Pet/Attacker/DogPBR.prefab
- Assets/_CompletedAssets/Prefabs/Pet/Attacker/Mon_00.prefab 1 addition, 30 deletionsAssets/_CompletedAssets/Prefabs/Pet/Attacker/Mon_00.prefab
- Assets/_CompletedAssets/Prefabs/Pet/Buffer/Bat_Red.prefab 1 addition, 31 deletionsAssets/_CompletedAssets/Prefabs/Pet/Buffer/Bat_Red.prefab
Please register or sign in to comment