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

27179 Commits

Author SHA1 Message Date
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
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
472925180a
Merge branch 'master' into fix-muted-dim-factor 2021-08-04 12:00:49 +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
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
Salman Ahmed
9a5e052dc0 Use star difficulty colour spectrum game-wide 2021-08-03 15:02:18 +03:00
Salman Ahmed
6fd97d67eb Update colour spectrum inline with latest version
From https://github.com/ppy/osu-web/pull/7855#issuecomment-880959644,
less arbitrary.
2021-08-03 15:02:18 +03:00
Salman Ahmed
d9686332a1 Implement new difficulty rating colour spectrum sampling 2021-08-03 14:33:45 +03:00
Salman Ahmed
8dd72a9dc6 Add new difficulty rating colour method 2021-08-03 14:33:45 +03:00
Dan Balasescu
84c16e592f
Merge branch 'master' into multiplayer-rename-game-type 2021-08-03 19:12:55 +09:00
Dean Herbert
063868713e Add ability to create a room using only keyboard input 2021-08-03 19:11:10 +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
Dean Herbert
1c125eef12 Make Users an IList for more flexibility server-side 2021-08-02 18:47:26 +09:00
Dean Herbert
9d1e95caf0 Add flow for sending match ruleset specific messages to the server 2021-08-02 18:47:26 +09:00
Dean Herbert
e8338f2711 Add basic class structure for match rulesets and required state 2021-08-02 17:14:49 +09:00
Dan Balasescu
0089cdb0ca
Merge branch 'master' into fix-muted-dim-factor 2021-08-02 12:26:31 +09:00
smoogipoo
df9b618256 Add localisation license header to editorconfig 2021-08-02 11:44:10 +09:00
Dan Balasescu
f3626efcaa
Merge pull request #14088 from bdach/colour-palette-add-remove
Add support for adding/removing colours to editor palette
2021-08-02 10:50:34 +09:00
Dan Balasescu
cd0e7223a6
Merge pull request #14092 from bdach/proxied-judgement-layer-ordering
Ensure proxied judgement content is correctly depth-ordered
2021-08-02 10:40:37 +09:00
Dan Balasescu
cf30f02f02
Merge pull request #14096 from frenzibyte/processors-on-load-complete
Fix judgement processors provided to mods while not completely loaded
2021-08-02 10:31:48 +09:00
Salman Ahmed
a75da82986 Add explaining comment 2021-08-01 21:14:54 +03:00
Dean Herbert
d86bed2b65
Merge pull request #14098 from ppy/dependabot/nuget/MessagePack-2.3.75
Bump MessagePack from 2.2.113 to 2.3.75
2021-08-02 03:04:48 +09:00
Salman Ahmed
fb5ef7d2d2 Remove brackets 2021-08-01 20:59:51 +03:00
Salman Ahmed
a26e7b2680 Limit combo count to minimum 1 when using inversed
Avoids making the mod of no effect.
2021-08-01 20:59:31 +03:00
Salman Ahmed
ce7987dac7 Clarify 0 final combo indicates always muted audio 2021-08-01 20:19:44 +03:00
Salman Ahmed
1e3173bf44 Fix muted dim factor not considering "0 divided by 0" case 2021-08-01 20:19:43 +03:00
dependabot[bot]
aadd1c6781
Bump Sentry from 3.8.2 to 3.8.3
Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 3.8.2 to 3.8.3.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/3.8.2...3.8.3)

---
updated-dependencies:
- dependency-name: Sentry
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-01 17:04:37 +00:00
dependabot[bot]
81f42da386
Bump MessagePack from 2.2.113 to 2.3.75
Bumps [MessagePack](https://github.com/neuecc/MessagePack-CSharp) from 2.2.113 to 2.3.75.
- [Release notes](https://github.com/neuecc/MessagePack-CSharp/releases)
- [Changelog](https://github.com/neuecc/MessagePack-CSharp/blob/master/prepare_release.ps1)
- [Commits](https://github.com/neuecc/MessagePack-CSharp/compare/v2.2.113...v2.3.75)

---
updated-dependencies:
- dependency-name: MessagePack
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-01 17:04:30 +00:00
Salman Ahmed
f12e66052c Reword outdated doc 2021-08-01 19:22:33 +03:00
Salman Ahmed
ac930b8918 Fix judgement processors provided to mods while not completely loaded 2021-08-01 19:16:30 +03:00
Bartłomiej Dach
f868a201f5
Ensure proxied judgement content is correctly depth-ordered 2021-08-01 15:21:31 +02:00
Bartłomiej Dach
708b50fdba
Remove unused field 2021-08-01 00:11:56 +02:00
Bartłomiej Dach
4334121e8e
Add testing for colour palette behaviour 2021-07-31 23:52:33 +02:00
Bartłomiej Dach
3f005886d6
Add support for removing colours from palette 2021-07-31 23:52:33 +02:00
Bartłomiej Dach
9a7537cd56
Add support for adding new colours to palette 2021-07-31 23:48:01 +02:00
Lucas A
73393a5a0d Localise weighting percentage. 2021-07-31 15:56:25 +02:00
Dean Herbert
48b95ae250
Merge pull request #14067 from nekodex/select-sfx-changes
Swap 'select' sample variants and add hover+select sounds to more components
2021-07-31 20:03:08 +09:00
Dean Herbert
858d1f8dd0
Merge pull request #14079 from peppy/fix-timestamp-formatting
Fix beatmap durations over one hour displaying incorrectly
2021-07-31 20:02:54 +09:00
Bartłomiej Dach
b0b211ff23
Merge branch 'master' into mute-mod-improvements 2021-07-31 12:40:26 +02:00
Dean Herbert
7a44ddb36b Update incorrect xmldoc 2021-07-31 16:48:45 +09:00
Dean Herbert
081dafc4e4 Update existing inline usages to use new extension method 2021-07-31 16:46:02 +09:00
Dean Herbert
472c0137ec Add new extension for formatting time durations 2021-07-31 16:45:53 +09:00
Dean Herbert
f3d4f47e62 Revert unrelated changes 2021-07-31 15:52:36 +09:00
Dean Herbert
53c901bfa8 Expose DrawableRuleset audio adjustments as non-container 2021-07-31 15:47:54 +09:00
Bartłomiej Dach
e4e4c85a11
Merge branch 'master' into localise-rankings 2021-07-31 08:13:10 +02:00
Dean Herbert
29328bdf7f Use metronome's audio adjustments directly 2021-07-31 15:03:26 +09:00
Dean Herbert
b01b0d711f Merge branch 'master' into mute-mod-improvements 2021-07-31 14:55:44 +09:00
Dean Herbert
c082498955 Fix some missed instances of verbatim string conversion 2021-07-31 14:29:38 +09:00