1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 20:22:55 +08:00
Commit Graph

18657 Commits

Author SHA1 Message Date
Dean Herbert
167213d3eb
Merge branch 'master' into fix-endless-tests 2019-06-04 00:50:18 +09:00
Dean Herbert
808393a878
Merge pull request #4900 from LeNitrous/fix-self-private-channel
Disallow user from opening their own private channel.
2019-06-04 00:49:39 +09:00
LeNitrous
516575a132 don't create "Start Chat" option when the sender is the local user 2019-06-03 18:54:29 +08:00
LeNitrous
4e6d7137aa disallow current user from opening their own private channel 2019-06-03 17:25:19 +08:00
Dean Herbert
491c9e96e0 Fix tests not ending execution after some exceptions 2019-06-03 16:42:27 +09:00
Nathan Alo
78f8157e2b
Merge pull request #6 from ppy/master
Sync fork up to date
2019-06-03 13:41:31 +08:00
Dean Herbert
1c96e7593a
Prevent logo idle state from being updated incorrectly (#4882)
Prevent logo idle state from being updated incorrectly

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-05-31 19:04:15 +09:00
Dean Herbert
32a2aba631
Merge branch 'master' into logo-idle 2019-05-31 18:50:28 +09:00
Dean Herbert
e017350b80
Changelog overlay (#3074)
Changelog overlay
2019-05-31 15:08:08 +09:00
David Zhao
465aa4e0f6 Prevent idle state from being updated incorrectly 2019-05-31 14:06:18 +09:00
smoogipoo
d7ccf939d8 General refactoring 2019-05-31 13:54:40 +09:00
smoogipoo
e7ae9c249f Fix size of release stream separator in listing 2019-05-31 13:53:55 +09:00
smoogipoo
57d648df6d Add comment + fix spinlocking 2019-05-31 13:38:48 +09:00
smoogipoo
4dc77d64a3 Fix overlay group + depth 2019-05-31 13:23:50 +09:00
smoogipoo
f780c80c17 Fix bar not expanding/collapsing correctly 2019-05-31 13:08:35 +09:00
smoogipoo
c211f1d0fe Merge remote-tracking branch 'Joehuu/master' into changelog-overlay 2019-05-31 12:28:28 +09:00
Dean Herbert
dc36b81cee
Update Kudosu section inline with the web version (#4880)
Update Kudosu section inline with the web version

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-05-30 17:33:47 +09:00
Dean Herbert
c950f37497 Ad missing link 2019-05-30 16:57:54 +09:00
Dean Herbert
e5999dd9b1 Update font sizes to match web 2019-05-30 16:49:18 +09:00
EVAST9919
9a13c52ffd Add missing lines 2019-05-29 21:19:03 +03:00
EVAST9919
97dbc95bc6 Kudosu section update 2019-05-29 21:02:20 +03:00
Dan Balasescu
2d4ef1bec9
Merge pull request #4861 from peppy/settings-flexibility
Store databased settings based on string keys rather than ints
2019-05-28 14:23:22 +09:00
Dan Balasescu
5742984c97
Merge branch 'master' into settings-flexibility 2019-05-28 13:35:06 +09:00
Dan Balasescu
1f4957a2da
Merge pull request #4860 from peppy/isolate-checkbox-alpha
Isolate alpha usage in OsuCheckbox
2019-05-28 13:25:37 +09:00
Dan Balasescu
0d2eef68b2
Merge branch 'master' into settings-flexibility 2019-05-28 13:21:33 +09:00
Dan Balasescu
4852519259
Merge branch 'master' into isolate-checkbox-alpha 2019-05-28 13:12:12 +09:00
Dan Balasescu
7ff1fc1a3e
Merge pull request #4859 from peppy/settings-subpanel
Consolidate settings subpanel logic
2019-05-28 13:11:20 +09:00
Dean Herbert
127858d398 Store databased settings based on string keys rather than ints
Allows for rearranging/removal from enums without consequence.
2019-05-27 01:53:49 +09:00
Dean Herbert
e7b9d1efa3 Isolate alpha usage in OsuCheckbox 2019-05-27 01:49:24 +09:00
Dean Herbert
02e2fb963a Tidy up how subpanels are handled in SettingsOverlay 2019-05-27 01:48:21 +09:00
Dean Herbert
53b2245330 Move common settings sub-panel logic to own class 2019-05-27 01:47:23 +09:00
Dan Balasescu
05c0df53dc
Merge pull request #4851 from EVAST9919/graph_visual
Smoothen the rank graph bar movements
2019-05-25 17:17:23 +09:00
EVAST9919
69ada11f41 use constant value 2019-05-24 20:01:47 +03:00
EVAST9919
cda97a61fa Add a bit of smoothness to the rank graph 2019-05-24 19:43:53 +03:00
Dean Herbert
cc256614b9
Merge branch 'master' into changelog-overlay 2019-05-24 11:13:48 +09:00
Dean Herbert
a272004610 Use a more friendly set method for tab control 2019-05-24 11:04:36 +09:00
Dean Herbert
492dd3eee2 Restore accidentally commented conditional 2019-05-24 10:53:02 +09:00
Dean Herbert
ffc7e32c26
Fix UpdateableBeatmapBackgroundSprite displaying extra backgrounds (#4847)
Fix UpdateableBeatmapBackgroundSprite displaying extra backgrounds

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-05-24 10:49:38 +09:00
Dean Herbert
8f87e8ad7f
Merge branch 'master' into fix-beatmap-background-never-removed 2019-05-24 10:41:12 +09:00
Dean Herbert
e034b3d514 Use TaskCompletionSource in a better manner 2019-05-23 19:08:44 +09:00
Dean Herbert
acaf2f9fbb Show changelog from new build notification 2019-05-23 18:54:42 +09:00
Dan Balasescu
b10cd396f9
Merge pull request #4848 from peppy/update-framework
Update framework
2019-05-23 18:07:08 +09:00
Dean Herbert
774ef87868 Merge branch 'update-framework' into HoutarouOreki-changelog-overlay 2019-05-23 17:58:56 +09:00
Dean Herbert
9c6fbebb67 Update framework 2019-05-23 17:55:18 +09:00
Dean Herbert
0bce7241d2 Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay 2019-05-23 17:54:13 +09:00
smoogipoo
f0d7728e81 Fix failures with a null-model 2019-05-23 17:01:22 +09:00
smoogipoo
7971261fbc Don't create a new drawable for the first background 2019-05-23 15:59:22 +09:00
Dan Balasescu
48ef1ae200
Merge pull request #4846 from peppy/fix-preview-state
Fix audio preview buttons not correctly handling load failure states
2019-05-23 14:25:46 +09:00
Dan Balasescu
27504cf81b
Merge branch 'master' into fix-preview-state 2019-05-23 13:49:33 +09:00
Dan Balasescu
484f56615c
Merge pull request #4844 from peppy/expanding-bar
Add ExpandingBar UI element
2019-05-23 13:46:56 +09:00