Dean Herbert
|
08cf8dd299
|
Adjust for readability
|
2019-06-20 01:39:54 +09:00 |
|
Dean Herbert
|
2773cfba42
|
Merge branch 'master' into andy840119/_20190614_hidden_nod_label_when_empty
|
2019-06-20 01:35:24 +09:00 |
|
Dean Herbert
|
6f3cb80076
|
Merge branch 'master' into fix-inactive-audio-race
|
2019-06-20 01:33:47 +09:00 |
|
Dean Herbert
|
bcee8fe9c3
|
Show user online status in user overlay (#5058)
Show user online status in user overlay
|
2019-06-20 01:31:24 +09:00 |
|
iiSaLMaN
|
3e285e5dde
|
Separate beatmap info container from details (avoid overlapping)
|
2019-06-19 17:47:47 +03:00 |
|
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 |
|
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 |
|
Dan Balasescu
|
aef29e2767
|
Merge branch 'master' into remote-unused-property
|
2019-06-19 11:18:12 +09:00 |
|
KingLuigi4932
|
97dd34e26c
|
Seperate updateable from drawable
|
2019-06-19 03:50:16 +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
|
a2cba24f73
|
Merge branch 'master' into android
|
2019-06-19 01:48:21 +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 |
|
Dan Silk
|
35ad9d5240
|
Update Android Framework reference to 2019.615.0
# Conflicts:
# osu.Android.props
|
2019-06-18 20:06:33 +09:30 |
|
Shane Woolcock
|
17d103181c
|
Merge branch 'master' into android
|
2019-06-18 20:05:14 +09:30 |
|
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 |
|
Dean Herbert
|
4baadf6319
|
Add map pool editing functionality to round editor
|
2019-06-18 16:37:13 +09:00 |
|
Dean Herbert
|
412778c71a
|
Rename nested TeamRow class for clarity
|
2019-06-18 15:54:34 +09:00 |
|
Dean Herbert
|
77f3d4848b
|
Make common base class for editor screens
|
2019-06-18 15:53:03 +09:00 |
|
Dean Herbert
|
c31713078f
|
Ensure enough room for control panel display in editor tests
|
2019-06-18 15:44:07 +09:00 |
|
Dean Herbert
|
e4eae3a6d5
|
Move rider configurations into folders
|
2019-06-18 15:40:57 +09:00 |
|