Dean Herbert
|
6d87ff2595
|
Merge branch 'master' into enable-distance-overflow
|
2018-05-15 16:18:17 +09:00 |
|
Dean Herbert
|
b40c55868e
|
Merge pull request #2551 from smoogipoo/score-parser-deriving
Allow subclasses of LegacyScoreParser to specify beatmap/ruleset retrieval
|
2018-05-15 15:50:42 +09:00 |
|
Dean Herbert
|
f2580e5656
|
Merge branch 'master' into score-parser-deriving
|
2018-05-15 15:42:01 +09:00 |
|
smoogipoo
|
1ee68c1c54
|
Make LegacyScoreParser abstract
|
2018-05-15 15:28:46 +09:00 |
|
Dean Herbert
|
f3d3d777fa
|
Merge pull request #2543 from smoogipoo/beatmap-delete-fix
Fix deleted beatmaps still being accessible in MusicController
|
2018-05-15 14:59:20 +09:00 |
|
Dean Herbert
|
5fee471307
|
Merge branch 'master' into beatmap-delete-fix
|
2018-05-15 14:49:09 +09:00 |
|
Dean Herbert
|
b32357131a
|
Merge branch 'master' into score-parser-deriving
|
2018-05-15 14:37:56 +09:00 |
|
Dean Herbert
|
8f34468176
|
Merge pull request #2552 from smoogipoo/pp-hd-change
Port osu-performance HD AR fix
|
2018-05-15 14:13:45 +09:00 |
|
smoogipoo
|
10e2f74538
|
Port osu-performance HD AR fix
|
2018-05-15 11:53:11 +09:00 |
|
smoogipoo
|
fe2ea17e7f
|
Allow subclasses of LegacyScoreParser to specify beatmap/ruleset retrieval
|
2018-05-15 11:42:40 +09:00 |
|
ocboogie
|
4055a6fc0c
|
Merge branch 'master' into ruleset-keybindings
|
2018-05-14 15:39:10 -07:00 |
|
Roman Kapustin
|
f2f2fb8c73
|
Use both OnKeyDown and GlobalAction.Back
|
2018-05-14 22:09:09 +03:00 |
|
Roman Kapustin
|
e802b722f0
|
Revert "Handle mouse back button using OnMouseDown override instead of using GlobalAction"
This reverts commit 44bbb8700e.
|
2018-05-14 20:27:05 +03:00 |
|
Dean Herbert
|
92c9c2d63a
|
Merge pull request #2539 from smoogipoo/fix-drumroll-judgements
Fix drumroll completions always giving GREAT judgements
|
2018-05-14 21:26:18 +09:00 |
|
Dean Herbert
|
0fbdbdd2ab
|
Merge branch 'master' into fix-drumroll-judgements
|
2018-05-14 21:14:20 +09:00 |
|
Dean Herbert
|
15d6c1f0e6
|
Merge pull request #2375 from aQaTL/mapping-del
Change mapping delete key to shift+delete to allow binding delete key
|
2018-05-14 21:13:39 +09:00 |
|
Dean Herbert
|
7507d18a93
|
Merge branch 'master' into mapping-del
|
2018-05-14 20:56:12 +09:00 |
|
Dean Herbert
|
a5caad1eb1
|
Merge pull request #2544 from smoogipoo/fix-testruleset-issues
Fix possibility of test rulesets being discovered from assemblies
|
2018-05-14 20:54:51 +09:00 |
|
Dean Herbert
|
4a92d1ddb6
|
Merge branch 'master' into fix-testruleset-issues
|
2018-05-14 20:21:49 +09:00 |
|
Dean Herbert
|
addb864d10
|
Allow help text to wrap
|
2018-05-14 19:56:03 +09:00 |
|
Dean Herbert
|
5d3449d55d
|
Merge pull request #2541 from smoogipoo/hud-above-letterbox
Reduce elements hidden by letterboxing break overlays
|
2018-05-14 19:45:25 +09:00 |
|
Dan Balasescu
|
d40efd3134
|
Merge branch 'master' into fix-testruleset-issues
|
2018-05-14 19:39:56 +09:00 |
|
smoogipoo
|
47cf4f27fb
|
Fix possibility of test rulesets being discovered from assemblies
|
2018-05-14 19:39:23 +09:00 |
|
Dean Herbert
|
28edf3bce7
|
Merge branch 'master' into hud-above-letterbox
|
2018-05-14 19:31:39 +09:00 |
|
Dan Balasescu
|
21ed2750cd
|
Merge pull request #2514 from peppy/exit-hold-confirmation
Implement a hold-to-confirm screen when exiting game using escape key
|
2018-05-14 19:29:09 +09:00 |
|
ocboogie
|
d441fd53b9
|
Merge branch 'master' into ruleset-keybindings
|
2018-05-14 03:27:35 -07:00 |
|
smoogipoo
|
17861c2a16
|
Display "no key bound" when no shortcut
|
2018-05-14 19:20:53 +09:00 |
|
Dean Herbert
|
0234bbc37f
|
Move definition inline
|
2018-05-14 19:14:17 +09:00 |
|
smoogipoo
|
9536c324fa
|
Rename aborted -> fired
|
2018-05-14 19:08:00 +09:00 |
|
Dean Herbert
|
f14948c022
|
Merge branch 'master' into exit-hold-confirmation
|
2018-05-14 18:13:40 +09:00 |
|
smoogipoo
|
115c2dc239
|
Move hud below the skip button
|
2018-05-14 18:02:18 +09:00 |
|
Dan Balasescu
|
f0b7ed238c
|
Merge pull request #2542 from peppy/overlays-dont-handle-dragstart
Stop focused overlays from handling DragStart
|
2018-05-14 17:58:10 +09:00 |
|
smoogipoo
|
027f6c3fa4
|
Fix instant movement not doing anything
|
2018-05-14 17:47:38 +09:00 |
|
smoogipoo
|
4ceae6ba1f
|
Inline method
|
2018-05-14 17:45:11 +09:00 |
|
smoogipoo
|
6eb7590ab0
|
Make MusicController handle all movement to previous/next tracks
|
2018-05-14 17:42:01 +09:00 |
|
ocboogie
|
bfcfeec9b9
|
Merge branch 'master' into ruleset-keybindings
|
2018-05-14 01:28:57 -07:00 |
|
Dean Herbert
|
fe1c1fec0d
|
Stop overlays from handling DragStart
This was causing weird behaviour with the key configuration section and back button in settings.
|
2018-05-14 15:44:19 +09:00 |
|
smoogipoo
|
64fba5f6d1
|
Proxy the ruleset cursor above the break overlay
|
2018-05-14 15:36:56 +09:00 |
|
smoogipoo
|
43409127b7
|
Place break overlay underneath the hud
|
2018-05-14 15:36:42 +09:00 |
|
Dean Herbert
|
1045199a17
|
Merge pull request #2538 from smoogipoo/fix-diffcalc-timerates
Fix performance calculation not considering time-adjustment mods
|
2018-05-14 15:35:22 +09:00 |
|
Dean Herbert
|
39970c831e
|
Merge branch 'master' into fix-diffcalc-timerates
|
2018-05-14 15:19:51 +09:00 |
|
Dean Herbert
|
07fc71e077
|
Merge pull request #2533 from peppy/fix-wedge-nullref
Fix nullref when changing ruleset at main menu
|
2018-05-14 15:19:35 +09:00 |
|
smoogipoo
|
f5068804d5
|
Re-enable slider distance overflow
Fixes #2467.
|
2018-05-14 15:14:29 +09:00 |
|
Dean Herbert
|
345e213eff
|
Merge branch 'master' into fix-wedge-nullref
|
2018-05-14 15:08:48 +09:00 |
|
Dean Herbert
|
5c41e7c39c
|
Merge pull request #2527 from peppy/fix-mousewheel-startup-crash
Fix crash on startup when adjusting volume before volume control loaded
|
2018-05-14 14:23:08 +09:00 |
|
Dean Herbert
|
ecd8b69e5e
|
Merge branch 'master' into fix-diffcalc-timerates
|
2018-05-14 14:22:39 +09:00 |
|
smoogipoo
|
7d027098ec
|
Fix drumroll completions always giving GREAT judgements
Due to requiredgoodhits/requiredgreathits being calculated prior to nested hitobjects.
|
2018-05-14 14:13:07 +09:00 |
|
Dan Balasescu
|
d7cba000ab
|
Merge branch 'master' into fix-wedge-nullref
|
2018-05-14 13:36:07 +09:00 |
|
Dan Balasescu
|
4a87bbefa0
|
Merge pull request #2526 from peppy/fix-song-progress-counters
Fix song progress time counters wrapping after an hour
|
2018-05-14 13:35:58 +09:00 |
|
Dan Balasescu
|
2e648a90c8
|
Merge branch 'master' into fix-song-progress-counters
|
2018-05-14 13:27:50 +09:00 |
|