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

3774 Commits

Author SHA1 Message Date
Dean Herbert 784ca2300b
Add safety check for when no objects have been assigned. 2017-04-18 18:09:37 +09:00
Dean Herbert b02eb17ff5 Merge pull request #646 from smoogipooo/taiko-fixes 
Rewrite bar lines to make sure they're centered at their beat's start…
 2017-04-18 17:37:33 +09:00
Dan Balasescu d4e75ecec4 Rename to use -index. 2017-04-18 17:37:01 +09:00
Dean Herbert 4895a482b4 That's a lot of white spaces 2017-04-18 17:26:59 +09:00
Dan Balasescu ce4e661148 Merge branch 'master' into taiko-fixes 2017-04-18 17:13:25 +09:00
smoogipooo 579698f0a9 Merge remote-tracking branch 'origin/master' into taiko-fixes 
# Conflicts:
#	osu.Game.Rulesets.Taiko/UI/TaikoHitRenderer.cs
 2017-04-18 17:12:23 +09:00
Dean Herbert 5ca8737a73 Merge pull request #644 from ocboogie/player-loader-restart 
Memory increase on restart fix
 2017-04-18 17:11:55 +09:00
Dean Herbert 5ba85818db
Combine push logic and adjust transitions a bit more. 2017-04-18 17:07:02 +09:00
Dean Herbert ddff26d167
Show metadata when loading between retries. 
Also speeds up the display a bit.
 2017-04-18 17:00:58 +09:00
Dean Herbert edd71c0560
Tidy up and comment PlayerLoader logic. 2017-04-18 16:56:01 +09:00
Dean Herbert 2ccb8b154f
Change conditional ordering to allow player to always run its fadeOut sequence. 2017-04-18 16:47:30 +09:00
Dean Herbert 24deaf05b6 Merge branch 'master' into player-loader-restart 2017-04-18 16:36:25 +09:00
Dean Herbert 3659ee891c Merge pull request #643 from peppy/general-fixes 
Updates in-line with framework.
 2017-04-18 16:34:34 +09:00
Dean Herbert 64a8992153 Merge branch 'master' into general-fixes 2017-04-18 16:19:52 +09:00
Dean Herbert 7fbbe74b65 Merge pull request #645 from peppy/no-more-modes 
Mode -> Ruleset.
 2017-04-18 16:19:30 +09:00
Dean Herbert 6dc15963e0
Update framework. 2017-04-18 16:15:16 +09:00
Dean Herbert fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
ocboogie 1f7373db8f Removed unneeded restarting variable 2017-04-17 23:52:38 -07:00
ocboogie 2bd89e922f Removed unneeded newPlayer 2017-04-17 23:48:21 -07:00
Dean Herbert 0bed537239 Merge pull request #642 from smoogipooo/better-conversion 
Better conversion
 2017-04-18 15:40:26 +09:00
ocboogie c0f4cbcba6 Added back PlayerLoader overlays 2017-04-17 23:36:11 -07:00
Dean Herbert 727086c0b2
Updates in-line with framework. 2017-04-18 15:34:53 +09:00
smoogipooo 7a6b062e72 Fix adding duplicate hitobjects in the case where a hit object doesn't need to be converted. 2017-04-18 14:48:18 +09:00
smoogipooo cf404b4bcf We shouldn't be adding null hitobjects. 2017-04-18 14:46:56 +09:00
ocboogie be8d32688b Fixed HotkeyRetryOverlay just going to a black screen 2017-04-17 22:36:03 -07:00
Dan Balasescu 0dd97c433f Trim whitespace. 2017-04-18 14:34:39 +09:00
smoogipooo 27ddf4b475 Refactor beatmap converters. 2017-04-18 14:31:06 +09:00
ocboogie 5c48fa6cb1 Removed testing line 2017-04-17 21:35:48 -07:00
ocboogie aa466d0e84 PlayerLoader creates a new instance of the Player class on Restart 2017-04-17 21:32:38 -07:00
Dean Herbert 2df21066e7
Add constant for osu! playfield size. 2017-04-18 12:19:39 +09:00
smoogipooo ef5d50e7d8 mode -> ruleset. 2017-04-18 11:29:27 +09:00
Dan Balasescu f744b48399 Merge branch 'master' into better-conversion 2017-04-18 11:26:33 +09:00
Dan Balasescu 1df3189e5d Merge pull request #640 from smoogipooo/remove-playmode 
Remove PlayMode enum and make Rulesets modular
 2017-04-18 11:21:02 +09:00
smoogipooo 8844ff7ab7 CI fixes. 2017-04-18 11:20:39 +09:00
smoogipooo d04353aed0 Legacy mania hit objects don't have a "column", this should be determined by the beatmap converter. 2017-04-18 11:13:11 +09:00
Dean Herbert 7d3a1c5658
Remove using. 2017-04-18 10:59:50 +09:00
smoogipooo 4a60e9299e Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion 2017-04-18 10:59:43 +09:00
Dean Herbert 8ef675d9b3
Add fallback to allow FilterCriteria to run without a ruleset being set. 2017-04-18 10:55:45 +09:00
Dean Herbert 5939ba9143
Fix ruleset not always being initialised correctly. 2017-04-18 10:55:33 +09:00
smoogipooo 3b9067e55e Convert chords to strong hits for osu!mania conversion. 2017-04-18 10:41:49 +09:00
smoogipooo 5a78ce15a1 Fix CanConvert not returning correctly. 2017-04-18 10:23:49 +09:00
smoogipooo d5c5b7eb6b Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion 2017-04-18 10:09:36 +09:00
Dean Herbert 6b6690caf7
Fix filtering by ruleset. 2017-04-18 10:04:41 +09:00
Dean Herbert f2174054ea
Fix song select. 2017-04-18 10:04:32 +09:00
smoogipooo 1be1683a4f Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion 2017-04-18 09:58:39 +09:00
smoogipooo 0cef14ca63 CI fixes. 2017-04-18 09:51:02 +09:00
Dean Herbert d3c1520a2d
Fix beatmaps not getting the correct ruleset on import. 2017-04-18 09:47:29 +09:00
Dean Herbert 2734983564
Add unique constraints on RulesetInfo table to ensure things stay sane. 2017-04-18 09:47:16 +09:00
Dean Herbert 4393c2cb25
Add unit tests to ensure all rulesets' beatmaps are added successfully. 2017-04-18 09:46:14 +09:00
smoogipooo 0e1ce333e3 Make IBeatmapProcessor a class with virtual methods. 2017-04-18 09:43:43 +09:00