RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
222 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

84 Commits

Author SHA1 Message Date
Thomas Müller bcb5a02221 Don't rely on return value of Container.Add. 2016-10-09 20:06:20 +09:00
Dean Herbert 76f1653090 Merge pull request #53 from Tom94/use_drawable_scheduler 
Use drawable scheduler
 2016-10-09 15:25:22 +09:00
Dean Herbert 5a507838d6 Fix event not being unbound. 2016-10-08 19:12:31 +09:00
Thomas Müller 0c793dfe69 Use own Scheduler instead of Game.Scheduler. 2016-10-08 11:33:24 +02:00
Dean Herbert 27a26cfaaf Ensure the correct background state is restored when skipping multiple levels 2016-10-08 15:54:09 +09:00
Dean Herbert 93f326bb9b Fix welcome sound being played twice. 2016-10-08 15:54:08 +09:00
Dean Herbert 243d2cdec5 Block window closing while intro is playing. 2016-10-08 15:54:07 +09:00
Dean Herbert f2f3b69eee BackgroundModes shouldn't handle the escape key themselves. 2016-10-08 15:54:07 +09:00
Dean Herbert 08728b84d1 Make sure intro can't be exited unless the main menu has displayed once. 2016-10-08 15:54:06 +09:00
Dean Herbert c5228b63cb Unify and smiplify exit logic. Now only OsuGame calls the final Exit. 2016-10-08 15:54:05 +09:00
Dean Herbert c5ac851ba9 Add the ability to exit the game using escape. 2016-10-08 15:54:05 +09:00
Dean Herbert b2d899feb5 Add basic intro sequence. 2016-10-08 15:54:04 +09:00
Dean Herbert e25e7319e9 Add sample usage of PlayMode bindable. 2016-10-08 15:54:00 +09:00
Dean Herbert 5ff9d828eb Add KeyCounter to Player for fun. 2016-10-08 15:53:59 +09:00
Dean Herbert d1dfa120d1 Move BackgroundModes to their own files. 2016-10-08 15:53:57 +09:00
Dean Herbert d6042bd689 Add intro and begin to create central logic nest. 2016-10-08 15:53:56 +09:00
Dean Herbert a23ca25e7d Remove unusable "tests" button from main menu system. 2016-10-08 15:53:54 +09:00
Dean Herbert 75c97a62e3 Add main menu music back. 2016-10-08 15:53:53 +09:00
Dean Herbert b588f28856 Make play modes display playfield. 2016-10-05 20:49:31 +09:00
Dean Herbert c0f25a2683 Improve white-boxed game modes. 2016-10-05 20:08:58 +09:00
Dean Herbert 4eb310c3a5 Remove unused button state. 2016-10-05 20:07:15 +09:00
Dean Herbert 03aea04a00 Add BackgroundMode stack. 2016-10-05 20:06:55 +09:00
Dean Herbert c2d4672b8d Add osu! prefix to mode descriptions. 2016-10-04 19:40:56 +09:00
Dean Herbert 11403a922a Make Home, Settings and PlayMode buttons work. 2016-10-04 17:15:03 +09:00
Dean Herbert ddcd5ec286 Add basic layout for toolbar. 2016-10-03 20:39:32 +09:00
Dean Herbert ac16bffe49 Bring framework and resources up-to-date. 2016-10-01 19:05:26 +09:00
Dean Herbert f0681f35c4 Merge remote-tracking branch 'refs/remotes/upstream/master' into game-modes-layout 
# Conflicts:
#	osu.Game/OsuGame.cs
#	osu.Game/OsuGameBase.cs
#	osu.Game/osu.Game.csproj
 2016-10-01 17:10:27 +09:00
Dean Herbert af91341704 Remove unused variable. 2016-10-01 17:03:47 +09:00
Dean Herbert 5afb038025 Use explicit cast to OsuGame rather than in-between derived classes. 
# Conflicts:
#	osu.Game/GameModes/Menu/MainMenu.cs
 2016-10-01 17:02:57 +09:00
Dean Herbert 40e5a449bf Add parallax to ButtonSystem. 2016-10-01 17:02:20 +09:00
Dean Herbert 4ad618abc9 Adjust scale and outwards transition of ButtonSystem. 2016-10-01 17:02:01 +09:00
Dean Herbert 665352f706 Improve the transition and look of white-boxed game modes. 2016-10-01 17:01:09 +09:00
Dean Herbert 463f606004 Add delay for exit process. 2016-09-30 13:31:05 +09:00
Dean Herbert 357c94ed8a Add OsuGameMode. Standardise naming of classes. 2016-09-30 13:30:55 +09:00
Dean Herbert 643ae0cefe Merge remote-tracking branch 'upstream/master' into beatmap_framework 2016-09-30 00:13:08 +09:00
Dean Herbert a114463678 Add null check. 2016-09-29 23:52:51 +09:00
Dean Herbert 154226b9a3 Basic white-boxing of all game modes. 2016-09-29 23:51:17 +09:00
Dean Herbert a69c5b4fc0 Fix a few warnings. 2016-09-29 23:46:27 +09:00
Dean Herbert 7dcf2c6269 Add TestCase for main menu ButtonSystem. 2016-09-29 23:46:24 +09:00
Dean Herbert aad58532ec Remove getter on Objects. 2016-09-28 15:49:47 +09:00
Dean Herbert f0284ce57c Use the old naming style for now. 2016-09-26 15:07:29 +09:00
Dean Herbert ae100e3137 Move PlayTest to the VisualTests project. 2016-09-25 13:59:38 +09:00
Dean Herbert 58ed5c00e4 Merge remote-tracking branch 'refs/remotes/upstream/master' into beatmap_framework 
# Conflicts:
#	osu.Game/GameModes/Menu/ButtonSystem.cs
#	osu.Game/OsuGame.cs
 2016-09-25 13:40:06 +09:00
Dean Herbert 7bdb2fcfc7 Add basic implementation of VisualTest framework for osu! project. 
Comes with one complimentary test.
 2016-09-24 15:47:17 +09:00
Dean Herbert 9891e72114 Fix indentation. 2016-09-24 15:35:27 +09:00
Dean Herbert c64dfca82e Remove silly textboxes. 2016-09-24 00:09:59 +09:00
Dean Herbert f936618156 Add back TextAwesome and osu!font. 2016-09-24 00:05:09 +09:00
Dean Herbert 997c6f45f6 Update framework again. 2016-09-21 17:37:33 +09:00
Dean Herbert 33e46facec Use children for initialisation. 2016-09-21 13:25:23 +09:00
Dean Herbert 3a5f37444c Add back Playfield masking. 2016-09-21 13:21:55 +09:00