Dean Herbert
|
2e3d392a9f
|
Mark OsuButton as abstract
Not being used directly, so we probably shouldn't support it for now.
|
2019-06-04 22:12:55 +09:00 |
|
Dean Herbert
|
1d9274427b
|
Merge branch 'master' into osu-clickable-container
|
2019-06-04 21:55:14 +09:00 |
|
Dean Herbert
|
6ba4dde983
|
Fix incorrect testcase assertion (#4908)
Fix incorrect testcase assertion
|
2019-06-04 21:54:08 +09:00 |
|
smoogipoo
|
ff647940ca
|
Fix incorrect assertion
|
2019-06-04 19:25:34 +09:00 |
|
Dean Herbert
|
7d2a75b350
|
Dim music volume when holding to confirm
|
2019-06-04 18:37:26 +09:00 |
|
Dean Herbert
|
4e7f2b8f47
|
Merge branch 'master' into osu-clickable-container
|
2019-06-04 17:42:17 +09:00 |
|
Dean Herbert
|
9c214c3f0e
|
Add animation on failing
|
2019-06-04 16:13:16 +09:00 |
|
Dan Balasescu
|
76474987ef
|
Merge pull request #4873 from peppy/audio-refactor-update
Update osu! in line with audio subsystem refactor
|
2019-06-04 12:18:58 +09:00 |
|
Dean Herbert
|
b8fc535124
|
Fix blueprint tests crashing due to out-of-order operations
|
2019-06-04 12:08:23 +09:00 |
|
Dean Herbert
|
80a66b8b3a
|
Merge remote-tracking branch 'upstream/master' into audio-refactor-update
|
2019-06-04 12:08:21 +09:00 |
|
smoogipoo
|
4763a41c7e
|
Cleanups
|
2019-06-04 11:25:18 +09:00 |
|
Dean Herbert
|
3a187c2d5e
|
Fix tests potentially loading tracks upon disposal (#4899)
Fix tests potentially loading tracks upon disposal
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
|
2019-06-04 11:17:54 +09:00 |
|
smoogipoo
|
474191fcec
|
Update framework
|
2019-06-04 11:13:21 +09:00 |
|
Dan Balasescu
|
6e79e374e2
|
Merge branch 'master' into fix-endless-tests
|
2019-06-04 11:07:50 +09:00 |
|
smoogipoo
|
cea353975f
|
Update with further framework-side changes
|
2019-06-04 11:04:28 +09:00 |
|
Dean Herbert
|
5096aaa6f4
|
Update 'ShowMore' button in line with the web version (#4875)
Update 'ShowMore' button in line with the web version
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-06-04 10:51:01 +09:00 |
|
smoogipoo
|
53a39e9142
|
Merge remote-tracking branch 'origin/master' into audio-refactor-update
|
2019-06-04 10:50:33 +09:00 |
|
Dean Herbert
|
a5a025de68
|
Add proper tests
|
2019-06-04 10:26:35 +09:00 |
|
Dean Herbert
|
e8315085c0
|
Better handle OnClick
|
2019-06-04 10:26:21 +09:00 |
|
EVAST9919
|
d5a2ebf79f
|
Fix endless loading state part 2
|
2019-06-04 04:04:33 +03:00 |
|
EVAST9919
|
2c71371282
|
Fix endless loading state
|
2019-06-04 02:06:15 +03:00 |
|
EVAST9919
|
fe6b4112c6
|
Adjust colors to match web design
|
2019-06-04 01:47:45 +03:00 |
|
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
|
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
|
dff7053a07
|
Merge branch 'master' into more_button_update
|
2019-06-03 11:48:05 +09: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 |
|