messed things up again

Update framework
Merge pull request #35938 from bdach/less-sentry
2025-12-09 20:24:09 +03:00 · 2025-12-09 19:20:29 +09:00 · 2025-12-09 19:10:57 +09:00 · 2025-12-09 09:54:46 +01:00 · 2025-12-09 08:59:53 +01:00 · 2025-12-09 08:32:56 +01:00
1 changed files with 4 additions and 0 deletions
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,11 @@
    </PackageReference>
    <PackageReference Include="Realm" Version="20.1.0" />
    <PackageReference Include="ppy.osu.Framework" Version="2025.1209.0" />
+<<<<<<< HEAD
    <PackageReference Include="jvnkosu.Resources" Version="2025.1119.0" />
+=======
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2025.1125.0" />
+>>>>>>> 2025.1209.0-lazer
    <PackageReference Include="Sentry" Version="5.1.1" />
    <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
    <PackageReference Include="SharpCompress" Version="0.39.0" />
Author	SHA1	Message	Date
Konstantin	68f92ab57c	messed things up again	2025-12-09 20:24:09 +03:00
Dean Herbert	42b184f167	Update framework	2025-12-09 19:20:29 +09:00
Dean Herbert	27737bd4e9	Merge pull request #35938 from bdach/less-sentry Filter out more exceptions from being sent to sentry	2025-12-09 19:10:57 +09:00
Bartłomiej Dach	8bb885a0dc	Filter out more exceptions from being sent to sentry More or less covers the first page of client sentry issues sorted by volume, all of which is pretty much useless for anything because it's client-specific-failure noise.	2025-12-09 09:54:46 +01:00
Bartłomiej Dach	0b06acb29d	Merge pull request #35909 from smoogipoo/fix-vote-to-skip Adjust vote-to-skip messaging flow to be explicit about states	2025-12-09 08:59:53 +01:00
Bartłomiej Dach	b129837e57	Merge pull request #35918 from smoogipoo/qp-fix-unsafe-schedules Fix potentially unsafe quick play event handling	2025-12-09 08:32:56 +01:00
Dean Herbert	3e221c7f61	Merge pull request #35906 from Natelytle/jank-tames-raiko Rank the taiko swap mod	2025-12-09 15:57:02 +09:00
Dean Herbert	7106a6a5e5	Merge pull request #35897 from smoogipoo/qp-fix-download-progress Fix incorrect quick play download progress	2025-12-09 15:53:15 +09:00
Dean Herbert	eaf2721f5b	Merge pull request #35912 from smoogipoo/qp-remove-results-scroll Remove quick play results scroll animation	2025-12-09 15:52:14 +09:00
Dean Herbert	59a27dad3d	Merge pull request #35923 from smoogipoo/qp-abandoned-at Consider abandon time for user placements	2025-12-08 19:27:56 +09:00
Dan Balasescu	d6cd748d2a	Consider abandon time for user placements	2025-12-07 23:26:40 +09:00
Dan Balasescu	c23d6b7fd1	Fix potentially unsafe quick play event handling	2025-12-07 02:11:26 +09:00
Dean Herbert	582ff999aa	Merge pull request #35913 from smoogipoo/qp-chat-hold-focus Make quick play chat retain focus after posting	2025-12-06 20:20:42 +09:00
Dan Balasescu	a96b024ac5	Make quick play chat retain focus after posting	2025-12-06 17:50:58 +09:00
Dan Balasescu	1c10acba76	Allow score panel to animate	2025-12-06 17:40:17 +09:00
Dan Balasescu	4ae4c700ae	Remove quick play round results scroll animation	2025-12-06 17:39:54 +09:00
Dan Balasescu	2be50d917a	Adjust vote-to-skip to be explicit about states	2025-12-06 13:23:16 +09:00
Natelytle	35fdc6f8b9	Rank swap mod	2025-12-05 22:51:00 -05:00
Dan Balasescu	d04029bcc7	Fix incorrect quick play download progress	2025-12-06 03:24:17 +09:00