1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 15:23:14 +08:00
Commit Graph

34276 Commits

Author SHA1 Message Date
Dean Herbert
ecd6d09600
Merge pull request #10891 from smoogipoo/remove-obsoletes
Remove obsolete method
2020-11-18 23:07:31 +09:00
Dan Balasescu
9f6ca06039
Merge pull request #10889 from peppy/return-null-if-skinnable-sprite-no-exist
Fix SkinnableSprite initialising a drawable even when the texture is not available
2020-11-18 21:35:13 +09:00
smoogipoo
cb5d1d0d77 Remove obsolete method 2020-11-18 21:26:35 +09:00
Dean Herbert
49b8331ccd
Merge pull request #10877 from smoogipoo/fix-mania-judgement-displays
Fix hold note judgements displaying incorrectly
2020-11-18 19:00:14 +09:00
Dean Herbert
37b9550e6e
Merge pull request #10876 from nbvdkamp/slider-control-point-connection-fix
Fix slider control point connections not being updated
2020-11-18 18:54:54 +09:00
Dean Herbert
8ccb399eff
Merge pull request #10883 from smoogipoo/defined-blueprint-order 2020-11-18 18:46:37 +09:00
Dean Herbert
9f64a5c8ab
Merge pull request #10884 from smoogipoo/tighten-osu-hitobject-expiry 2020-11-18 18:40:19 +09:00
Dean Herbert
832485dd0a
Merge pull request #10888 from peppy/update-framework
Update framework
2020-11-18 18:34:07 +09:00
Dean Herbert
bb1aacb360 Fix SkinnableSprite initialising a drawable even when the texture is not available 2020-11-18 18:07:00 +09:00
Dean Herbert
efc18887c8 Update framework 2020-11-18 18:01:55 +09:00
smoogipoo
f00c23b4a0 Add comment + xmldoc 2020-11-18 13:37:15 +09:00
smoogipoo
783c172b5d Make sealed and cleanup comparator 2020-11-18 13:33:22 +09:00
kamp
2d66423fbd Simplify inequality 2020-11-17 23:04:38 +01:00
kamp
c8fb49d540 Apply suggestions and remove redundant updateConnectingPath call 2020-11-17 22:23:46 +01:00
Dan Balasescu
851c7d524f
Merge pull request #10881 from ekrctb/fix-TestSceneFruitObjects
Fix TestSceneFruitObjects not displaying anything
2020-11-18 00:13:26 +09:00
ekrctb
c360533e4c Simplify code of TestSceneFruitObjects 2020-11-17 23:40:30 +09:00
smoogipoo
ce4baf328d Move into OnApply() to resolve one-frame issues 2020-11-17 23:35:36 +09:00
smoogipoo
04805b78c3 Tighten osu! ruleset lifetime expiry for past hitobjects 2020-11-17 23:20:19 +09:00
smoogipoo
58c8184ad7 Define blueprint order similarly to hitobjects 2020-11-17 22:56:31 +09:00
ekrctb
eebce1f914 Fix TestSceneFruitObjects 2020-11-17 18:13:32 +09:00
Dan Balasescu
bcf6974e18
Merge pull request #10831 from bdach/hold-note-fade
Add back fade effect to legacy hold notes
2020-11-17 15:27:10 +09:00
Dean Herbert
d7b6e4a32d
Merge pull request #10867 from smoogipoo/refactor-user-request
Refactor user caching to improve readability and fix threadsafety issues
2020-11-17 14:20:45 +09:00
Dan Balasescu
cb3280af7c
Merge branch 'master' into hold-note-fade 2020-11-17 13:49:28 +09:00
smoogipoo
77942af3a6 Fix hold note judgements displaying incorrectly 2020-11-17 13:37:58 +09:00
Dean Herbert
009d666241 Use dictionary to avoid linq overhead 2020-11-17 10:57:11 +09:00
kamp
c6618f08aa Fix slider control point connections not being updated 2020-11-16 21:26:08 +01:00
Bartłomiej Dach
21f29e28e2 Add clarification comment 2020-11-16 20:36:56 +01:00
Bartłomiej Dach
e88920442c Use HitStateUpdateTime instead 2020-11-16 20:01:10 +01:00
Bartłomiej Dach
eba17ecab2
Merge pull request #10868 from smoogipoo/add-back-initiallifetimeoffset
Add back removed InitialLifetimeOffset usage in DrawableHitObject
2020-11-16 19:30:15 +01:00
Bartłomiej Dach
72a8734f93
Merge branch 'master' into add-back-initiallifetimeoffset 2020-11-16 18:54:37 +01:00
Dean Herbert
585322c893
Merge pull request #10871 from smoogipoo/fix-ball-tint
Fix slider ball tint not working
2020-11-17 01:58:33 +09:00
Dean Herbert
f177792915
Merge pull request #10873 from smoogipoo/remove-parent-dho-pooling
Remove ability to pool DHOs in parent playfields
2020-11-17 01:55:13 +09:00
smoogipoo
f5e12b9d7c Adjust TestScenePlayerLoader for safety 2020-11-16 23:53:54 +09:00
smoogipoo
e8dbc190f1 Remove ability to pool DHOs in parent playfields 2020-11-16 23:30:24 +09:00
smoogipoo
4cf6aca873 Fix slider ball tint not working 2020-11-16 22:40:25 +09:00
smoogipoo
cead67d512 Add back removed InitialLifetimeOffset removal 2020-11-16 21:49:29 +09:00
smoogipoo
85b0f71467 Handle duplicate user IDs within the same batch 2020-11-16 21:17:43 +09:00
smoogipoo
87bf168718 Use queue instead of list 2020-11-16 20:52:51 +09:00
smoogipoo
1b1f4c9c09 Refactor user request to fix threadsafety issues 2020-11-16 20:35:22 +09:00
Dean Herbert
163f5cafb9
Merge pull request #10865 from ekrctb/tasks-json-restore 2020-11-16 20:08:09 +09:00
ekrctb
16d25c5022 Adjast readme for the removed VSCode restore task 2020-11-16 19:25:36 +09:00
ekrctb
a53b5ef8b9 Remove --no-restore from VSCode build tasks 2020-11-16 19:22:08 +09:00
Dan Balasescu
08a127eedc
Merge pull request #10862 from peppy/fix-currentskininfo-thread-safety
Move skin deletion logic to OsuGameBase to promote thread safety
2020-11-16 18:41:46 +09:00
Dan Balasescu
a98327f0c5
Merge branch 'master' into fix-currentskininfo-thread-safety 2020-11-16 17:55:22 +09:00
Dan Balasescu
09298139e1
Merge pull request #10844 from bdach/spinner-rotation-tracker-state
Fix rotation tracker state not being reset on drawable spinner re-use
2020-11-16 17:10:40 +09:00
Dean Herbert
709370c69b Move schedule call outwards 2020-11-16 16:49:31 +09:00
Dean Herbert
9a7fdb2b7e Move skin deletion logic to OsuGameBase to promote thread safety
`CurrentSkinInfo` is used in multiple places expecting thread safety,
while ItemRemoved events are explicitly mentioning they are not thread
safe. As SkinManager itself doesn't have the ability to schedule to the
update thread, I've just moved the logic to `OsuGameBase`. We may want
to move the current skin bindable out of the manager class in the
future to match things like `BeatmapManager`.

Closes https://github.com/ppy/osu/issues/10837.
2020-11-16 16:43:19 +09:00
Dean Herbert
d8c9db860a
Merge pull request #10860 from ekrctb/dotnet-tool-inspectcode
Use `dotnet tool` for InspectCode build script
2020-11-16 16:25:01 +09:00
Dean Herbert
86ef73c587
Merge pull request #10830 from Joehuu/consistent-tournament-strings
Make tournament strings more consistent
2020-11-16 16:20:49 +09:00
Dean Herbert
6706840b54
Merge pull request #10853 from bdach/add-to-legacy-conversion-tests 2020-11-16 15:22:04 +09:00