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

15293 Commits

Author SHA1 Message Date
Dean Herbert
852f0337dd Group map pool by mod type 2018-11-17 16:06:43 +09:00
Dean Herbert
4ae9413ee6 Add mod icons 2018-11-17 16:00:12 +09:00
Dean Herbert
9f519d7002 Actually add match score display to gameplay screen 2018-11-17 15:59:55 +09:00
Dean Herbert
26286177d3 Colour chat names 2018-11-17 15:35:14 +09:00
Dean Herbert
49e155c2c0 Fix chat not appearing at ranking 2018-11-17 15:31:03 +09:00
Dean Herbert
aebece3d89 Use already populated beatmap values if available 2018-11-17 15:18:22 +09:00
Dean Herbert
5659ba6ef8 Add logo to ladder screen 2018-11-17 14:59:37 +09:00
Dean Herbert
71184c602f Show times on schedule 2018-11-17 14:55:27 +09:00
Dean Herbert
81f39c2f39 Don't show matches on schedule which don't have teams set 2018-11-17 14:35:40 +09:00
Dean Herbert
bed967b456 Add better date string formatting 2018-11-17 14:05:42 +09:00
Dean Herbert
c1e1306c97 Show controls above screens 2018-11-17 13:39:55 +09:00
Dean Herbert
7f7d4ef442 Don’t hard fail if stable install is missing 2018-11-17 13:36:36 +09:00
Dean Herbert
87243a72d3 Add date entry for pairings 2018-11-17 12:14:15 +09:00
Dean Herbert
2ee77670ee Add date entry for groupings 2018-11-17 12:04:19 +09:00
Dean Herbert
c1e3c4d435 Make chat tests work again, clear old messages 2018-11-17 10:40:44 +09:00
Dean Herbert
d09b674fb3 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-16 20:36:08 +09:00
Dean Herbert
4b74105ad9 Fix code sanity issues 2018-11-16 20:34:51 +09:00
Dean Herbert
cf0976955b Expose groupings editor 2018-11-16 20:30:12 +09:00
Dean Herbert
67bb428aef Move editing functionality to its own screen 2018-11-16 20:16:18 +09:00
Dean Herbert
5801ed7b1a Adjust spacing on map pool screen 2018-11-16 19:49:17 +09:00
Dean Herbert
e3e92f4302 Add chat IPC and gameplay screen integration 2018-11-16 19:43:54 +09:00
Dan Balasescu
974873f5b4
Merge pull request #3688 from jorolf/flashlight-mod
Add flashlight mod
2018-11-16 18:57:14 +09:00
Dan Balasescu
57c1ddb1e0
Merge branch 'master' into flashlight-mod 2018-11-16 18:45:15 +09:00
smoogipoo
92b1c56aed Update osu-resources 2018-11-16 18:31:37 +09:00
Dean Herbert
c9e2ee8f56 Fix masking of song bar 2018-11-16 18:14:42 +09:00
Dean Herbert
1ab4713ef6 Add tournament chat display 2018-11-16 15:30:19 +09:00
Dean Herbert
e6637532bc Add back padding 2018-11-16 12:20:21 +09:00
jorolf
80bd98bb9d apply suggestions 2018-11-15 17:38:38 +01:00
Dean Herbert
46e163ec5e Add score display 2018-11-15 21:28:42 +09:00
Dan Balasescu
3e2e2a7000
Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle
Return to large logo after idle period
2018-11-15 15:40:15 +09:00
Dan Balasescu
e8f34ddff0
Merge branch 'master' into return_to_large_logo_after_idle 2018-11-15 15:16:10 +09:00
Dean Herbert
54b87e9c93 Don't crash on unexpected pairing links 2018-11-15 14:12:51 +09:00
Dean Herbert
604cb4cb9e Update to support new dropdown logic 2018-11-15 14:12:41 +09:00
Dean Herbert
8eff21d128 Fix star colours being incorrect 2018-11-15 14:12:14 +09:00
Dean Herbert
01f814aace Fix song length not being rounded correctly when DT is applied 2018-11-15 14:11:58 +09:00
Dean Herbert
b574a07f23 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-15 13:31:34 +09:00
Dan Balasescu
d94801b6c6
Merge pull request #3720 from HoLLy-HaCKeR/fix-settingstextbox
Fix SettingsTextBox having width of 0
2018-11-15 12:15:11 +09:00
jorolf
f0f7b15edc
remove unused using 2018-11-15 00:45:27 +01:00
jorolf
41a0f9896e
Merge branch 'master' into flashlight-mod 2018-11-15 00:35:42 +01:00
jorolf
7d2958b7b0 split shader, remove unnecessary clutter and fix some bugs 2018-11-15 00:33:13 +01:00
HoLLy
9dd3d28436 Fix SettingsTextBox having width of 0 2018-11-14 22:29:11 +01:00
Dean Herbert
92adcb7613
Merge pull request #3719 from smoogipoo/dropdown-updates
Update with osu!-side dropdown changes
2018-11-14 21:27:16 +09:00
Dean Herbert
caaa5645e3 Correct framework version 2018-11-14 21:16:08 +09:00
Dean Herbert
30547ac064 Merge remote-tracking branch 'upstream/master' into dropdown-updates 2018-11-14 20:03:45 +09:00
Dan Balasescu
287d7043f8
Merge pull request #3686 from peppy/hold-for-menu-back
Require holding back button to quit gameplay
2018-11-14 19:32:24 +09:00
smoogipoo
f1f2fc133a Use SkinInfo directly 2018-11-14 19:29:20 +09:00
Dan Balasescu
81a3170e3b
Merge branch 'master' into hold-for-menu-back 2018-11-14 19:13:07 +09:00
Dean Herbert
e34881c2c0
Merge pull request #3714 from smoogipoo/placement-hiding
Hide the placement blueprint when cursor is outside the playfield
2018-11-14 18:54:26 +09:00
Dan Balasescu
61a62a4eae
Merge branch 'master' into hold-for-menu-back 2018-11-14 18:35:08 +09:00
smoogipoo
4b86c29f7b Merge remote-tracking branch 'origin/master' into placement-hiding 2018-11-14 18:34:45 +09:00