smoogipoo
674e45d49b
Fix beatmap/ruleset being changeable while in the editor
2018-05-07 16:32:15 +09:00
Dan Balasescu
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
Dan Balasescu
9f327525a7
Merge branch 'master' into replay_ruleset
2018-05-02 14:57:02 +08:00
Dan Balasescu
0ad049976b
Merge branch 'master' into patch-1
2018-05-02 14:45:30 +08:00
Dan Balasescu
94926e464d
Merge branch 'master' into main_track_muted_preview_overlay_closed
2018-05-02 13:53:39 +08:00
Adonais Romero González
06c6f55995
Apply offset to end times on legacy converter
2018-04-30 00:43:32 -07:00
TocoToucan
8de05450c4
Cleanup UserProfileOverlay during PopOut
2018-04-29 17:53:38 +03:00
Nobbele
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
Dean Herbert
6e6586909b
User pattern matching
2018-04-25 16:32:06 +09:00
Dean Herbert
4f53185d43
Invert logic to match existing toggles
2018-04-25 16:18:55 +09:00
Dean Herbert
c517b73375
Merge branch 'master' into ignore_beatmap_skin
2018-04-25 15:57:39 +09:00
Dean Herbert
0c22e2d998
Merge branch 'master' into switchable-tabs
2018-04-25 15:41:52 +09:00
tgi74000
f41006def7
Set game ruleset to the score ruleset
2018-04-24 21:17:04 +02:00
Shane Woolcock
84bda7d23f
Update framework and ensure the add channel button is not switchable
2018-04-24 20:46:44 +09:30
Dean Herbert
45810e6220
Merge branch 'master' into ignore_beatmap_skin
2018-04-24 17:15:39 +09:00
Dean Herbert
3886e75959
Fix potentially missing group headers in beatmap carousel
2018-04-24 01:52:25 +09:00
Dean Herbert
93b77d9cfe
Remove annotation
2018-04-23 22:22:31 +09:00
Dean Herbert
1de9a63ac6
Merge branch 'master' into async-screens
2018-04-23 20:50:43 +09:00
Dean Herbert
eb7fe0b9e2
Merge branch 'master' into fix-badge-container
2018-04-23 19:13:34 +09:00
UselessToucan
254e9929be
Merge branch 'master' into ignore_beatmap_skin
2018-04-23 13:06:24 +03:00
Dean Herbert
2d1cef79d6
Fix instability in carousel item sorting
2018-04-23 19:01:01 +09:00
Dean Herbert
ff3d3379f0
Merge remote-tracking branch 'upstream/master' into async-screens
2018-04-23 18:29:37 +09:00
Dean Herbert
194992936d
Use exceptions
2018-04-23 17:57:47 +09:00
Dean Herbert
0709a0926b
Merge branch 'master' into misc-fixes
2018-04-23 17:46:58 +09:00
Dean Herbert
2d82c0b5cd
Fix logical regression
2018-04-23 16:41:15 +09:00
Dean Herbert
1f73ad0da5
Merge branch 'master' into fix-intro-race-condition
2018-04-23 15:17:44 +09:00
Dean Herbert
6e16f2a3c3
Add assert to appease rider/r#
2018-04-23 15:03:41 +09:00
Dean Herbert
36a671e306
Fix new detections in rider 2018.1
2018-04-23 14:56:45 +09:00
Dean Herbert
0e57f685f8
Merge pull request #2429 from peppy/fix-skin-parse-errors
...
Add error handling on a per-line level in LegacyDecoder
2018-04-22 10:53:43 +09:00
Dean Herbert
64ddee5646
Change load order to ensure runner is loaded before blocking op
2018-04-22 04:26:27 +09:00
Dean Herbert
44a9aa529a
Test CI run with new changes
2018-04-22 03:51:17 +09:00
Dean Herbert
2c9b2aa0e7
Fix intro setting beatmap in background thread causing race conditions
2018-04-22 02:46:20 +09:00
TocoToucan
1ce38c7fc6
Visual settings: Ignore beatmap hitsounds
2018-04-20 18:30:41 +03:00
TocoToucan
606e088713
Visual settings: Ignore beatmap skin
2018-04-20 18:17:57 +03:00
Dean Herbert
e9e97f31d6
Merge remote-tracking branch 'upstream/master' into peppy-async-screens
2018-04-20 19:06:47 +09:00
Dean Herbert
a5b0005976
Merge branch 'master' into remove-approachcircle-hax
2018-04-20 18:36:49 +09:00
Dean Herbert
b16e25c3e9
Add error handling on a per-line level in LegacyDecoder
...
Resolves #2306 .
2018-04-20 18:32:24 +09:00
Dan Balasescu
cb8067539a
Merge branch 'master' into remove-approachcircle-hax
2018-04-20 18:20:51 +09:00
smoogipoo
0dce7a5b61
Update framework + fix CI errors
2018-04-20 18:19:17 +09:00
Dean Herbert
29a28387d8
Merge branch 'master' into show-beatmap-id
2018-04-20 18:07:52 +09:00
Dean Herbert
27437cfbaf
Merge branch 'master' into show-beatmap-id
2018-04-20 18:05:24 +09:00
Dean Herbert
8bf25542cb
Add PlayerLoader TestCase and fix dummy beatmap load procedure
2018-04-20 17:30:27 +09:00
Dean Herbert
de85436534
Merge remote-tracking branch 'upstream/master' into peppy-async-screens
2018-04-20 16:52:58 +09:00
Dean Herbert
0b993561d8
Fix BadgeContainer being unsable to handle null badges
...
This fixes a failing test (hidden becaues the test wasn't being run).
- [ ] Merge osu-framework#1530 first.
2018-04-20 16:05:34 +09:00
Dean Herbert
dce569c9be
Merge branch 'master' into fix-overlapping-speedchanges
2018-04-20 15:36:28 +09:00
smoogipoo
11b943c820
ComputePositions -> UpdatePositions
2018-04-20 14:22:48 +09:00
smoogipoo
52e3ffff30
Add some more commenting to lifetime calculation
2018-04-20 14:20:16 +09:00
smoogipoo
f3fddcc82c
Reorder parameter for consistency
2018-04-20 14:20:04 +09:00
smoogipoo
48b421b4b4
Add comments to SequentialSpeedChangeVisualiser
2018-04-20 14:16:30 +09:00
smoogipoo
1bab601cbc
Comments + xmldocs
2018-04-20 13:51:36 +09:00
