1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 17:57:38 +08:00
Commit Graph

19071 Commits

Author SHA1 Message Date
Dan Balasescu
6deee968ac
Merge branch 'master' into modselect-async-improvements 2019-06-21 11:42:25 +09:00
Dan Balasescu
cd52dbf1a7
Merge pull request #5076 from peppy/remove-debug-utils
Remove osu!-side DebugUtils
2019-06-21 11:25:22 +09:00
Dan Balasescu
4d02e17539
Merge branch 'master' into remove-debug-utils 2019-06-21 11:10:59 +09:00
Dean Herbert
fa94f063be Use correct button type 2019-06-21 00:26:55 +09:00
Dean Herbert
fa263b91a7 Attempt to fix tests 2019-06-21 00:12:39 +09:00
Dean Herbert
7b4180ce86 Fix failing test 2019-06-20 23:51:47 +09:00
Dean Herbert
52ca5f9c00 Fix mod icons in ModSelect being loaded in a blocking fashion 2019-06-20 23:06:07 +09:00
Dan Balasescu
35ce032be1
Merge pull request #5077 from Joehuu/remove-bad-words-1
Remove bad words on code comments
2019-06-20 13:54:08 +09:00
Joehu
ca919f02e6 Remove bad words on code comments 2019-06-19 21:33:58 -07:00
Dean Herbert
97d65783db Remove osu!-side DebugUtils 2019-06-20 12:48:45 +09:00
Dean Herbert
471c5b7386
Fix a couple of README typos 2019-06-20 11:23:36 +09:00
Dean Herbert
7482ecb8e7
Fix beatmap set cover goes out of its container (#5073)
Fix beatmap set cover goes out of its container
2019-06-20 11:21:22 +09:00
Dean Herbert
a2ca798dc2
Fix scores header is visible even with no scores (#5074)
Fix scores header is visible even with no scores
2019-06-20 11:09:07 +09:00
Andrei Zavatski
e83710d3b8 Add a testcase 2019-06-19 23:15:00 +03:00
Andrei Zavatski
0da8a483c5 Fix scores header is visible even if no scores are loaded 2019-06-19 23:14:53 +03:00
iiSaLMaN
ee2268caba
Enable masking for the beatmap set cover 2019-06-19 21:20:00 +03:00
Dean Herbert
9858419c69
Improve vertical flexibility of BeatmapSetOverlay's header (#5067)
Improve vertical flexibility of BeatmapSetOverlay's header
2019-06-20 02:22:19 +09:00
iiSaLMaN
865af00ab6
Merge branch 'master' into header-improvements 2019-06-19 20:00:28 +03:00
Dean Herbert
a4ceefdc9d
Hide empty categories in mod selector overlay (#5021)
Hide empty categories in mod selector overlay

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-20 01:59:30 +09:00
Dean Herbert
cd2999d0d1 Rename mod select test scene 2019-06-20 01:40:58 +09:00
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
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
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
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
Andrei Zavatski
03d560ed41 Initial implementation 2019-06-18 19:13:21 +03: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
6823ba1ab0 Unbind from previous bindable when rebinding a SettingsItem 2019-06-18 14:24:44 +09:00
Dean Herbert
5bb8649f3b Remove unused property from chat message 2019-06-18 14:22:59 +09:00
Dean Herbert
07ea0f9755 Make OsuButton non-abstract again 2019-06-18 14:16:54 +09:00
Dean Herbert
0d4c6d2cbc
Fade volume when game window becomes inactive (#5047)
Fade volume when game window becomes inactive

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-17 23:58:03 +09:00
Lucas A
04dc1c1744
Fix typo in comment
Co-Authored-By: Joseph Madamba <madamba.joehu@outlook.com>
2019-06-17 16:44:53 +02:00
Dean Herbert
3a04684efb Add region 2019-06-17 23:25:16 +09:00