|
|
faa82f17cc
|
Pass original hitobject HitWindows during conversion
|
2018-05-11 15:30:50 +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 |
|
|
|
6f7d0c19ef
|
Remove redundant default value.
|
2018-05-10 22:02:27 -03:00 |
|
|
|
a294f187ee
|
Add steps and asserts to TestCaseScreenBreadcrumbs.
|
2018-05-10 21:52:26 -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 |
|
|
|
86430da6d6
|
Update CircularProgress.FillTo calls
|
2018-05-10 21:08:02 +03:00 |
|
|
|
0afe33d32f
|
Merge pull request #2491 from smoogipoo/beatmap-conversion-rework
Rework beatmap conversion process to use IBeatmap
|
2018-05-10 20:08:37 +08:00 |
|
|
|
8a6ef0dabb
|
Merge branch 'master' into beatmap-conversion-rework
|
2018-05-10 19:10:07 +08:00 |
|
|
|
7fd38e4780
|
Merge pull request #2490 from smoogipoo/i-beatmap
Migrate the game to use an IBeatmap interface
|
2018-05-10 19:07:17 +08:00 |
|
|
|
9e26bcd571
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-i-beatmap
|
2018-05-10 19:51:52 +09:00 |
|
|
|
40c1b24b3d
|
Move IBeatmap to its own file
|
2018-05-10 19:51:40 +09:00 |
|
|
|
ea838f57fc
|
Merge branch 'master' into exit-hold-confirmation
|
2018-05-10 18:37:56 +08:00 |
|
|
|
4b3c2466a4
|
Merge remote-tracking branch 'upstream/master' into disable-mouse-buttons
|
2018-05-10 19:16:52 +09:00 |
|
|
|
df604c40cc
|
Keep shortcut padding even when there is no shortut
|
2018-05-10 18:49:33 +09:00 |
|
|
|
c03ab9014f
|
Improve TestCaseOnScreenDisplay
Now doesn't rely on framesync.
|
2018-05-10 18:48:48 +09:00 |
|
|
|
2bb671cf9e
|
Merge pull request #2516 from peppy/update-framework
Update framework
|
2018-05-10 17:18:39 +08:00 |
|
|
|
c7443e6b3b
|
Update framework
|
2018-05-10 17:52:48 +09:00 |
|
|
|
fadb1a5e0b
|
Add tests and expand functionality to ensure single fire
|
2018-05-10 17:31:16 +09:00 |
|
|
|
63e10ec3c2
|
Update framework
|
2018-05-10 17:10:42 +09:00 |
|
|
|
5df9f126d1
|
Implement a hold-to-confirm screen when exiting game using escape key
|
2018-05-10 17:07:19 +09:00 |
|
|
|
3504f7393f
|
Merge pull request #2482 from smoogipoo/use-bindable-transforms
Use bindable transforms
|
2018-05-10 13:50:13 +08:00 |
|
|
|
853680ca51
|
Merge remote-tracking branch 'origin/master' into disable-mouse-buttons
|
2018-05-10 14:31:52 +09:00 |
|
|
|
2e9c91c32f
|
Merge branch 'master' into use-bindable-transforms
|
2018-05-10 11:45:29 +08:00 |
|
|
|
aa69e0ef12
|
Merge pull request #2495 from smoogipoo/fix-editor-beatmap-change
Fix beatmap/ruleset being changeable while in the editor
|
2018-05-10 11:45:23 +08:00 |
|
|
|
fff34be814
|
Merge branch 'master' into fix-editor-beatmap-change
|
2018-05-10 11:37:36 +08:00 |
|
|
|
e44faebea6
|
Merge pull request #2501 from smoogipoo/remove-explicit-clock
Remove explicit clock in TestCaseBreakOverlay
|
2018-05-10 11:15:06 +08:00 |
|
|
|
5f5e97220d
|
Merge branch 'master' into remove-explicit-clock
|
2018-05-10 11:06:49 +08:00 |
|
|
|
785cf306ec
|
Merge branch 'master' into exit_replay_button
|
2018-05-09 16:31:18 +03:00 |
|
|
|
3c689359af
|
Merge pull request #2471 from UselessToucan/change_ruleset_via_direct_while_on_scorescreen
Decouple FilterControl.Ruleset from the game-wide ruleset bindable
|
2018-05-09 14:09:54 +09:00 |
|
|
|
929e8f16df
|
Merge branch 'master' into change_ruleset_via_direct_while_on_scorescreen
|
2018-05-09 14:02:20 +09:00 |
|
|
|
c7bc79bce3
|
Remove explicit clock in TestCaseBreakOverlay
|
2018-05-09 12:40:04 +09:00 |
|
|
|
38d54f2a6c
|
Merge branch 'master' into back_mouse_button_support
|
2018-05-08 10:35:11 +03:00 |
|
|
|
96baee4e5c
|
Merge pull request #2498 from peppy/update-cfs
Update CodeFileSanity
|
2018-05-08 10:24:21 +09:00 |
|
|
|
44bbb8700e
|
Handle mouse back button using OnMouseDown override instead of using GlobalAction
|
2018-05-08 00:22:11 +03:00 |
|
|
|
c2979a5c48
|
Update CodeFileSanity
|
2018-05-07 22:08:45 +09:00 |
|
|
|
674e45d49b
|
Fix beatmap/ruleset being changeable while in the editor
|
2018-05-07 16:32:15 +09:00 |
|
|
|
fbd7ccc03f
|
Make BeatmapInfoWedge display properly for converts
|
2018-05-07 15:51:08 +09:00 |
|
|
|
09c70a9362
|
Add info label tests to TestCaseBeatmapInfoWedge
|
2018-05-07 15:51:08 +09:00 |
|
