-
- Downloads
Merge branch 'master' into VisibilityAgain
# Conflicts: # ChaoticCrates/Assets/Scenes/gameScene.unity # ChaoticCrates/Assets/Scripts/Logic/Managers/GameManager.cs # ChaoticCrates/Assets/Scripts/Logic/Managers/GameNetworkManager.cs # ChaoticCrates/Assets/Scripts/Logic/RobotAction/RobotAction.cs # ChaoticCrates/Assets/Test/PlayMode/move_action.cs
No related branches found
No related tags found
Showing
- ChaoticCrates/Assets/Graphics/palettes/Ground Tiles.prefab 31 additions, 5 deletionsChaoticCrates/Assets/Graphics/palettes/Ground Tiles.prefab
- ChaoticCrates/Assets/Graphics/palettes/Tiles/platformPack_tile010.asset 36 additions, 0 deletions...Assets/Graphics/palettes/Tiles/platformPack_tile010.asset
- ChaoticCrates/Assets/Graphics/palettes/Tiles/platformPack_tile010.asset.meta 8 additions, 0 deletions...s/Graphics/palettes/Tiles/platformPack_tile010.asset.meta
- ChaoticCrates/Assets/Graphics/palettes/Tiles/platformPack_tile041.png 0 additions, 0 deletions...s/Assets/Graphics/palettes/Tiles/platformPack_tile041.png
- ChaoticCrates/Assets/Graphics/palettes/Tiles/platformPack_tile041.png.meta 1 addition, 1 deletion...ets/Graphics/palettes/Tiles/platformPack_tile041.png.meta
- ChaoticCrates/Assets/Graphics/palettes/Tiles/platformPack_tile042.asset 36 additions, 0 deletions...Assets/Graphics/palettes/Tiles/platformPack_tile042.asset
- ChaoticCrates/Assets/Graphics/palettes/Tiles/platformPack_tile042.asset.meta 8 additions, 0 deletions...s/Graphics/palettes/Tiles/platformPack_tile042.asset.meta
- ChaoticCrates/Assets/Prefabs/Cube.prefab 2 additions, 1 deletionChaoticCrates/Assets/Prefabs/Cube.prefab
- ChaoticCrates/Assets/Prefabs/Edge.prefab 1 addition, 1 deletionChaoticCrates/Assets/Prefabs/Edge.prefab
- ChaoticCrates/Assets/Prefabs/Obstacle.prefab 14 additions, 1 deletionChaoticCrates/Assets/Prefabs/Obstacle.prefab
- ChaoticCrates/Assets/Prefabs/robot.prefab 113 additions, 1 deletionChaoticCrates/Assets/Prefabs/robot.prefab
- ChaoticCrates/Assets/Scenes/gameScene.meta 8 additions, 0 deletionsChaoticCrates/Assets/Scenes/gameScene.meta
- ChaoticCrates/Assets/Scenes/gameScene.unity 94 additions, 29 deletionsChaoticCrates/Assets/Scenes/gameScene.unity
- ChaoticCrates/Assets/Scenes/gameScene/Global Volume Profile.asset 146 additions, 0 deletions...rates/Assets/Scenes/gameScene/Global Volume Profile.asset
- ChaoticCrates/Assets/Scenes/gameScene/Global Volume Profile.asset.meta 8 additions, 0 deletions.../Assets/Scenes/gameScene/Global Volume Profile.asset.meta
- ChaoticCrates/Assets/Scripts/Logic/Managers/GameManager.cs 13 additions, 0 deletionsChaoticCrates/Assets/Scripts/Logic/Managers/GameManager.cs
- ChaoticCrates/Assets/Scripts/Logic/Managers/GameNetworkManager.cs 1 addition, 1 deletion...rates/Assets/Scripts/Logic/Managers/GameNetworkManager.cs
- ChaoticCrates/Assets/Scripts/Logic/MapAndMovement/MapManager.cs 68 additions, 0 deletions...cCrates/Assets/Scripts/Logic/MapAndMovement/MapManager.cs
- ChaoticCrates/Assets/Scripts/Logic/MapAndMovement/MoveObject.cs 7 additions, 0 deletions...cCrates/Assets/Scripts/Logic/MapAndMovement/MoveObject.cs
- ChaoticCrates/Assets/Scripts/Logic/RobotAction/ActionValidator.cs 19 additions, 1 deletion...rates/Assets/Scripts/Logic/RobotAction/ActionValidator.cs
Loading
Please register or sign in to comment