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

115 Commits

Author SHA1 Message Date
Dean Herbert 86de4fa2e2 Apply CI fixes 2017-09-12 18:36:19 +09:00
Dean Herbert f32d444d68 Remove generics from Playfield (fixes catch) 2017-09-12 18:19:28 +09:00
Dean Herbert 5ce76d8023 Merge remote-tracking branch 'upstream/master' into judgement-revamp 2017-09-11 14:36:51 +09:00
Dean Herbert 512232c1c8 Fix regression causing autoplay to fail 2017-09-11 14:25:01 +09:00
MrTheMake a7f874e5b6 Merge branch 'master' into leaderboard-scores 2017-09-07 18:25:33 +02:00
Dean Herbert e834e0e958 Fix incorrect initialisation order causing mania key bindings to not work 2017-09-06 21:07:57 +09:00
smoogipooo 0cc443e618 Remove all generic judgements. 2017-09-06 18:05:51 +09:00
smoogipooo ac8ec31b61 Make judgements able to be "added" plus make everything compile and run. 2017-09-06 17:02:13 +09:00
Dean Herbert 2b667cf789 Fix typos 2017-08-24 20:32:55 +09:00
Dean Herbert c9f90efb8a Add more checks and remove direct cast 2017-08-24 20:31:57 +09:00
Dean Herbert f0635af40d Add documentation and regions to RulesetInputManager 2017-08-24 15:51:31 +09:00
Dean Herbert a7a7e0323f Update autoplay and replay handling to result in actions, not keys 2017-08-24 15:36:42 +09:00
Dean Herbert 189988236b Move PlayerInputManager logic inside RulesetInputManager 2017-08-24 15:23:17 +09:00
smoogipooo 115e5c95af Make ScrollingPlayfield.Reversed protected; make ManiaPlayfield 'invertible'. 2017-08-23 20:50:03 +09:00
Dean Herbert 1f04995a73 Merge branch 'master' into hardrock-flipping 2017-08-23 17:00:41 +09:00
smoogipooo 8ddc13e394 Fix replays not loading. 2017-08-23 16:48:13 +09:00
smoogipooo 84dd1283de Fix nullref. 2017-08-23 13:39:51 +09:00
smoogipooo be96fb32b3 Make RulesetContainer load KeyBindingInputManager in load() 2017-08-23 12:47:47 +09:00
Dean Herbert 83bd430f89 Merge branch 'master' into fix-speed-adjustments 2017-08-22 23:07:42 +09:00
smoogipooo f8576d44b1 Add some more xmldoc. 2017-08-22 21:08:27 +09:00
Dean Herbert 9f52ecbb8a Merge branch 'master' into mania-key-conversion 2017-08-22 20:08:39 +09:00
smoogipooo ad63cbf455 Fix default comparator being inverted. 2017-08-22 18:54:41 +09:00
smoogipooo 1964bc72e5 Should be FirstOrDefault for hit objects occuriung before the first control point. 2017-08-22 18:39:09 +09:00
smoogipooo 137964b792 Fix hit objects not getting added to the correct speed adjustment container. 2017-08-22 18:37:10 +09:00
smoogipooo b46a51fd8b Make the speed adjustment containers ordered decreasingly by their control point start time. 2017-08-22 18:36:32 +09:00
smoogipooo 0189f01402 Explicitly store defaultSpeedAdjustment, and make it un-removable 2017-08-22 16:15:50 +09:00
smoogipooo 5a3c0de7ad Fix further incorrect comparison. 2017-08-22 16:10:58 +09:00
smoogipooo d20ea97e7f Add NUnit test for ScrollingHitObjectContainer 
Tests ordering of SpeedAdjustmentContainers and DrawableHitObjects added to the ScrollingHitObjectContainer.
 2017-08-22 16:06:19 +09:00
smoogipooo c3cfad4eb5 Add RemoveSpeedAdjustment 2017-08-22 16:06:14 +09:00
smoogipooo 4fc77be624 Fix incorrect sorting of hit objects into SpeedAdjustmentContainers 2017-08-22 16:06:09 +09:00
smoogipooo 6f662d721c Fix possible CollectionModifiedException while adding new SpeedAdjustmentContainers 2017-08-22 16:06:04 +09:00
smoogipooo 5fcd94880d Fix incorrect inequality with multiple speed adjustments at the same start time. 2017-08-22 16:05:53 +09:00
smoogipooo 68c7226d12 Fix cherry pick issues. 2017-08-22 14:18:17 +09:00
smoogipooo 88151eff3f Fix dofficulty calculators not working and make mania set the correct key count for non-mania specific maps. 2017-08-22 14:07:39 +09:00
smoogipooo 4eec59f669 Only set the number of availableColumns once, at ManiaRulesetContainer level. 
# Conflicts:
#	osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
#	osu.Game/Rulesets/UI/RulesetContainer.cs
 2017-08-22 14:07:37 +09:00
smoogipooo 964982e2e6 Remove now unneeded ApplyBeatmap. 2017-08-22 14:05:28 +09:00
Dean Herbert 7903f49d27 Merge branch 'master' into action-key-counter 2017-08-21 17:47:19 +09:00
smoogipooo 6e0d2182cb CI. 2017-08-21 16:24:16 +09:00
smoogipooo 5d13efa76d Remove the concept of "queued hit objects", add a default speed adjustment. 2017-08-21 16:17:00 +09:00
Dean Herbert a63923a497 Remove type check for now 2017-08-21 12:50:48 +09:00
Dean Herbert 16e96888ab Update KeyCounterCollection to support action-based buttons 2017-08-21 12:39:22 +09:00
MrTheMake 6d401b5f21 Merge branch 'master' into leaderboard-scores 2017-08-19 00:00:40 +02:00
Dean Herbert bc7621607a Merge upstream/master in. 2017-08-18 22:20:45 +09:00
Dean Herbert 7c9d6c9c83 Initial refactoring of key binding logic 2017-08-14 20:19:25 +09:00
MrTheMake d9c26f98c7 Suggested changes 2017-08-13 19:54:07 +02:00
smoogipooo d83c218e08 Remove various scrolling container optimisations (removing when not alive). 2017-08-09 16:19:09 +09:00
Dean Herbert 976cff9af6 Merge remote-tracking branch 'upstream/master' into catch 
# Conflicts:
#	osu.Desktop.Tests/Visual/TestCaseScrollingPlayfield.cs
 2017-08-09 15:08:43 +09:00
smoogipooo a20753abc6 Applied suggested changes. 2017-08-09 14:24:47 +09:00
smoogipooo 431a9649a4 Remove unused using. 2017-08-09 13:38:12 +09:00
Dean Herbert 723e27353c HitRenderer -> RulesetContainer 2017-08-09 13:28:29 +09:00