1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 16:27:26 +08:00
Commit Graph

27108 Commits

Author SHA1 Message Date
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
2ccf7e75b0 Fix new possible nullref inspection due to delegate initialisation in constructor 2021-08-05 13:24:59 +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
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
472925180a
Merge branch 'master' into fix-muted-dim-factor 2021-08-04 12:00:49 +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
75426f84f1 Fire initial match user states in TestMultiplayerClient 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
84c16e592f
Merge branch 'master' into multiplayer-rename-game-type 2021-08-03 19:12:55 +09: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
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
smoogipoo
2af827f913 Increase TimeRange max value 2021-08-02 19:37:45 +09:00
Dean Herbert
d93421b9b8 Expose a default TeamVs room state so it can be consumed by tests 2021-08-02 18:50:22 +09:00
Dean Herbert
c7274355a4 Remove abstract definitions from multiplayer states for now 2021-08-02 18:50:22 +09:00
Dean Herbert
617ff40de7 Add the ability to not use MessagePack when creating a HubConnector 2021-08-02 18:50:22 +09:00
Dean Herbert
1cd967b351 Add signalr json type handling specification 2021-08-02 18:50:22 +09:00
Dean Herbert
4cf2c6188d Add union attributes for derived class deserialisation 2021-08-02 18:50:22 +09:00
Dean Herbert
ce92a47ec6 Add silly event handling hookups 2021-08-02 18:50:22 +09:00
Dean Herbert
359eb9c4ec Add new event flow for match ruleset state handling
I'm totally not happy with how this is done, but don't have the energy
to rewrite everything just now.
2021-08-02 18:50:22 +09:00
Dean Herbert
867426441e Fix weird access to room via Client 2021-08-02 18:50:22 +09:00
Dean Herbert
035dfd071f Add missing nullable specifications 2021-08-02 18:47:26 +09:00
Dean Herbert
d17b2b3268 Add boilerplate for server events 2021-08-02 18:47:26 +09:00
Dean Herbert
1d645d4ca9 Mark base classes non-abstract to fix messagepack serialisation 2021-08-02 18:47:26 +09:00