d87ac5a1cb
Create the drawable hierarchy for DrawableRoom in load.
2018-05-10 22:12:25 -03:00
8a6ef0dabb
Merge branch 'master' into beatmap-conversion-rework
2018-05-10 19:10:07 +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
2e9c91c32f
Merge branch 'master' into use-bindable-transforms
2018-05-10 11:45:29 +08:00
fff34be814
Merge branch 'master' into fix-editor-beatmap-change
2018-05-10 11:37:36 +08:00
674e45d49b
Fix beatmap/ruleset being changeable while in the editor
2018-05-07 16:32:15 +09:00
30a3f4f29f
Fix not being able to convert beatmaps with 0 hitobjects
2018-05-07 15:27:45 +09:00
1be1b10059
Merge branch 'master' into change_ruleset_via_direct_while_on_scorescreen
2018-05-07 13:32:19 +08:00
68441f1ef0
Output ruleset instantiation info
2018-05-07 14:28:30 +09:00
6867886f4c
Give conversion-tested beatmaps a ruleset
2018-05-07 14:04:37 +09:00
ad2c2a5fe6
Restore star difficulty calculation
2018-05-07 12:25:21 +09:00
794418432f
Fix incorrect method name
2018-05-07 11:22:25 +09:00
db3e48c194
Rename GetBeatmap() to GetPlayableBeatmap()
2018-05-07 10:40:30 +09:00
9128e64c9a
Rename OriginalBeatmap back to Beatmap
2018-05-07 10:29:38 +09:00
7e83c75888
Add xmldoc
2018-05-07 10:23:32 +09:00
b68ee39136
Reword beatmap conversion error
2018-05-07 10:18:47 +09:00
4ecdea8b2e
Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer
2018-05-07 10:17:54 +09:00
77e661489d
Merge branch 'i-beatmap' into beatmap-conversion-rework
2018-05-07 10:00:24 +09:00
1aefd71b65
Merge remote-tracking branch 'origin/master' into i-beatmap
2018-05-07 09:58:53 +09:00
f3aa9269ff
Fix mania-specific beatmap conversion
2018-05-07 09:17:12 +09:00
33e2b91ccc
Decouple FilterControl.Ruleset from the game-wide ruleset bindable
2018-05-03 22:59:49 +03:00
2d6b2d10f7
Use bindable transforms
2018-05-02 18:26:23 +09:00
9f9447d441
Revert "Merge pull request #2470 from UselessToucan/main_track_muted_preview_overlay_closed"
...
This reverts commit 67793845b0
2018-05-02 16:39:00 +09:00
9f327525a7
Merge branch 'master' into replay_ruleset
2018-05-02 14:57:02 +08:00
0ad049976b
Merge branch 'master' into patch-1
2018-05-02 14:45:30 +08:00
94926e464d
Merge branch 'master' into main_track_muted_preview_overlay_closed
2018-05-02 13:53:39 +08:00
06c6f55995
Apply offset to end times on legacy converter
2018-04-30 00:43:32 -07:00
ca574f2345
Disable RulesetToggleButton whenever the ruleset can't be changed
2018-04-29 18:36:19 +03:00
8de05450c4
Cleanup UserProfileOverlay during PopOut
2018-04-29 17:53:38 +03:00
ad8ba37ee3
Updated UserStatus.cs to make more sense(UNTESTED)
...
Untested code, on my ipad in school so i can’t compile the code or check for refrences to stuff
Modding, playing multiplayer/singleplayer, Busy, etc are all done when user is online so they may just be a class of type UserStatusOnline(used to be UserStatusAvailable but since available and online are basically the same i just made available be online). I don’t know how PM’s are handled but i assume that the client recieves the PM and then decides what to do based on your status. By doing this you can interupt the user with the message if typeof(status) != typeof(UserStatusBusy), making multiplaying, solo game, etc not interupt the user, but when typeof(status) == typeof(UserStatusBusy) show a less intrusive message box to not interupt the user
2018-04-26 12:57:24 +02:00
6e6586909b
User pattern matching
2018-04-25 16:32:06 +09:00
4f53185d43
Invert logic to match existing toggles
2018-04-25 16:18:55 +09:00
c517b73375
Merge branch 'master' into ignore_beatmap_skin
2018-04-25 15:57:39 +09:00
0c22e2d998
Merge branch 'master' into switchable-tabs
2018-04-25 15:41:52 +09:00
f41006def7
Set game ruleset to the score ruleset
2018-04-24 21:17:04 +02:00
84bda7d23f
Update framework and ensure the add channel button is not switchable
2018-04-24 20:46:44 +09:30
45810e6220
Merge branch 'master' into ignore_beatmap_skin
2018-04-24 17:15:39 +09:00
3886e75959
Fix potentially missing group headers in beatmap carousel
2018-04-24 01:52:25 +09:00
93b77d9cfe
Remove annotation
2018-04-23 22:22:31 +09:00
1de9a63ac6
Merge branch 'master' into async-screens
2018-04-23 20:50:43 +09:00
eb7fe0b9e2
Merge branch 'master' into fix-badge-container
2018-04-23 19:13:34 +09:00
254e9929be
Merge branch 'master' into ignore_beatmap_skin
2018-04-23 13:06:24 +03:00
2d1cef79d6
Fix instability in carousel item sorting
2018-04-23 19:01:01 +09:00
ff3d3379f0
Merge remote-tracking branch 'upstream/master' into async-screens
2018-04-23 18:29:37 +09:00
194992936d
Use exceptions
2018-04-23 17:57:47 +09:00
0709a0926b
Merge branch 'master' into misc-fixes
2018-04-23 17:46:58 +09:00
2d82c0b5cd
Fix logical regression
2018-04-23 16:41:15 +09:00
1f73ad0da5
Merge branch 'master' into fix-intro-race-condition
2018-04-23 15:17:44 +09:00
6e16f2a3c3
Add assert to appease rider/r#
2018-04-23 15:03:41 +09:00
