Jacob Odgård Tørring
a877855fc6
Changes conditionSeek return type to void
2018-05-11 09:39:55 +02:00
Jacob Odgård Tørring
d54a7295f6
Adds DisableSeek property to MusicController
2018-05-10 13:20:04 +02: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
Dean Herbert
1be1b10059
Merge branch 'master' into change_ruleset_via_direct_while_on_scorescreen
2018-05-07 13:32:19 +08:00
Roman Kapustin
33e2b91ccc
Decouple FilterControl.Ruleset from the game-wide ruleset bindable
2018-05-03 22:59:49 +03:00
smoogipoo
2d6b2d10f7
Use bindable transforms
2018-05-02 18:26:23 +09: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
ca574f2345
Disable RulesetToggleButton whenever the ruleset can't be changed
2018-04-29 18:36:19 +03: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
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
