Merge branch 'main' of https://gitlab.informatika.org/vanadiumoxide/IF3210-2023-Unity-UNS
Showing
- Assets/Models/Shop/ShopBuilding.meta 8 additions, 0 deletionsAssets/Models/Shop/ShopBuilding.meta
- Assets/Models/Shop/ShopBuilding/Texture_01.png 3 additions, 0 deletionsAssets/Models/Shop/ShopBuilding/Texture_01.png
- Assets/Models/Shop/ShopBuilding/Texture_01.png.meta 123 additions, 0 deletionsAssets/Models/Shop/ShopBuilding/Texture_01.png.meta
- Assets/Models/Shop/ShopBuilding/Texture_02.png 3 additions, 0 deletionsAssets/Models/Shop/ShopBuilding/Texture_02.png
- Assets/Models/Shop/ShopBuilding/Texture_02.png.meta 123 additions, 0 deletionsAssets/Models/Shop/ShopBuilding/Texture_02.png.meta
- Assets/Models/Shop/ShopBuilding/Weapon Shop.fbx 3 additions, 0 deletionsAssets/Models/Shop/ShopBuilding/Weapon Shop.fbx
- Assets/Models/Shop/ShopBuilding/Weapon Shop.fbx.meta 106 additions, 0 deletionsAssets/Models/Shop/ShopBuilding/Weapon Shop.fbx.meta
- Assets/Prefabs/Environment.prefab 3259 additions, 2626 deletionsAssets/Prefabs/Environment.prefab
- Assets/Scripts/Menu/MenuManager.cs 1 addition, 1 deletionAssets/Scripts/Menu/MenuManager.cs
- Assets/Scripts/SaveLoad/DataPersistence/DataPersistenceManager.cs 19 additions, 19 deletions...cripts/SaveLoad/DataPersistence/DataPersistenceManager.cs
- Assets/Scripts/Shopkeeper/ShopManager.cs 9 additions, 4 deletionsAssets/Scripts/Shopkeeper/ShopManager.cs
- Assets/Scripts/Story/CutScene.cs 1 addition, 0 deletionsAssets/Scripts/Story/CutScene.cs
Please register or sign in to comment