|
|
f2580e5656
|
Merge branch 'master' into score-parser-deriving
|
2018-05-15 15:42:01 +09:00 |
|
|
|
1ee68c1c54
|
Make LegacyScoreParser abstract
|
2018-05-15 15:28:46 +09:00 |
|
|
|
5fee471307
|
Merge branch 'master' into beatmap-delete-fix
|
2018-05-15 14:49:09 +09:00 |
|
|
|
fe2ea17e7f
|
Allow subclasses of LegacyScoreParser to specify beatmap/ruleset retrieval
|
2018-05-15 11:42:40 +09:00 |
|
|
|
f2f2fb8c73
|
Use both OnKeyDown and GlobalAction.Back
|
2018-05-14 22:09:09 +03:00 |
|
|
|
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 |
|
|
|
7507d18a93
|
Merge branch 'master' into mapping-del
|
2018-05-14 20:56:12 +09:00 |
|
|
|
4a92d1ddb6
|
Merge branch 'master' into fix-testruleset-issues
|
2018-05-14 20:21:49 +09:00 |
|
|
|
addb864d10
|
Allow help text to wrap
|
2018-05-14 19:56:03 +09:00 |
|
|
|
d40efd3134
|
Merge branch 'master' into fix-testruleset-issues
|
2018-05-14 19:39:56 +09:00 |
|
|
|
47cf4f27fb
|
Fix possibility of test rulesets being discovered from assemblies
|
2018-05-14 19:39:23 +09:00 |
|
|
|
28edf3bce7
|
Merge branch 'master' into hud-above-letterbox
|
2018-05-14 19:31:39 +09:00 |
|
|
|
17861c2a16
|
Display "no key bound" when no shortcut
|
2018-05-14 19:20:53 +09:00 |
|
|
|
0234bbc37f
|
Move definition inline
|
2018-05-14 19:14:17 +09:00 |
|
|
|
f14948c022
|
Merge branch 'master' into exit-hold-confirmation
|
2018-05-14 18:13:40 +09:00 |
|
|
|
115c2dc239
|
Move hud below the skip button
|
2018-05-14 18:02:18 +09:00 |
|
|
|
027f6c3fa4
|
Fix instant movement not doing anything
|
2018-05-14 17:47:38 +09:00 |
|
|
|
4ceae6ba1f
|
Inline method
|
2018-05-14 17:45:11 +09:00 |
|
|
|
6eb7590ab0
|
Make MusicController handle all movement to previous/next tracks
|
2018-05-14 17:42:01 +09:00 |
|
|
|
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 |
|
|
|
64fba5f6d1
|
Proxy the ruleset cursor above the break overlay
|
2018-05-14 15:36:56 +09:00 |
|
|
|
43409127b7
|
Place break overlay underneath the hud
|
2018-05-14 15:36:42 +09:00 |
|
|
|
39970c831e
|
Merge branch 'master' into fix-diffcalc-timerates
|
2018-05-14 15:19:51 +09:00 |
|
|
|
f5068804d5
|
Re-enable slider distance overflow
Fixes #2467.
|
2018-05-14 15:14:29 +09:00 |
|
|
|
345e213eff
|
Merge branch 'master' into fix-wedge-nullref
|
2018-05-14 15:08:48 +09:00 |
|
|
|
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 |
|
|
|
ecd8b69e5e
|
Merge branch 'master' into fix-diffcalc-timerates
|
2018-05-14 14:22:39 +09:00 |
|
|
|
d7cba000ab
|
Merge branch 'master' into fix-wedge-nullref
|
2018-05-14 13:36:07 +09:00 |
|
|
|
2e648a90c8
|
Merge branch 'master' into fix-song-progress-counters
|
2018-05-14 13:27:50 +09:00 |
|
|
|
a81921118d
|
Strip whitespaces
|
2018-05-14 11:54:11 +09:00 |
|
|
|
6e1d651087
|
Merge remote-tracking branch 'origin/master' into convert-object-hitwindows
|
2018-05-14 11:17:39 +09:00 |
|
|
|
e1b8a1589b
|
Fix TimeRate not being considered for performance calculation
|
2018-05-14 11:15:14 +09:00 |
|
|
|
ede4d6dd11
|
Merge branch 'master' into mapping-del
|
2018-05-14 10:58:58 +09:00 |
|
|
|
db0470243a
|
Fix nullref when changing ruleset at main menu
|
2018-05-13 12:55:54 +09:00 |
|
|
|
a162453e9b
|
Merge remote-tracking branch 'upstream/master' into joystick
# Conflicts:
# osu-framework
# osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
|
2018-05-13 00:11:17 +09:00 |
|
|
|
36af7feab3
|
Merge branch 'master' into diffcalc-fixes
|
2018-05-12 21:01:58 +09:00 |
|
|
|
a14531b9a4
|
Fix crash on startup when adjusting volume before volume control loaded
|
2018-05-11 22:57:36 +09:00 |
|
|
|
cfa18bdf1f
|
Fix song progress time counters wrapping after an hour
Resolves #2466.
Supersedes and closes #2487.
|
2018-05-11 22:10:26 +09:00 |
|
|
|
7e7a5f8964
|
Fix score accuracy not being populated
|
2018-05-11 21:49:10 +09:00 |
|
|
|
8ca67f63ec
|
Fix score statistics not being read
|
2018-05-11 21:49:06 +09:00 |
|
|
|
aa5d5ab2a8
|
Fix readonly field
|
2018-05-11 21:48:35 +09:00 |
|
|
|
f1fd2ae7be
|
Merge branch 'master' into modmouseup
|
2018-05-11 21:41:14 +09:00 |
|
|
|
4fc887b25f
|
Add a pressing effect to make mouse up response feel good
|
2018-05-11 21:40:36 +09:00 |
|
|
|
c19432dc6d
|
Merge branch 'master' into ruleset-beatmap-statistics
|
2018-05-11 17:37:50 +09:00 |
|
|
|
2afc0c1abd
|
Merge branch 'master' into breadcrumb-design-adjustments
|
2018-05-11 17:19:26 +09:00 |
|
|
|
fa403e4e2a
|
Add test step to test pushing after a previous screen is made current.
|
2018-05-11 04:49:40 -03:00 |
|
|
|
97a523584d
|
Make HitWindows not return null by default
|
2018-05-11 15:52:51 +09:00 |
|
|
|
bfad101d17
|
Standardise naming
|
2018-05-11 15:42:34 +09:00 |
|
|
|
5245d2d426
|
Add info about when CreateHitWindows is invoked
|
2018-05-11 15:36:53 +09:00 |
|
|
|
8563291796
|
Add convert mania HitWindows
|
2018-05-11 15:32:00 +09:00 |
|
