Vidalee
393c01ba90
Made the changes requested
2018-05-06 12:38:25 +02:00
Vidalee
1c1d58e2cb
Merge branch 'master' into osu-hd-setting
2018-05-06 12:23:12 +02:00
Dean Herbert
420e50b6da
Merge pull request #2479 from peppy/add-net471-dep
...
Add squirrel dependency on net471
2018-05-02 17:00:02 +08:00
Dean Herbert
6ecb09431f
Update squirrel path
2018-05-02 16:37:44 +08:00
Dean Herbert
e92166b40f
Update csproj defaults
2018-05-02 16:33:48 +08:00
Dean Herbert
b37acf7510
Update squirrel version for net471 prereq support
2018-05-02 16:23:48 +08:00
Dean Herbert
8b99a3b8e6
Add squirrel dependency on net471
2018-05-02 16:23:48 +08:00
Dean Herbert
036e62e2b1
Merge pull request #2481 from smoogipoo/revert-useroverlay-change
...
Revert breaking UserProfileOverlay change
2018-05-02 16:19:37 +08: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
084504134e
Merge pull request #2450 from tgi74/replay_ruleset
...
Fix replays being played in the selected ruleset
2018-05-02 15:06:24 +08:00
Dan Balasescu
9f327525a7
Merge branch 'master' into replay_ruleset
2018-05-02 14:57:02 +08:00
Dan Balasescu
6fe09ee544
Merge pull request #2458 from 4ppleCracker/patch-1
...
Use more inheritance for UserStatus
2018-05-02 14:56:46 +08:00
Dan Balasescu
0ad049976b
Merge branch 'master' into patch-1
2018-05-02 14:45:30 +08:00
Dan Balasescu
67793845b0
Merge pull request #2470 from UselessToucan/main_track_muted_preview_overlay_closed
...
Stop audio playing from UserProfileOverlay when hiding
2018-05-02 14:02:49 +08:00
Dan Balasescu
94926e464d
Merge branch 'master' into main_track_muted_preview_overlay_closed
2018-05-02 13:53:39 +08:00
Dan Balasescu
80eb98c5da
Merge pull request #2473 from NeoAdonis/hold-offset-fix
...
Apply offset to end times on legacy converter
2018-05-02 12:57:44 +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
76e58a51b9
Merge remote-tracking branch 'upstream/master' into Vidalee-osu-hd-setting
2018-04-25 17:28:21 +09:00
Dean Herbert
306f05b7bd
Merge pull request #2432 from UselessToucan/ignore_beatmap_skin
...
Add toggles for beatmap skins and hitsounds
2018-04-25 16:43:09 +09: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
fe0e73ef6a
Merge pull request #2405 from swoolcock/switchable-tabs
...
Disable tab switching for add channel button
2018-04-25 15:57:13 +09:00
Dean Herbert
0c22e2d998
Merge branch 'master' into switchable-tabs
2018-04-25 15:41:52 +09:00
Dean Herbert
5b8793c390
Merge pull request #2446 from peppy/more-test-fixes
...
Fix some occasionally failing tests
2018-04-25 15:34:05 +09:00
Dean Herbert
7388984d5f
Update framework
2018-04-25 14:57:08 +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
57219ae9c6
Fix clashing variable name
2018-04-24 02:07:16 +09:00
Dean Herbert
3886e75959
Fix potentially missing group headers in beatmap carousel
2018-04-24 01:52:25 +09:00
Dean Herbert
f4c2d6b1a3
Fix wedge load test again
...
Initial load was not being waited on for long enough.
2018-04-24 00:51:33 +09:00
Dean Herbert
a6da1b49e7
Merge pull request #2426 from peppy/net471
...
Update to .NET 4.7.1
2018-04-23 22:35:15 +09:00
Dean Herbert
93b77d9cfe
Remove annotation
2018-04-23 22:22:31 +09:00
Dean Herbert
843385af0d
Merge remote-tracking branch 'upstream/master' into net471
2018-04-23 22:00:11 +09:00
Dean Herbert
a9ddb46ade
Merge pull request #2334 from peppy/async-screens
...
Make screens always load async (fixes stutter when entering editor)
2018-04-23 21:58:04 +09:00
Dean Herbert
9551b6914b
Fix UserProfile test failing when not logged in
2018-04-23 21:41:51 +09:00
Dean Herbert
1de9a63ac6
Merge branch 'master' into async-screens
2018-04-23 20:50:43 +09:00
Dean Herbert
7d09a39262
Fix remaining broken test
2018-04-23 20:50:16 +09:00
Dean Herbert
2952ba2433
Merge pull request #2427 from peppy/fix-badge-container
...
Fix BadgeContainer being unable to handle null badges
2018-04-23 19:38:17 +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
8b1b605c09
Update framework
2018-04-23 18:32:32 +09:00
Dean Herbert
ff3d3379f0
Merge remote-tracking branch 'upstream/master' into async-screens
2018-04-23 18:29:37 +09:00
Dean Herbert
2bd2facc90
Merge pull request #2444 from peppy/misc-fixes
...
Fix new detections in rider 2018.1
2018-04-23 18:10:09 +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
