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

42820 Commits

Author SHA1 Message Date
smoogipoo
94aa5fbca7 Fix doubled json property (runtime error) 2021-08-05 16:31:34 +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
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
Dan Balasescu
ceca184b12
Merge pull request #14112 from peppy/multiplayer-rename-game-type
Rename `GameType` to `MatchType` and make `enum` instead of `class`
2021-08-03 19:47:21 +09:00
Dan Balasescu
84c16e592f
Merge branch 'master' into multiplayer-rename-game-type 2021-08-03 19:12:55 +09:00
Dean Herbert
b43f5f755d
Merge pull request #14115 from smoogipoo/fix-spectator-test-failures
Fix spectator test failures
2021-08-03 19:07:54 +09:00
Dean Herbert
2b80b6a2d0
Merge pull request #14071 from frenzibyte/localisable-description
Update enum mapper usages with `LocalisableDescription`
2021-08-03 19:07:36 +09:00
Salman Ahmed
0d22b9223b Add unit test for inverse muting transferal 2021-08-03 12:50:54 +03:00
Salman Ahmed
ea02571da9 Inline parameterised test case 2021-08-03 12:49:39 +03:00
Dean Herbert
1152e15282 Update new usages of LocalisableEnum 2021-08-03 18:31:59 +09:00
Dean Herbert
6b2ea1b08f Update framework 2021-08-03 18:30:04 +09:00
Dean Herbert
8dbcccc350 Merge branch 'master' into localisable-description 2021-08-03 18:29:52 +09:00
smoogipoo
11b9ba86cb Fix TestSceneSpectator reusing cached spectator client 2021-08-03 18:28:08 +09:00
smoogipoo
062207fcd9 Fix TestSceneCurrentlyPlayingDisplay reusing cached spectator client 2021-08-03 18:16:58 +09:00
Dean Herbert
20f2b9f722
Merge pull request #13914 from kj415j45/localisation-header
Add localisation for overlay headers
2021-08-03 17:59:30 +09:00
Dean Herbert
feadfbcca7 Add playlist type to picker temporarily 2021-08-03 17:48:20 +09:00
Dean Herbert
01f15bd6fc Rename picker class to match new naming 2021-08-03 17:47:53 +09:00
kj415j45
404faabbbc
Use direct reference instead 2021-08-03 15:34:21 +08:00
Dean Herbert
8d1586261d Update resources 2021-08-03 15:59:13 +09:00
Dean Herbert
70da58323a Drop MatchRuleset terminology completely 2021-08-03 15:45:17 +09:00
Dean Herbert
66427127f0 Update naming in line with discussion 2021-08-03 15:09:03 +09:00
Dean Herbert
a42762e351 Merge branch 'multiplayer-rename-game-type' into multiplayer-match-rulesets 2021-08-03 14:55:51 +09:00
Dean Herbert
ee102e3755 Fix incorrectly overwritten ReferenceLoopHandling setting 2021-08-03 14:55:20 +09:00
Dean Herbert
5ac3abac99 Add missing forceScheduled parameter 2021-08-03 14:53:04 +09:00
Dean Herbert
556962a3d8
Add missing xmldoc comment
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-08-03 14:50:56 +09:00
Dean Herbert
2564c0c3df Rename GameType to MatchType and make enum instead of class 2021-08-03 14:46:31 +09:00
Salman Ahmed
db760b0dbf Merge branch 'master' into localisation-header 2021-08-03 05:16:02 +03:00
Dean Herbert
6bbc23c831
Merge pull request #14106 from smoogipoo/taiko-classic-mod
Make taiko classic mod emulate the classic "4:3" scroll speed
2021-08-02 22:22:26 +09:00
Dean Herbert
6a5bc3eefd
Merge pull request #14105 from smoogipoo/adjust-taiko-playfield-size
Match osu!stable taiko playfield size at 16:9
2021-08-02 22:21:16 +09:00
smoogipoo
8d999d30f6 Remove interface definition 2021-08-02 20:38:49 +09:00
smoogipoo
455666ed94 Remove taiko HD mod 4:3 scaling 2021-08-02 20:18:01 +09:00
smoogipoo
9327bc169b Make TaikoModClassic use classic-like scroll speed 2021-08-02 20:01:46 +09:00