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

22 Commits

Author SHA1 Message Date
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
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 c9f90efb8a Add more checks and remove direct cast 2017-08-24 20:31:57 +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
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
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 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
Dean Herbert 7c9d6c9c83 Initial refactoring of key binding logic 2017-08-14 20:19:25 +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
Dean Herbert 723e27353c HitRenderer -> RulesetContainer 2017-08-09 13:28:29 +09:00