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

19749 Commits

Author SHA1 Message Date
iiSaLMaN
15229f3a23
Make header expandable 2019-06-19 17:45:39 +03:00
iiSaLMaN
5fb4f2fadf
Add TOP_PADDING 2019-06-19 17:38:43 +03:00
naoey
4b46601eae
Remove redundant variable, handle all request failures 2019-06-19 19:43:09 +05:30
KingLuigi4932
a6c268ef5c Move the horizontal margin into the sprite text itself 2019-06-19 15:05:53 +03:00
KingLuigi4932
475b40cc02 Remove empty line 2019-06-19 14:47:29 +03:00
KingLuigi4932
4600336581 Use TextFlowContainer + small changes 2019-06-19 14:43:18 +03:00
Andrei Zavatski
e16de58450 Add a testcase 2019-06-19 12:34:01 +03:00
Andrei Zavatski
17749e84f9 Merge remote-tracking branch 'refs/remotes/ppy/master' into user-online-fix 2019-06-19 12:17:31 +03:00
Andrei Zavatski
1c44fa84fb Fix colour issues 2019-06-19 12:15:32 +03:00
Andrei Zavatski
c8604b2c17 Merge remote-tracking branch 'refs/remotes/ppy/master' into useroverlay-tabs 2019-06-19 12:08:34 +03:00
Dean Herbert
dd926f55bd Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-19 14:55:34 +09:00
Dean Herbert
d6469aed58 Remove migration code 2019-06-19 14:55:28 +09:00
Dean Herbert
82515a52fe
Fix audio being dimmed during multiplayer (#5041)
Fix audio being dimmed during multiplayer

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-19 14:45:51 +09:00
Dean Herbert
3043f42eb5
Merge branch 'master' into fix-multiplayer-audio 2019-06-19 14:36:05 +09:00
Dan Balasescu
0895a01172
Merge pull request #5064 from peppy/fix-main-menu-nullref
Fix startup crash if main menu does not load fast enough
2019-06-19 14:17:00 +09:00
Dean Herbert
b51aad7433
Merge branch 'master' into fix-multiplayer-audio 2019-06-19 13:36:25 +09:00
Dean Herbert
f26fe53feb Fix startup crash if main menu does not load fast enough 2019-06-19 13:16:19 +09:00
Dean Herbert
6426983de0 Move logic out of update (and simplify, hopefully) 2019-06-19 13:15:58 +09:00
Dean Herbert
fbd9ebf02d
Merge pull request #5054 from peppy/settings-item-unbind-previous-bindable
Unbind from previous bindable when rebinding a SettingsItem
2019-06-19 13:09:19 +09:00
Dean Herbert
262129b96b
Remove unused property from chat message (#5053)
Remove unused property from chat message

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-06-19 13:09:04 +09:00
Dean Herbert
26c32ceeb1
Merge branch 'master' into generic-download-model-manager 2019-06-19 12:50:54 +09:00
Dan Balasescu
aef29e2767
Merge branch 'master' into remote-unused-property 2019-06-19 11:18:12 +09:00
KingLuigi4932
6e28294182 Fix another test 2019-06-19 04:27:31 +03:00
KingLuigi4932
97dd34e26c Seperate updateable from drawable 2019-06-19 03:50:16 +03:00
KingLuigi4932
3876442143 More simplifies + fix test 2019-06-19 03:37:08 +03:00
KingLuigi4932
a0609f28d7 Revert some changes + simplify BeatmapNotAvailable 2019-06-19 01:43:28 +03:00
iiSaLMaN
5278c5f365
Merge branch 'master' into not-available-to-download 2019-06-19 01:14:32 +03:00
Dean Herbert
bc8ce5d188
Merge branch 'master' into use-modelbackeddrawable 2019-06-19 06:27:36 +09:00
Dean Herbert
d0d2be0aca
Merge pull request #5059 from iiSaLMaN/update-framework
Update framework
2019-06-19 06:27:13 +09:00
Andrei Zavatski
2fb1052a1e Add missing space 2019-06-18 21:04:36 +03:00
KingLuigi4932
a5adc89839 Update framework 2019-06-18 20:37:56 +03:00
Dean Herbert
1bcff8a3e2 Make generic covariant 2019-06-19 01:57:38 +09:00
Dean Herbert
341dc74834 Simplify download method 2019-06-19 01:41:19 +09:00
Dean Herbert
f2e0ced052 Move private event handling logic to bottom of class 2019-06-19 01:32:37 +09:00
Dean Herbert
d65c20bbdc
Merge branch 'master' into generic-download-model-manager 2019-06-19 01:29:06 +09:00
Andrei Zavatski
03d560ed41 Initial implementation 2019-06-18 19:13:21 +03:00
Andrei Zavatski
3c3757f12e Make ProfileTabControl based on OverlayTabControl 2019-06-18 16:23:57 +03:00
Andrei Zavatski
a7306248d1 Implement OverlayTabControl class
An abstraction for OverlayHeaderTabControl
2019-06-18 16:20:35 +03:00
Dean Herbert
7b68ac667b
Merge branch 'master' into tournament-tools 2019-06-18 20:20:13 +09:00
Dean Herbert
f15df51514
Remove test which is failing due to magic numbers (#5055)
Remove test which is failing due to magic numbers
2019-06-18 20:19:00 +09:00
Dean Herbert
2d20c088f7 Remove test which is failing due to magic numbers 2019-06-18 18:31:42 +09:00
Dan Balasescu
9776494c63
Merge pull request #5052 from peppy/make-osu-button-instantiable
Make OsuButton non-abstract again
2019-06-18 18:29:35 +09:00
Dean Herbert
1ca0047956 Merge branch 'make-osu-button-instantiable' into tournament-tools 2019-06-18 18:06:09 +09:00
Dean Herbert
fd9a759cba Merge branch 'remote-unused-property' into tournament-tools 2019-06-18 18:06:06 +09:00
Dean Herbert
5c523dbe60 Merge branch 'settings-item-unbind-previous-bindable' into tournament-tools 2019-06-18 18:06:03 +09:00
Dean Herbert
4911bf1157 Revert unnecessary changes to APIBeatmap 2019-06-18 18:03:16 +09:00
Dean Herbert
9a319e3f96 Add missing space 2019-06-18 17:59:47 +09:00
Dean Herbert
ba589b2139 Add more functionality and share more logic between editor screens 2019-06-18 17:59:33 +09:00
Dean Herbert
711214ed09 Use OsuButton everywhere 2019-06-18 17:17:46 +09:00
Dean Herbert
437ad2b0d0 Transfer more pieces of user across 2019-06-18 16:46:33 +09:00