1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 20:47:24 +08:00
Commit Graph

57052 Commits

Author SHA1 Message Date
Dean Herbert
ace4099079 Update ack code after incorrect merge 2022-11-12 21:41:10 +09:00
Thomas Müller-Höhne
9ef43ebd83 Fix compilation after framework-side PR updates 2022-11-12 21:24:12 +09:00
Dean Herbert
dde09d409b Merge branch 'master' into chat-silences 2022-11-12 21:00:56 +09:00
Dean Herbert
8154eaafd8
Merge pull request #20991 from smoogipoo/websocket-chat-2
Receive chat messages via notification websocket
2022-11-12 18:18:39 +09:00
Dean Herbert
a74833a134
Merge pull request #21209 from bdach/use-local-resources-scripts
Add helper scripts for using local resources
2022-11-12 17:51:36 +09:00
Bartłomiej Dach
aef25df808
Add helper scripts for using local resources 2022-11-12 17:22:18 +09:00
Thomas Müller-Höhne
fa8e38d9d6 Target rounded fragment shader
Compatibility with osu-framework change https://github.com/ppy/osu-framework/pull/5512
2022-11-12 17:18:23 +09:00
Dean Herbert
918f19fd4a
Merge pull request #21207 from bdach/fix-gameplay-binding-test
Fix failing gameplay bindings test
2022-11-12 15:39:21 +09:00
Dean Herbert
3c9fbdb4cf
Merge pull request #21153 from peppy/argon-taiko
First pass osu!taiko "argon" skin
2022-11-12 14:41:55 +09:00
Bartłomiej Dach
b0314c67aa
Fix failing gameplay bindings test 2022-11-12 14:16:46 +09:00
Bartłomiej Dach
8b8147c321
Rename {catch -> taiko}Component 2022-11-12 03:05:03 +09:00
Bartłomiej Dach
6a4c97b4f1
Fix code inspection 2022-11-12 02:20:19 +09:00
Bartłomiej Dach
7ef11cab8b
Adjust taiko argon transformer to new naming 2022-11-12 02:10:10 +09:00
Bartłomiej Dach
7379f6fe20
Merge branch 'master' into argon-taiko 2022-11-12 01:56:30 +09:00
Dean Herbert
19876ca0fb
Merge branch 'master' into websocket-chat-2 2022-11-11 23:53:42 +09:00
Dean Herbert
daae560ff7
Merge pull request #20736 from smoogipoo/combo-colour-brightness-limit
Normalise combo colour brightness
2022-11-11 23:18:41 +09:00
Dean Herbert
151dd7c62f Fix one more reverted change 2022-11-11 22:21:38 +09:00
Dean Herbert
0af4bdaf5c Add back removed configuration elements 2022-11-11 18:29:15 +09:00
Dean Herbert
106f1cf90b Merge branch 'master' into combo-colour-brightness-limit 2022-11-11 18:24:39 +09:00
Dean Herbert
1ec537d5c2
Merge pull request #21203 from peppy/change-beamtap-listing-key-vinding
Change default beatmap listing key binding to `Ctrl`+`B`
2022-11-11 18:09:09 +09:00
Dean Herbert
392d4e778e Change default beatmap listing key binding to Ctrl+B 2022-11-11 17:10:46 +09:00
Dan Balasescu
fe58329478
Merge pull request #21151 from peppy/taiko-judgement-fixes
Fix various issues surrounding hit judgements
2022-11-11 16:41:46 +09:00
Dan Balasescu
8063dcd74a
Merge pull request #21148 from peppy/taiko-barline-separation
Move major barline portion to default implementation to allow for further customisation
2022-11-11 16:40:51 +09:00
Dan Balasescu
cd47350834
Merge pull request #21150 from peppy/taiko-tick-trackiung
Move first tick tracking logic inside `TickPiece`
2022-11-11 16:40:09 +09:00
Dan Balasescu
5bdbf56f43 Merge branch 'master' into taiko-judgement-fixes 2022-11-11 15:48:33 +09:00
Dan Balasescu
1a1a186d22 Merge branch 'master' into taiko-barline-separation 2022-11-11 15:47:06 +09:00
Dan Balasescu
f25a8ee4a6 Merge branch 'master' into taiko-tick-trackiung 2022-11-11 15:41:06 +09:00
Bartłomiej Dach
83a6763975
Merge pull request #21121 from peppy/improve-ui-control-sound-sync
Update settings UI animation to better suit immediacy of sound effects
2022-11-11 07:35:27 +01:00
Dan Balasescu
db25e9e9c8 Merge branch 'master' into combo-colour-brightness-limit 2022-11-11 15:31:28 +09:00
Bartłomiej Dach
88195d3984
Merge branch 'master' into improve-ui-control-sound-sync 2022-11-11 07:29:37 +01:00
Dan Balasescu
6ac19615fa Fix test failure 2022-11-11 14:55:41 +09:00
Dean Herbert
846c219984
Merge pull request #21199 from Susko3/fix-language-parsing
Fix parsing of `Language` when using system default language
2022-11-11 13:54:39 +09:00
Bartłomiej Dach
63270c8619
Merge branch 'master' into improve-ui-control-sound-sync 2022-11-11 05:50:28 +01:00
Susko3
5b1e39abd5 Fix parsing of Language when using default system locale 2022-11-10 22:56:24 +01:00
maromalo
83a3f1b82e Add computeRawScore() 2022-11-10 14:15:20 -03:00
Dean Herbert
86862b1f29
Merge pull request #21164 from Susko3/fix-default-24h-time-format
Fix `Prefer24HourTime` default value being wrong
2022-11-11 00:16:47 +09:00
Dean Herbert
50cc2829a5
Merge pull request #21197 from Susko3/fix-ci-failing
Fix NRT causing CI failure
2022-11-11 00:16:28 +09:00
Dean Herbert
efc0325bef Fix nullability issue 2022-11-10 23:41:15 +09:00
Dan Balasescu
980acb0a13
Merge pull request #21154 from peppy/seeding-fixes
Fix multiple issues with seeding screen in tournament client
2022-11-10 23:05:20 +09:00
Dan Balasescu
94772a9cda
Merge pull request #21147 from peppy/fix-timeline-editor-crash
Fix editor hard crash when beatmap file specified out-of-range timeline zoom value
2022-11-10 22:59:55 +09:00
Dan Balasescu
fd88c92d5a
Merge pull request #21144 from peppy/fix-storyboard-end-start-time
Fix incorrect handling of storyboard events with `end_time` before `start_time`
2022-11-10 22:53:45 +09:00
Susko3
6303b88e56 Fix NRT causing CI failure 2022-11-10 14:31:24 +01:00
Dean Herbert
1f8824a754 Update framework 2022-11-10 16:14:40 +09:00
Dean Herbert
bc6da2bbaf Merge branch 'master' into fix-default-24h-time-format 2022-11-10 16:14:37 +09:00
Dean Herbert
4c6ab27ae4
Merge pull request #21192 from Samaoo/fix-tablet-area-dimensions
Fix inaccurate tablet area dimensions when applying aspect ratio
2022-11-10 14:14:11 +09:00
Dan Balasescu
606d42c679
Merge pull request #21184 from peppy/skinnable-things-cleanup
Skinnable class naming pass
2022-11-10 12:52:08 +09:00
Dan Balasescu
20520e7290
Merge pull request #21171 from peppy/unpollute-taiko-drawable-hit
Remove triangles skin specific implementation from base osu!taiko `DrawableHit`
2022-11-10 12:47:36 +09:00
Dan Balasescu
46d4fc0279
Merge pull request #21167 from peppy/fix-storyboard-variables
Fix some issues with storyboard variables
2022-11-10 12:46:52 +09:00
Dan Balasescu
dddbc7496a
Merge pull request #21168 from peppy/fix-storyboard-extension-lookup
Fix sprites not displaying in storyboard if filename extension is missing in script
2022-11-10 12:31:00 +09:00
Dan Balasescu
051f7f4c68
Merge pull request #21173 from peppy/toggle-hit-markers
Add the ability to toggle off hit marker displays in the editor
2022-11-10 12:23:53 +09:00