Merge branch 'dev' into fix/pet-init
Showing
- Assets/Resources/Data/Cutscene/SaveGeneric.asset 1 addition, 1 deletionAssets/Resources/Data/Cutscene/SaveGeneric.asset
- Assets/Resources/Data/Cutscene/Story1_2.asset 11 additions, 1 deletionAssets/Resources/Data/Cutscene/Story1_2.asset
- Assets/Resources/Data/Cutscene/Story2_2.asset 11 additions, 1 deletionAssets/Resources/Data/Cutscene/Story2_2.asset
- Assets/Resources/Data/Cutscene/Story3_2.asset 11 additions, 1 deletionAssets/Resources/Data/Cutscene/Story3_2.asset
- Assets/UI/InGame/Crosshair/Crosshair.uxml 5 additions, 3 deletionsAssets/UI/InGame/Crosshair/Crosshair.uxml
- Assets/UI/InGame/Crosshair/CrosshairController.cs 13 additions, 9 deletionsAssets/UI/InGame/Crosshair/CrosshairController.cs
- Assets/UI/InGame/PauseMenu/PauseMenuController.cs 3 additions, 6 deletionsAssets/UI/InGame/PauseMenu/PauseMenuController.cs
- Assets/UI/MainMenuScene/LoadGame/GameSavesContainer.cs 6 additions, 5 deletionsAssets/UI/MainMenuScene/LoadGame/GameSavesContainer.cs
- Assets/UI/MainMenuScene/LoadGame/LoadGame.uxml 1 addition, 1 deletionAssets/UI/MainMenuScene/LoadGame/LoadGame.uxml
- Assets/UI/MainMenuScene/LoadGame/LoadGameController.cs 29 additions, 2 deletionsAssets/UI/MainMenuScene/LoadGame/LoadGameController.cs
- Assets/_Scenes/DevRoom.unity 335 additions, 234 deletionsAssets/_Scenes/DevRoom.unity
- Assets/_Scenes/MainMenu.unity 2629 additions, 1926 deletionsAssets/_Scenes/MainMenu.unity
- Assets/_Scenes/World.unity 789 additions, 60 deletionsAssets/_Scenes/World.unity
- Assets/_Scripts/Core/Game/Data/GameStatisticsManager.cs 11 additions, 1 deletionAssets/_Scripts/Core/Game/Data/GameStatisticsManager.cs
- Assets/_Scripts/Core/Game/Data/Saves/GameSaveData.cs 20 additions, 2 deletionsAssets/_Scripts/Core/Game/Data/Saves/GameSaveData.cs
- Assets/_Scripts/Core/Game/Data/Saves/GameSaveManager.cs 37 additions, 2 deletionsAssets/_Scripts/Core/Game/Data/Saves/GameSaveManager.cs
- Assets/_Scripts/Core/Game/Data/Saves/GameSaveWrapper.cs 3 additions, 0 deletionsAssets/_Scripts/Core/Game/Data/Saves/GameSaveWrapper.cs
- Assets/_Scripts/Core/Game/Data/Settings/GameSettingsManager.cs 10 additions, 0 deletions...s/_Scripts/Core/Game/Data/Settings/GameSettingsManager.cs
- Assets/_Scripts/Core/Levels/Level1/ExitArea_LV1.cs 1 addition, 0 deletionsAssets/_Scripts/Core/Levels/Level1/ExitArea_LV1.cs
- Assets/_Scripts/Core/Levels/Level1/Level1.cs 2 additions, 0 deletionsAssets/_Scripts/Core/Levels/Level1/Level1.cs
Please register or sign in to comment