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

56983 Commits

Author SHA1 Message Date
Dean Herbert
a4e713a61f When returning to the editor after test play, use the original editor time rather than the point of exit 2022-11-17 12:36:24 +09:00
Dan Balasescu
bdfc317a8e
Merge pull request #21255 from peppy/fix-full-area-reset
Fix "reset to full area" button not always working correctly
2022-11-17 11:13:06 +09:00
Dan Balasescu
b23b5ebce9
Merge pull request #21257 from peppy/fix-test-mode
Fix combo colour normalisation setting not applying to editor test play
2022-11-17 10:44:44 +09:00
Salman Ahmed
c1673771eb
Merge branch 'master' into fix-full-area-reset 2022-11-17 01:57:56 +03:00
Salman Ahmed
7a28a7f2a0 Move IGameplaySettings override to compose screen to keep test mode unaffected 2022-11-17 01:45:16 +03:00
Dean Herbert
335e4e8ec5
Merge pull request #21242 from EVAST9919/triangles-fix
Triangles background improvements
2022-11-16 19:26:52 +09:00
Dean Herbert
ee6fffec5f Fix combo colour normalisation setting not applying to editor test play 2022-11-16 17:54:49 +09:00
Dean Herbert
bb762d8131 Fix "reset to full area" button not always working correctly 2022-11-16 15:45:26 +09:00
Dean Herbert
52ecd894db Move equilateral triangle ratio to constant 2022-11-15 22:20:08 +09:00
Bartłomiej Dach
f1b031de9b
Merge pull request #21243 from peppy/fix-swell-flashing
Fix argon and triangles swells incorrectly flashing on every hit
2022-11-15 21:44:23 +09:00
Dean Herbert
233d45e185 Fix argon swells incorrectly flashing on every hit 2022-11-15 18:28:13 +09:00
Andrei Zavatski
f27a5f977d Improve triangles distribution 2022-11-15 11:49:53 +03:00
Andrei Zavatski
c7dc6db124 Fix incorrect number of added triangles 2022-11-15 11:32:05 +03:00
Andrei Zavatski
ebff844334 Reset triangles on scale change 2022-11-15 11:06:28 +03:00
Andrei Zavatski
333165e052 Add test scene for Triangles 2022-11-15 10:54:37 +03:00
Dean Herbert
55765c80c6
Merge pull request #21240 from peppy/hit-error-meter-pooling
Apply pooling support to hit error metres
2022-11-15 14:25:48 +09:00
Bartłomiej Dach
b3534964c3
Merge branch 'master' into hit-error-meter-pooling 2022-11-15 13:39:59 +09:00
Bartłomiej Dach
3c546742c4
Merge pull request #21235 from mk56-spn/Freeze_frame_slidertick_fix
Fix slider ticks appearing before sliders are done snaking in with Freeze Frame
2022-11-15 13:22:17 +09:00
Dean Herbert
489dca79a1 Remove upper limit for pooling 2022-11-15 12:31:25 +09:00
Dean Herbert
308ed1abd1 Fix number of judgements shown potentially exceeding upper limit 2022-11-15 12:31:25 +09:00
Dean Herbert
59a8603728 Ensure flowing animation starts correctly from zero 2022-11-15 12:04:40 +09:00
Dean Herbert
aef6ee23eb Apply pooling support to ColourHitErrorMeter 2022-11-15 12:04:40 +09:00
Dean Herbert
a86b50d62a Apply nullability to BarHitErrorMeter 2022-11-15 11:33:27 +09:00
Dean Herbert
576f462f59 Add pooling support to BarHitErrorMeter 2022-11-15 11:33:27 +09:00
Dario Headley
a8c95c39ad Exclude sliderticks from the " freeze " 2022-11-14 16:18:46 +01:00
Dan Balasescu
e43593a164
Merge pull request #21227 from Susko3/fix-FallbackSampleStore-async-fallback-logic
Fix `FallbackSampleStore.GetAsync` fallback logic
2022-11-14 10:17:42 +09:00
Dan Balasescu
6aaafef696
Merge pull request #21226 from Joehuu/beatmap-card-expanded-block-clicks
Fix beatmap card expanded content not blocking clicks from behind
2022-11-14 09:48:12 +09:00
Susko3
56fd1f95b1 Fix FallbackSampleStore.GetAsync fallback logic 2022-11-13 18:47:28 +01:00
Joseph Madamba
4578a96813 Fix beatmap card expanded content not blocking clicks from behind 2022-11-13 08:18:44 -08:00
Dean Herbert
f52540c0b8
Merge pull request #21208 from Tom94/only-rounded-shader
Target rounded fragment shader
2022-11-13 17:55:34 +09:00
Dean Herbert
efe42f701a Merge branch 'master' into only-rounded-shader 2022-11-13 16:34:48 +09:00
Dean Herbert
236cc0bdaf Update resources 2022-11-13 16:21:28 +09:00
Dean Herbert
887b6832c9 Update framework 2022-11-13 16:15:30 +09:00
Dan Balasescu
7b9ed6a4b2
Merge pull request #21220 from peppy/fix-skinnable-sprite-lookups
Fix `SkinnableSprite` lookups broken in lazer-first skins
2022-11-13 15:46:04 +09:00
Dean Herbert
eae8530722 Fix SkinnableSprite lookups broken in lazer-first skins
Regressed with removal of local `GetTexture` calls in e19ba65f91
2022-11-13 12:46:21 +09:00
Dean Herbert
f7913cbf1c
Merge pull request #21073 from smoogipoo/chat-silences
Remove chat messages from silenced users
2022-11-13 09:51:52 +09:00
Dean Herbert
f343ba6111 Add xmldoc for chat ack request 2022-11-13 00:10:06 +09:00
Dean Herbert
22d8a1160e Fix last silence ID being updated too often, causing most silences to be missed 2022-11-13 00:10:06 +09:00
Dean Herbert
143c946128 Simplify ack re-perform flow 2022-11-12 23:02:37 +09:00
Dean Herbert
bfb939cbd0 Expand on why call needs to be made every 10 minutes 2022-11-12 22:24:27 +09:00
Dean Herbert
6a3665a6fd Remove excess logging on WebSocketNotificaitonsClient 2022-11-12 22:09:27 +09:00
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