1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-31 22:22:55 +08:00
Commit Graph

253 Commits

Author SHA1 Message Date
Drew DeVault
826b3f7383 Implement most of the legacy beatmap decoder
Missing timing points, events, and hit object decoders remain to be
written
2016-10-10 09:19:05 -04:00
Drew DeVault
f776a54b9a Add more decoding (including full BeatmapMetadata) 2016-10-10 09:19:05 -04:00
Drew DeVault
222f9ade55 Start implementing legacy decoder 2016-10-10 09:19:05 -04:00
Drew DeVault
f5001dc911 Update AddBeatmap accordingly 2016-10-10 09:19:05 -04:00
Drew DeVault
364dc9f709 Refactor database to reuse existing types 2016-10-10 09:19:05 -04:00
Drew DeVault
87f3e2e1db Implement OszArchiveReader 2016-10-10 09:19:05 -04:00
Drew DeVault
5dd57e4be2 Initial support code for beatmap loading 2016-10-10 09:19:05 -04:00
Drew DeVault
416ca3c71b Use PlayMode instead of GameMode 2016-10-10 09:18:15 -04:00
Drew DeVault
e2f26e52d3 Drop GameMode 2016-10-10 09:18:15 -04:00
Drew DeVault
d246d129a4 Use @strings 2016-10-10 09:18:15 -04:00
Drew DeVault
6766fb5475 MetadataID -> BeatmapMetadataID 2016-10-10 09:17:56 -04:00
Drew DeVault
48ced4a79e Move control of databases into osu-framework 2016-10-10 09:17:56 -04:00
Drew DeVault
bf644c2fc6 Add initial DB schema and support code 2016-10-10 09:17:16 -04:00
Thomas Müller
48bd998f46 Merge pull request #59 from peppy/general-fixes
Update framework to fix draw order.
2016-10-10 08:16:52 +02:00
Dean Herbert
4ac2c9ad90 Update framework to fix draw order. 2016-10-10 15:12:21 +09:00
Dean Herbert
8706027155 Merge pull request #54 from SirCmpwn/specify-game-name
Update osu-framework and specify game name
2016-10-10 15:03:01 +09:00
Dean Herbert
3f83ffcb99 Bring framework up-to-date with upstream master. 2016-10-10 14:36:27 +09:00
Dean Herbert
0b0e79d29f Merge remote-tracking branch 'upstream/master' into SirCmpwn/specify-game-name
Conflicts:
	osu-framework
2016-10-10 14:35:43 +09:00
Dean Herbert
8b06778746 Merge pull request #56 from Tom94/general-improvements
General improvements
2016-10-10 14:20:17 +09:00
Dean Herbert
0b08c8ba15 Update framework. 2016-10-10 14:18:06 +09:00
Thomas Müller
c62f29dcae Merge branch 'master' of github.com:ppy/osu into general-improvements 2016-10-09 16:02:35 +02:00
Thomas Müller
5861e782e5 Update Framework version. 2016-10-09 16:02:25 +02:00
Thomas Müller
9ed0748d73 No need to enforce scheduling of task anymore. 2016-10-09 15:40:32 +02:00
Thomas Müller
934523e347 Update framework version. 2016-10-09 13:31:16 +02:00
Dean Herbert
de24c86c81 Merge pull request #55 from Tom94/better-addtarget
Better addtarget
2016-10-09 20:13:30 +09:00
Thomas Müller
dd04b33232 Use AddInternal instead of AddTopLevel. 2016-10-09 20:06:23 +09:00
Thomas Müller
bcb5a02221 Don't rely on return value of Container.Add. 2016-10-09 20:06:20 +09:00
Thomas Müller
36bb4a3988 Don't call Container.Add within KeyCounterCollection.Reset. 2016-10-09 20:06:15 +09:00
Dean Herbert
0a10bf9a51 Update framework. 2016-10-09 20:06:07 +09:00
Thomas Müller
d9486e790a Use AddInternal instead of AddTopLevel. 2016-10-09 11:56:41 +02:00
Thomas Müller
99c8f618af Don't rely on return value of Container.Add. 2016-10-09 11:55:52 +02:00
Thomas Müller
916bb742da Don't call Container.Add within KeyCounterCollection.Reset. 2016-10-09 11:55:38 +02:00
Thomas Müller
c997e16cfb Update Framework. 2016-10-09 11:55:11 +02:00
Dean Herbert
76f1653090 Merge pull request #53 from Tom94/use_drawable_scheduler
Use drawable scheduler
2016-10-09 15:25:22 +09:00
Thomas Müller
9d54d4f9bb Update framework version. 2016-10-09 08:16:51 +02:00
Drew DeVault
eb7486f109 Update osu-framework and specify game name 2016-10-08 10:26:35 -04:00
Thomas Müller
965cd6539f Merge pull request #48 from peppy/general-fixes
General fixes
2016-10-08 12:21:17 +02:00
Dean Herbert
5ff3767038 Fix typo in comment. 2016-10-08 19:18:50 +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
556420ee58 Add proper toolbar state handling. 2016-10-08 15:54:09 +09: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
656aee41e2 Never Prefer32bit. 2016-10-08 15:54:04 +09:00