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 |
|
smoogipoo
|
a81921118d
|
Strip whitespaces
|
2018-05-14 11:54:11 +09:00 |
|
ocboogie
|
ebd9d1a037
|
Resolve linting issues in ToolbarModeSelector.cs
|
2018-05-13 19:43:26 -07:00 |
|
ocboogie
|
327c7432be
|
Use OnKeyDown instead of a IKeyBindingHandler
|
2018-05-13 19:33:52 -07:00 |
|
smoogipoo
|
8c86f170a9
|
Fix mania testcases
|
2018-05-14 11:33:23 +09:00 |
|
smoogipoo
|
6e1d651087
|
Merge remote-tracking branch 'origin/master' into convert-object-hitwindows
|
2018-05-14 11:17:39 +09:00 |
|
smoogipoo
|
ce6b4cc2d3
|
Add more attributes to OsuPerformanceCalculator's output
|
2018-05-14 11:15:37 +09:00 |
|
smoogipoo
|
e1b8a1589b
|
Fix TimeRate not being considered for performance calculation
|
2018-05-14 11:15:14 +09:00 |
|
Dean Herbert
|
ede4d6dd11
|
Merge branch 'master' into mapping-del
|
2018-05-14 10:58:58 +09:00 |
|
Dean Herbert
|
db0470243a
|
Fix nullref when changing ruleset at main menu
|
2018-05-13 12:55:54 +09:00 |
|
ocboogie
|
26f06a9ae1
|
Resolve linting issues in ToolbarModeSelector.cs
|
2018-05-12 17:25:15 -07:00 |
|
ocboogie
|
76800421c4
|
Merge branch 'master' into ruleset-keybindings
|
2018-05-12 16:40:27 -07:00 |
|
ocboogie
|
8a5bd27c20
|
Add global key bindings for changing current ruleset
|
2018-05-12 16:30:29 -07:00 |
|
Dean Herbert
|
9515eb4281
|
Merge pull request #2346 from smoogipoo/joystick
Implement joystick input
|
2018-05-13 01:50:14 +09:00 |
|
Dean Herbert
|
df43fc6ff8
|
Update framework
|
2018-05-13 01:31:17 +09:00 |
|
Dean Herbert
|
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 |
|
Dean Herbert
|
4c55b90fc1
|
Merge pull request #2525 from smoogipoo/diffcalc-fixes
Fix osu! difficulty/performance calculation failing or giving wrong values
|
2018-05-12 23:25:42 +09:00 |
|
Dean Herbert
|
f6df704deb
|
Merge branch 'master' into diffcalc-fixes
|
2018-05-12 22:16:20 +09:00 |
|
AlFasGD
|
2a90686da6
|
Simplify expression
|
2018-05-12 15:09:53 +03:00 |
|
Dean Herbert
|
0f1af85457
|
Merge pull request #2531 from smoogipoo/pp-hd-change
Apply HD as speed adjustment
|
2018-05-12 21:08:12 +09:00 |
|
Dean Herbert
|
36af7feab3
|
Merge branch 'master' into diffcalc-fixes
|
2018-05-12 21:01:58 +09:00 |
|
smoogipoo
|
416ed72597
|
Port osu-performance changes into OsuPerformanceCalculator
|
2018-05-12 15:46:25 +09:00 |
|
Dan Balasescu
|
67e1dca0f9
|
Merge pull request #2530 from peppy/update-framework
Update framework with upstream fixes
|
2018-05-12 11:19:32 +09:00 |
|
Dean Herbert
|
6ebe9f88e7
|
Update framework with upstream fixes
|
2018-05-12 11:11:09 +09:00 |
|
DrabWeb
|
937ff50a5a
|
Remove unused using.
|
2018-05-11 13:56:27 -03:00 |
|
DrabWeb
|
9c8ef0f0aa
|
Merge https://github.com/ppy/osu into screen-breadcrumbs
|
2018-05-11 13:45:19 -03:00 |
|
DrabWeb
|
41de02fc78
|
Make DrawableRooms select when they are clicked.
|
2018-05-11 13:43:53 -03:00 |
|
DrabWeb
|
518dec0c68
|
Merge https://github.com/ppy/osu into drawable-room-improvements
|
2018-05-11 13:41:50 -03:00 |
|
Dean Herbert
|
a14531b9a4
|
Fix crash on startup when adjusting volume before volume control loaded
|
2018-05-11 22:57:36 +09:00 |
|
Dean Herbert
|
cfa18bdf1f
|
Fix song progress time counters wrapping after an hour
Resolves #2466.
Supersedes and closes #2487.
|
2018-05-11 22:10:26 +09:00 |
|