7 Years Ago
misc level list ui menu tweaks refactored the way stage components are gotten Moved leaderboard UI to a prefab to make merging easier Merge remote-tracking branch 'refs/remotes/origin/master' into replays # Conflicts: # Assets/Scenes/game.unity # Assets/Scripts/GameManager/GameManager.cs # Assets/Scripts/GameManager/UI/LeaderboardUIController.cs # Assets/Scripts/Globals.cs # Assets/Scripts/Laser.cs # Assets/Scripts/Player/Components/Player_Collision.cs # Assets/Scripts/Player/Components/Player_Health.cs # Assets/Scripts/Player/Guns/PlayerGun.cs # Assets/Scripts/Player/Player.cs # Assets/Scripts/Pxc/PixelGroup.cs # Assets/Scripts/Pxc/Pxc.cs # Assets/Scripts/Pxc/PxcComponents/Pxc_Collision.cs # Assets/Scripts/Stages/Levels/BossStage.cs # Assets/Scripts/Stages/Levels/HubStage.cs # Assets/Scripts/Stages/Levels/OctopusStage.cs # Assets/Scripts/Stages/Levels/RobotStage.cs # Assets/Scripts/Stages/Levels/TentacleStage.cs # Assets/Scripts/Stages/Stage.cs # Assets/Scripts/Stages/StageComponents/Stage_Arena.cs # Assets/Scripts/Stages/StageComponents/Stage_Bullets.cs # Assets/Scripts/Stages/StageComponents/Stage_LineParticles.cs # Assets/Scripts/Stages/StageComponents/Stage_SpriteAnimations.cs # Assets/Scripts/Units/Octopus/Octopus.cs # Assets/Scripts/Units/Octopus/OctopusTurret.cs # Assets/Scripts/Units/Robot/Robot.cs # Assets/Scripts/Units/TentacleMonster/TentacleMonster.cs # Assets/Scripts/Units/Test/TestUnit.cs