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

42859 Commits

Author SHA1 Message Date
Dean Herbert
6164903fec
Merge branch 'master' into new-difficulty-colours 2021-08-06 18:05:53 +09:00
Dean Herbert
7d670c6d35 Fix gap in fill colour 2021-08-06 18:05:24 +09:00
Dan Balasescu
acbdae3c4c
Merge pull request #14133 from EVAST9919/svs-fix
Fix colour picker antialiasing
2021-08-05 20:34:03 +09:00
Andrei Zavatski
e13a82ed63 Fix colour picker antialiasing 2021-08-05 14:07:35 +03:00
Dean Herbert
53be31bcd1
Merge pull request #14047 from smoogipoo/bassmix
Adjust with the framework-side AudioMixer changes
2021-08-05 19:39:41 +09:00
Dean Herbert
e6cd05ea93 Update framework 2021-08-05 19:06:05 +09:00
Dean Herbert
1476b3b22a Merge branch 'master' into bassmix 2021-08-05 17:33:21 +09:00
Dean Herbert
27ff428491 Revert "Temporary changes to compile with latest framework"
This reverts commit 34c671f712.
2021-08-05 17:33:19 +09:00
Dan Balasescu
f0d11ebd89
Merge pull request #14117 from peppy/multiplayer-create-with-enter
Add the ability to create multiplayer games using only the keyboard
2021-08-05 17:27:04 +09:00
Dan Balasescu
0211521a97
Merge branch 'master' into multiplayer-create-with-enter 2021-08-05 17:07:03 +09:00
Dan Balasescu
5811dff853
Merge pull request #14120 from peppy/multiplayer-team-vs-team-selection
Add ability to choose Team Versus match type and view / switch teams
2021-08-05 17:02:14 +09:00
smoogipoo
94aa5fbca7 Fix doubled json property (runtime error) 2021-08-05 16:31:34 +09:00
Dean Herbert
2b973b9831 Redirect beatmap selection to intentionally click the button directly 2021-08-05 14:21:51 +09:00
Dean Herbert
bf720f7e06 Ensure operations are not performed during loading 2021-08-05 14:14:07 +09:00
Dean Herbert
22bd6c7556 Move keyboard progress flow handling to MatchSettingsOverlay 2021-08-05 14:06:58 +09:00
Dean Herbert
fd54487186 Add safety against pushing to non-current screen 2021-08-05 14:06:58 +09:00
Dan Balasescu
afc1585033
Merge pull request #14131 from peppy/fix-constructor-possible-nullref
Fix new possible nullref inspection due to delegate initialisation in constructor
2021-08-05 13:59:32 +09:00
Dean Herbert
2ccf7e75b0 Fix new possible nullref inspection due to delegate initialisation in constructor 2021-08-05 13:24:59 +09:00
Dean Herbert
c84bd2c74d Update new obsolete usages 2021-08-05 13:22:59 +09:00
Salman Ahmed
d0ce0cf9f5 Merge branch 'master' into new-difficulty-colours 2021-08-04 17:12:15 +03:00
Dean Herbert
476442d1a3
Merge branch 'master' into multiplayer-create-with-enter 2021-08-04 19:37:41 +09:00
Dan Balasescu
5a6636ae5c
Merge pull request #14116 from peppy/update-platform-action-triggers
Update existing test to make use of `ManualInputManager.Keys`
2021-08-04 19:36:39 +09:00
Dean Herbert
42e14fb492 Merge branch 'update-platform-action-triggers' into multiplayer-create-with-enter 2021-08-04 17:31:38 +09:00
Dean Herbert
9b9dacf3fe Update usages of Drawable.Click() 2021-08-04 17:30:33 +09:00
Dean Herbert
c76edd8887 Update framework 2021-08-04 17:24:13 +09:00
Dean Herbert
666007b2f9
Merge branch 'master' into multiplayer-team-vs-team-selection 2021-08-04 13:54:11 +09:00
Dan Balasescu
5f170feede
Merge pull request #14104 from peppy/multiplayer-match-rulesets
Add required multiplayer models (and associated flows) for match "types"
2021-08-04 13:46:37 +09:00
Dean Herbert
401835a3d8 Add missing event glue 2021-08-04 13:13:47 +09:00
Dan Balasescu
374d279e7c
Merge pull request #14100 from frenzibyte/fix-muted-dim-factor
Fix "muted" mod metronome not playing when expected
2021-08-04 12:33:38 +09:00
Dan Balasescu
472925180a
Merge branch 'master' into fix-muted-dim-factor 2021-08-04 12:00:49 +09:00
Dan Balasescu
f45ff06c5e
Merge pull request #14125 from gagahpangeran/markdown-inter-font
Change markdown container font to use inter font
2021-08-04 11:42:48 +09:00
Salman Ahmed
bec0f379a7 Round star difficulty to two fractional digits during sampling 2021-08-04 02:16:51 +03:00
Salman Ahmed
65db9d664e Match osu-web colour for DifficultyRating.Hard 2021-08-04 01:52:49 +03:00
Salman Ahmed
4e303b2aa1 Add xmldoc and source link 2021-08-04 01:52:49 +03:00
Salman Ahmed
b5970d5cdc Handle pitch black background case 2021-08-04 01:52:48 +03:00
Gagah Pangeran Rosfatiputra
d22f2ececb
adjust wiki main page font 2021-08-03 22:17:45 +07:00
Gagah Pangeran Rosfatiputra
ed94266a5d
change markdown container font 2021-08-03 22:14:44 +07:00
Gagah Pangeran Rosfatiputra
cb72667aa8
add typeface inter in osu font 2021-08-03 22:10:33 +07:00
Dean Herbert
aa320c70a7 Improve show/hide animation and add more padding around the crown 2021-08-03 23:42:37 +09:00
Dean Herbert
69e6c08cc2 Add test coverage of changing teams via clicking 2021-08-03 23:42:37 +09:00
Dean Herbert
75426f84f1 Fire initial match user states in TestMultiplayerClient 2021-08-03 23:42:37 +09:00
Dean Herbert
a0119f8cd6 Add basic test coverage 2021-08-03 23:42:37 +09:00
Dean Herbert
b8e878ccc9 Add the ability to change team by clicking current team colour
Definitely not the final UX, but it's what people are used to and easy
to implement, so it'll do for now.
2021-08-03 23:42:37 +09:00
Dean Herbert
9bfb0f1294 Add basic team vs handling to TestMultiplayerClient
Not sure this is the best place to do so... I can foresee this class
getting much larger than we want it to.
2021-08-03 23:42:37 +09:00
Dean Herbert
5e59b1325c Add team display to participant list 2021-08-03 23:42:37 +09:00
Dean Herbert
b956d32587 Add the ability to change multiplayer game type 2021-08-03 23:42:37 +09:00
Dean Herbert
c856611f65 Merge branch 'master' into multiplayer-match-rulesets 2021-08-03 23:40:24 +09:00
Dean Herbert
e11b815b82 Serialise type as snake_case 2021-08-03 23:13:39 +09:00
Dean Herbert
6442d86407 Merge branch 'master' into multiplayer-match-rulesets 2021-08-03 23:13:36 +09:00
Salman Ahmed
9a5e052dc0 Use star difficulty colour spectrum game-wide 2021-08-03 15:02:18 +03:00