1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 15:27:36 +08:00
Commit Graph

19040 Commits

Author SHA1 Message Date
EVAST9919
7e96ff7f14 Merge remote-tracking branch 'refs/remotes/ppy/master' into more_button_update 2019-06-04 01:32:12 +03:00
Welsar55
194bb80354 Added close button and indictors of hotkeys to buttons 2019-06-03 11:09:21 -05:00
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
633c3b74ec Don't handle clicks when in a loading state 2019-06-03 17:10:33 +09:00
Dean Herbert
c4f4f32db8 Shorten fade duration 2019-06-03 17:10:33 +09:00
Dean Herbert
1eab4e179d Add sample action to test so hover effect is visible 2019-06-03 17:10:33 +09:00
Dean Herbert
e32f62db5b Add missing file 2019-06-03 16:48:44 +09:00
Dean Herbert
17d04545fa Localise GridTestScene as an OsuGridTestScene 2019-06-03 16:45:18 +09:00
Dean Herbert
491c9e96e0 Fix tests not ending execution after some exceptions 2019-06-03 16:42:27 +09:00
Dean Herbert
171fc14776 Fix editor regressions 2019-06-03 16:34:09 +09:00
Welsar55
fa331fbee1 Merge branch 'master' of https://github.com/ppy/osu 2019-06-03 01:23:25 -05: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
65e3b7c2ae Remove unused DI 2019-06-03 13:58:55 +09:00
Dean Herbert
e55f5efa82 Merge branch 'osu-clickable-container' into settings-footer-show-changelog-current-build 2019-06-03 13:55:23 +09:00
Dean Herbert
cf9bc831ab
Merge branch 'master' into osu-clickable-container 2019-06-03 13:55:08 +09:00
Dean Herbert
3ef17a54f6 Fix sizing of OsuAnimatedButton and OsuClickableContainer
Was incorrect under some combinations of relative and autosize usage.
2019-06-03 13:53:24 +09:00
Dean Herbert
4e5788959e Make clickable text actually a button 2019-06-03 13:38:06 +09:00
Dean Herbert
b249fb3544 Update test scene to support dynamic compilation 2019-06-03 13:37:29 +09:00
Dean Herbert
115a75e4c6 Use a constant for lazer variables 2019-06-03 13:16:05 +09:00
Dean Herbert
dff7053a07
Merge branch 'master' into more_button_update 2019-06-03 11:48:05 +09:00
Dean Herbert
2d15e02406
Merge branch 'master' into selection-update 2019-06-03 11:47:30 +09:00
Lucas A
d8f45f7299 Disallow null references for dependencies loaded via load() 2019-06-02 15:17:03 +02:00
Lucas A
0a867e37af Resolve dependencies via Resolved Attribute 2019-06-02 12:40:18 +02:00
Lucas A
58564579e4 Invert if statement 2019-06-01 08:46:38 +02:00
Lucas A
0625f51e65 Allow dependencies to be null in certain cases (Unit tests) 2019-05-31 22:42:09 +02:00
Lucas A
55c0c6a1bb Show changelog for current build by clicking on settings footer in settings overlay. 2019-05-31 17:43:58 +02:00
Lucas A
b3f6640d11 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-31 12:41:26 +02: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
Dean Herbert
b20ea93906
Merge branch 'master' into audio-refactor-update 2019-05-31 14:58:53 +09:00
Dean Herbert
7bed4eb23b Tidy up WaveformTestBeatmap 2019-05-31 14:57:11 +09:00
Dean Herbert
b52276c489 Pass individual components to DummyWorkingBeatmap, not game 2019-05-31 14:51:12 +09:00
Dean Herbert
f33a5bc54c Centralise and update WorkingBeatmap creation in test cases 2019-05-31 14:40:53 +09:00
Dean Herbert
80d65f9a3b Update resource stores with GetAvailableResources 2019-05-31 14:33:18 +09:00
Dean Herbert
1629534a0c More disposal? 2019-05-31 14:28:53 +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
EVAST9919
cfa0ef6fd9 convert field to a local variable 2019-05-30 23:22:08 +03:00
EVAST9919
fe9e53e383 Add a testcase 2019-05-30 23:07:04 +03:00
EVAST9919
2933169614 Move the button into a separate class 2019-05-30 22:55:59 +03:00
EVAST9919
73fb28f9f7 Make the button inherit from OsuHoverContainer 2019-05-30 22:48:27 +03:00