Jacob Odgård Tørring
|
e89ff7e519
|
Merge branch 'master' of https://github.com/odgaard/osu
|
2018-05-11 09:57:00 +02:00 |
|
Jacob Odgård Tørring
|
c55d47ff10
|
Converts OnSeek assignment to method group
|
2018-05-11 09:56:36 +02:00 |
|
Jacob Odgård Tørring
|
37893f9dfe
|
Merge branch 'master' into master
|
2018-05-11 09:43:07 +02:00 |
|
Jacob Odgård Tørring
|
28e8d10d8d
|
Merge branch 'master' of https://github.com/odgaard/osu
|
2018-05-11 09:42:45 +02:00 |
|
Jacob Odgård Tørring
|
17ed5e4839
|
Moves seek restrictions to Player
|
2018-05-11 09:41:31 +02:00 |
|
Jacob Odgård Tørring
|
a877855fc6
|
Changes conditionSeek return type to void
|
2018-05-11 09:39:55 +02:00 |
|
Dean Herbert
|
3ddeeadb8b
|
Merge pull request #2519 from DrabWeb/multiplayer-folder-restructure
Multiplayer folder restructure
|
2018-05-11 16:31:00 +09:00 |
|
DrabWeb
|
a86843ccc9
|
Remove unused usings caused by multiplayer folder restructuring.
|
2018-05-10 20:49:42 -03:00 |
|
DrabWeb
|
bc9ac8f72a
|
Move multiplayer screens to osu.Game/Screens/Multi/Screens
|
2018-05-10 20:47:25 -03:00 |
|
DrabWeb
|
2d206d258a
|
Move multiplayer screen components to osu.Game/Screens/Multi/Components
|
2018-05-10 20:44:24 -03:00 |
|
DrabWeb
|
c35760fdef
|
Rename osu.Game/Screens/Multiplayer to Multi.
|
2018-05-10 20:39:05 -03:00 |
|
Jacob Odgård Tørring
|
7de502b20b
|
Merge branch 'master' into master
|
2018-05-10 17:55:37 +02:00 |
|
Dean Herbert
|
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 |
|
Jacob Odgård Tørring
|
0496deee08
|
Merge branch 'master' into master
|
2018-05-10 13:21:28 +02:00 |
|
Jacob Odgård Tørring
|
d54a7295f6
|
Adds DisableSeek property to MusicController
|
2018-05-10 13:20:04 +02:00 |
|
Dean Herbert
|
8a6ef0dabb
|
Merge branch 'master' into beatmap-conversion-rework
|
2018-05-10 19:10:07 +08:00 |
|
Dean Herbert
|
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 |
|
Dean Herbert
|
9e26bcd571
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-i-beatmap
|
2018-05-10 19:51:52 +09:00 |
|
Dean Herbert
|
40c1b24b3d
|
Move IBeatmap to its own file
|
2018-05-10 19:51:40 +09:00 |
|
Jacob Odgård Tørring
|
a8ca0c899d
|
Merge branch 'master' of https://github.com/odgaard/osu
|
2018-05-10 11:29:39 +02:00 |
|
Jacob Odgård Tørring
|
5b99d8df62
|
Fixes private method name capitalization
|
2018-05-10 11:29:19 +02:00 |
|
Dean Herbert
|
1db5ca0d73
|
Merge branch 'master' into master
|
2018-05-10 17:18:50 +08:00 |
|
Dean Herbert
|
2bb671cf9e
|
Merge pull request #2516 from peppy/update-framework
Update framework
|
2018-05-10 17:18:39 +08:00 |
|
Dean Herbert
|
c7443e6b3b
|
Update framework
|
2018-05-10 17:52:48 +09:00 |
|
Jacob Odgård Tørring
|
bb6478cdc3
|
Adds a check to disable music controller's seek
|
2018-05-10 10:15:47 +02:00 |
|
Dean Herbert
|
3504f7393f
|
Merge pull request #2482 from smoogipoo/use-bindable-transforms
Use bindable transforms
|
2018-05-10 13:50:13 +08:00 |
|
Dean Herbert
|
2e9c91c32f
|
Merge branch 'master' into use-bindable-transforms
|
2018-05-10 11:45:29 +08:00 |
|
Dean Herbert
|
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 |
|
Dean Herbert
|
fff34be814
|
Merge branch 'master' into fix-editor-beatmap-change
|
2018-05-10 11:37:36 +08:00 |
|
Dean Herbert
|
e44faebea6
|
Merge pull request #2501 from smoogipoo/remove-explicit-clock
Remove explicit clock in TestCaseBreakOverlay
|
2018-05-10 11:15:06 +08:00 |
|
Dean Herbert
|
5f5e97220d
|
Merge branch 'master' into remove-explicit-clock
|
2018-05-10 11:06:49 +08:00 |
|
Dan Balasescu
|
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 |
|
Dan Balasescu
|
929e8f16df
|
Merge branch 'master' into change_ruleset_via_direct_while_on_scorescreen
|
2018-05-09 14:02:20 +09:00 |
|
smoogipoo
|
c7bc79bce3
|
Remove explicit clock in TestCaseBreakOverlay
|
2018-05-09 12:40:04 +09:00 |
|
Dan Balasescu
|
96baee4e5c
|
Merge pull request #2498 from peppy/update-cfs
Update CodeFileSanity
|
2018-05-08 10:24:21 +09:00 |
|
Dean Herbert
|
c2979a5c48
|
Update CodeFileSanity
|
2018-05-07 22:08:45 +09:00 |
|
smoogipoo
|
674e45d49b
|
Fix beatmap/ruleset being changeable while in the editor
|
2018-05-07 16:32:15 +09:00 |
|
smoogipoo
|
30a3f4f29f
|
Fix not being able to convert beatmaps with 0 hitobjects
|
2018-05-07 15:27:45 +09:00 |
|
Dean Herbert
|
1be1b10059
|
Merge branch 'master' into change_ruleset_via_direct_while_on_scorescreen
|
2018-05-07 13:32:19 +08:00 |
|
smoogipoo
|
68441f1ef0
|
Output ruleset instantiation info
|
2018-05-07 14:28:30 +09:00 |
|
smoogipoo
|
6867886f4c
|
Give conversion-tested beatmaps a ruleset
|
2018-05-07 14:04:37 +09:00 |
|
smoogipoo
|
7ee8228a37
|
Fix testcases
|
2018-05-07 13:28:01 +09:00 |
|
smoogipoo
|
ad2c2a5fe6
|
Restore star difficulty calculation
|
2018-05-07 12:25:21 +09:00 |
|
smoogipoo
|
268c14813b
|
Fix resharper warnings
|
2018-05-07 11:38:41 +09:00 |
|
smoogipoo
|
e20323b5f6
|
Trim whitespace
|
2018-05-07 11:23:29 +09:00 |
|
smoogipoo
|
794418432f
|
Fix incorrect method name
|
2018-05-07 11:22:25 +09:00 |
|
smoogipoo
|
db3e48c194
|
Rename GetBeatmap() to GetPlayableBeatmap()
|
2018-05-07 10:40:30 +09:00 |
|
smoogipoo
|
9128e64c9a
|
Rename OriginalBeatmap back to Beatmap
|
2018-05-07 10:29:38 +09:00 |
|
smoogipoo
|
7e83c75888
|
Add xmldoc
|
2018-05-07 10:23:32 +09:00 |
|
smoogipoo
|
b68ee39136
|
Reword beatmap conversion error
|
2018-05-07 10:18:47 +09:00 |
|