|
|
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 |
|
|
|
ebd9d1a037
|
Resolve linting issues in ToolbarModeSelector.cs
|
2018-05-13 19:43:26 -07:00 |
|
|
|
327c7432be
|
Use OnKeyDown instead of a IKeyBindingHandler
|
2018-05-13 19:33:52 -07: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 |
|
|
|
26f06a9ae1
|
Resolve linting issues in ToolbarModeSelector.cs
|
2018-05-12 17:25:15 -07:00 |
|
|
|
76800421c4
|
Merge branch 'master' into ruleset-keybindings
|
2018-05-12 16:40:27 -07:00 |
|
|
|
8a5bd27c20
|
Add global key bindings for changing current ruleset
|
2018-05-12 16:30:29 -07: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 |
|
|
|
2a90686da6
|
Simplify expression
|
2018-05-12 15:09:53 +03:00 |
|
|
|
36af7feab3
|
Merge branch 'master' into diffcalc-fixes
|
2018-05-12 21:01:58 +09:00 |
|
|
|
937ff50a5a
|
Remove unused using.
|
2018-05-11 13:56:27 -03:00 |
|
|
|
41de02fc78
|
Make DrawableRooms select when they are clicked.
|
2018-05-11 13:43:53 -03:00 |
|
|
|
518dec0c68
|
Merge https://github.com/ppy/osu into drawable-room-improvements
|
2018-05-11 13:41:50 -03: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 |
|
|
|
c052ee71c1
|
Add convert osu HitWindows
|
2018-05-11 15:31:36 +09:00 |
|
|
|
9c65d347ba
|
Add convert taiko HitWindows
|
2018-05-11 15:31:12 +09:00 |
|
|
|
8216bc311a
|
Restructure HitWindows to allow outside setting
|
2018-05-11 15:30:26 +09:00 |
|
|
|
fd9796d08c
|
Remove some unnecessary changes
|
2018-05-11 14:13:52 +09:00 |
|
|
|
816ad5c426
|
Pass down ruleset to the buffered wedge
|
2018-05-11 14:10:53 +09:00 |
|
|
|
2bab08c437
|
Fix post-merge errors
|
2018-05-11 14:08:17 +09:00 |
|
|
|
73465c35fa
|
Merge remote-tracking branch 'origin/master' into ruleset-beatmap-statistics
# Conflicts:
# osu.Game/Beatmaps/Beatmap.cs
|
2018-05-11 14:05:40 +09:00 |
|
|
|
a241ff1c05
|
Cleanup.
|
2018-05-10 22:50:03 -03:00 |
|
|
|
ec53927d8e
|
Add selection to DrawableRoom.
|
2018-05-10 22:48:07 -03:00 |
|
|
|
d87ac5a1cb
|
Create the drawable hierarchy for DrawableRoom in load.
|
2018-05-10 22:12:25 -03:00 |
|
|
|
b9adeeb063
|
Add ScreenBreadcrumbControl.
|
2018-05-10 21:35:26 -03:00 |
|
|
|
a86843ccc9
|
Remove unused usings caused by multiplayer folder restructuring.
|
2018-05-10 20:49:42 -03:00 |
|
|
|
bc9ac8f72a
|
Move multiplayer screens to osu.Game/Screens/Multi/Screens
|
2018-05-10 20:47:25 -03:00 |
|
|
|
2d206d258a
|
Move multiplayer screen components to osu.Game/Screens/Multi/Components
|
2018-05-10 20:44:24 -03:00 |
|
|
|
c35760fdef
|
Rename osu.Game/Screens/Multiplayer to Multi.
|
2018-05-10 20:39:05 -03:00 |
|
|
|
ecb8de29a2
|
Adjust BreadcrumbControl to better match the designs.
|
2018-05-10 20:30:03 -03:00 |
|
