1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 23:23:04 +08:00
Commit Graph

53513 Commits

Author SHA1 Message Date
Salman Ahmed
4210ec6502 Merge branch 'master' into remove-score-multiplier-on-custom-mod-settings 2022-07-19 19:21:26 +03:00
Salman Ahmed
89653b74c7 Only add setting tracker when customisation is permitted 2022-07-19 19:21:16 +03:00
Dean Herbert
87afa7317b Update framework 2022-07-19 23:12:49 +09:00
Dan Balasescu
471e1b935d
Merge pull request #19181 from taiko-pp-committee/performance-balancing-merge
osu!taiko performance points balancing
2022-07-19 21:01:12 +09:00
Dan Balasescu
fd0ce638d4
Merge pull request #19004 from apollo-dw/velocitychanges
Remove non-overlapping velocity buff from Aim in osu!
2022-07-19 20:47:49 +09:00
Dan Balasescu
cfb2adfd27
Merge branch 'master' into velocitychanges 2022-07-19 19:57:47 +09:00
Dan Balasescu
842fe32003 Update test values 2022-07-19 19:57:36 +09:00
Dan Balasescu
245269f6d4
Merge pull request #19227 from peppy/fix-spectator-client-error-noise
Fix `BeginPlayingInternal` firing actual errors when beatmap not available online
2022-07-19 19:54:53 +09:00
Dan Balasescu
d136b90bfe
Merge pull request #19228 from peppy/mention-compatibility-mode
Add mention of "compatibility mode" in windows version check error message
2022-07-19 17:54:39 +09:00
Dean Herbert
09613f1af3 Add mention of "compatibility mode" in windows version check error message 2022-07-19 17:25:52 +09:00
Dean Herbert
12e5bc3f3d Fix BeginPlayingInternal firing actual errors when beatmap not available online 2022-07-19 17:14:57 +09:00
Dan Balasescu
c242b2377e
Merge pull request #19226 from peppy/use-correct-casing-api-scores-collection
Use more correct json casing in `APIScoresCollection`
2022-07-19 16:12:51 +09:00
Dean Herbert
2716bd41d9 Use more correct json casing in APIScoresCollection
osu-web API is already returning both of these casings for backwards
compatibility, but the former will be removed at some point.

e540276721/app/Http/Controllers/BeatmapsController.php (L314-L315)
2022-07-19 15:34:17 +09:00
Dan Balasescu
c07f78409e
Merge pull request #19189 from peppy/peform-actions-after-reconnect
Fix creating multiplayer game during server migration not joining new room correctly
2022-07-19 14:46:29 +09:00
Dean Herbert
8c680643fd
Merge pull request #19225 from frenzibyte/reduce-bindable-allocation
Reduce `Bindable` allocations in hitobject classes via lazy initialisation
2022-07-19 14:45:46 +09:00
Salman Ahmed
d8cce5fe36 Fix OsuHitObject not using property wrapper properly 2022-07-19 07:52:12 +03:00
Dean Herbert
46efce8a67 Equalise work done in benchmarks to cover accessing normal properties 2022-07-19 13:39:26 +09:00
Dan Balasescu
4376609b0a
Merge pull request #19221 from bdach/culture-sensitive-casing
Replace culture-sensitive humanizer methods with fixed local reimplementations
2022-07-19 13:10:20 +09:00
Salman Ahmed
8f80a22ef9 Fix osu! and catch hitobjects no longer scaled to 1 by default 2022-07-19 07:00:13 +03:00
Salman Ahmed
1051009827 Change bindable properties in all HitObjects to be lazily initialised 2022-07-19 05:39:10 +03:00
Salman Ahmed
5ddb5a3d74 Introduce HitObjectProperty<T> 2022-07-19 05:39:10 +03:00
Salman Ahmed
5055e32769 Add benchmark for HitObject 2022-07-19 05:39:10 +03:00
Bartłomiej Dach
6f37487528
Replace calls to defective Humanizer methods with correct version 2022-07-18 22:34:58 +02:00
Bartłomiej Dach
ffa9a83a4f
Add own fixed copy of defective Humanizer methods 2022-07-18 21:37:31 +02:00
Dean Herbert
afa831f6fe Update framework 2022-07-19 01:18:09 +09:00
Dean Herbert
2294640644
Merge pull request #19151 from Susko3/touch-settings
Add Touch input handler settings section
2022-07-19 01:17:57 +09:00
Dean Herbert
3c35ef56c9
Merge pull request #19211 from peppy/fix-multiplayer-participant-panel-null-ruleset
Fix potential crash when attempting to create mod display using null ruleset
2022-07-19 00:57:07 +09:00
Salman Ahmed
f1133ca8f6
Merge branch 'master' into fix-multiplayer-participant-panel-null-ruleset 2022-07-18 18:15:32 +03:00
Dean Herbert
e14e2cca45
Merge pull request #19212 from peppy/fix-audio-equality-fuck
Fix audio/background equality not correctly using `BeatmapInfo` local filenames
2022-07-18 19:28:51 +09:00
Salman Ahmed
2789a97e68
Merge branch 'master' into fix-multiplayer-participant-panel-null-ruleset 2022-07-18 12:55:41 +03:00
Dean Herbert
d6dd98a5a1
Merge pull request #19138 from frenzibyte/remove-countries-json
Remove `countries.json` map in tournament client and replace with `Country` enum
2022-07-18 18:54:54 +09:00
Salman Ahmed
2befcfedbb
Merge branch 'master' into fix-multiplayer-participant-panel-null-ruleset 2022-07-18 12:24:47 +03:00
Dean Herbert
0c75245806
Merge pull request #19139 from frenzibyte/score-country-storage
Support storing user country on databased scores
2022-07-18 18:13:57 +09:00
Salman Ahmed
b6750961a0
Merge pull request #19192 from tsunyoku/fix-user-profile-overlay
Update profile web overlay to use `SoloScoreInfo`
2022-07-18 12:08:02 +03:00
Dean Herbert
22a9e7e275 Fix audio/background equality not correctly using BeatmapInfo local filenames 2022-07-18 17:05:21 +09:00
Dean Herbert
18da9ddfbf Add test coverage of two beatmaps in same set with different audio files 2022-07-18 17:05:21 +09:00
Dean Herbert
caa44ce01e Update naming 2022-07-18 16:40:11 +09:00
Dean Herbert
d909a1fd46 Merge branch 'master' into remove-countries-json 2022-07-18 16:38:53 +09:00
Salman Ahmed
b5c7d07ba8
Merge branch 'master' into fix-user-profile-overlay 2022-07-18 10:27:33 +03:00
Dean Herbert
b8c90266de
Merge pull request #19209 from 3stantedja/make-contracted-stats-titlecase
Make sure stats name are title-cased when score panel is contracted
2022-07-18 16:26:20 +09:00
Dean Herbert
933a41554b
Merge pull request #19187 from peppy/fix-reconnect-new-spectator-session
Fix spectator client not correctly reconnecting after shutdown
2022-07-18 16:25:04 +09:00
Dean Herbert
1e151baae8 Use Unknown instead of default 2022-07-18 16:24:08 +09:00
Dean Herbert
51f91fe62e Update naming 2022-07-18 16:17:20 +09:00
Dean Herbert
eddf106f7c
Merge branch 'master' into score-country-storage 2022-07-18 16:12:40 +09:00
Dean Herbert
a7f19cc796
Merge pull request #19137 from frenzibyte/country-enum
Replace `Country` class with enumeration
2022-07-18 16:12:24 +09:00
Salman Ahmed
e86a35fe33 Fix NRE on footer button mods 2022-07-18 10:09:14 +03:00
Salman Ahmed
045602b27d
Merge branch 'master' into fix-reconnect-new-spectator-session 2022-07-18 09:55:19 +03:00
Salman Ahmed
e4d11febc5 Remove no longer necessary fallback 2022-07-18 09:47:40 +03:00
Dean Herbert
a21cd1cd47
Merge pull request #19169 from tsunyoku/retry-icon
Change retry button icon from ArrowCircleLeft to Redo
2022-07-18 15:47:24 +09:00
Salman Ahmed
84c1c26a7f
Merge branch 'master' into fix-user-profile-overlay 2022-07-18 09:45:25 +03:00