Dean Herbert
|
7aeeb65ae7
|
Tidy up Player's container loading logic
Fixes drawable ruleset being loaded before skin sources are finished, by loading them as a separate operation (to avoid children being loaded first).
|
2019-08-27 18:27:21 +09:00 |
|
Dean Herbert
|
0ea10a4922
|
Fix skin sample reading failing
|
2019-08-27 17:18:32 +09:00 |
|
Dean Herbert
|
66223b9954
|
Merge branch 'master' into allow-fallback-to-samples-without-bank
|
2019-08-27 14:44:16 +09:00 |
|
Dean Herbert
|
62641c149d
|
Fx component lookups being incorrect for non-databased legacy skins
|
2019-08-26 18:20:45 +09:00 |
|
Dean Herbert
|
5e362d10b1
|
Add ruleset-specific legacy skin providers
This moves implementation of osu! skinnables to OsuLegacySkin.
|
2019-08-26 12:21:49 +09:00 |
|
Dean Herbert
|
de2c6aa23d
|
Rename and expand usability of SkinProvidingContainer
|
2019-08-26 12:21:11 +09:00 |
|
iiSaLMaN
|
0bcd323d17
|
Remove unnecessary string literal
|
2019-08-24 09:30:43 +03:00 |
|
iiSaLMaN
|
da72806693
|
Remove lookup logic from SkinnableSound
|
2019-08-23 14:55:38 +03:00 |
|
iiSaLMaN
|
d8535574d1
|
Pass sample info to Skin.GetSample
|
2019-08-23 14:32:43 +03:00 |
|
iiSaLMaN
|
66d8440167
|
Move non-bank samples logic to LegacySkin
|
2019-08-22 12:50:47 +03:00 |
|
iiSaLMaN
|
87f3184fcc
|
Try retrieving samples without bank names
Fallback for spinner bonus samples
|
2019-08-21 15:14:33 +03:00 |
|
Dean Herbert
|
28dfe072a5
|
Update one more blending mode change post-master merge
|
2019-08-21 15:11:46 +09:00 |
|
Dean Herbert
|
4186d2566a
|
Remove unnecessary null checks
|
2019-08-21 15:11:33 +09:00 |
|
Dean Herbert
|
745bd58f37
|
Merge remote-tracking branch 'upstream/master' into update-framework-blending
|
2019-08-21 15:10:08 +09:00 |
|
Dean Herbert
|
444f2b9387
|
Specify font size in a saner way
|
2019-08-21 15:01:50 +09:00 |
|
Dean Herbert
|
6a48819055
|
Merge branch 'master' into update-framework-blending
|
2019-08-21 14:27:57 +09:00 |
|
Dean Herbert
|
cca64771dd
|
Add comment about placement of default loading
|
2019-08-21 13:56:49 +09:00 |
|
Dean Herbert
|
aa8b7b60de
|
Merge remote-tracking branch 'upstream/master' into update-framework-blending
|
2019-08-21 13:30:24 +09:00 |
|
Dan Balasescu
|
82fe506f97
|
Merge branch 'master' into animated-legacy-skins
|
2019-08-21 13:03:11 +09:00 |
|
smoogipoo
|
0de219dda4
|
Update with spritetext text builder changes
|
2019-08-20 19:03:57 +09:00 |
|
Dean Herbert
|
4bffb0df84
|
Merge branch 'animated-legacy-skins' into animated-slider-ball
|
2019-08-20 18:14:17 +09:00 |
|
Dean Herbert
|
6dd638b327
|
Further improve legibility of texture lookup
|
2019-08-20 17:39:24 +09:00 |
|
Dean Herbert
|
84530b7839
|
Colour the correct layer
|
2019-08-20 15:02:07 +09:00 |
|
Dean Herbert
|
f7ce7c7d99
|
Merge branch 'fix-skin-test-regression' into animated-slider-ball
|
2019-08-20 14:09:53 +09:00 |
|
Dean Herbert
|
3b7cee2d45
|
Fix LegacySkin not checking for @2x hitcircle when deciding sizing
|
2019-08-20 13:50:16 +09:00 |
|
Dean Herbert
|
b5cb59faf2
|
Add default skin sprites and specular/diffuse layer support
|
2019-08-20 13:19:32 +09:00 |
|
Dean Herbert
|
d0766fa1cd
|
Add slider ball animation support
|
2019-08-19 19:55:47 +09:00 |
|
Dean Herbert
|
539a27a557
|
Refactor texture lookup code
|
2019-08-19 19:23:54 +09:00 |
|
Dean Herbert
|
d02b8d14f7
|
Avoid unnecessary texture retrieval for non-animated sprites
|
2019-08-19 17:47:59 +09:00 |
|
Dean Herbert
|
d224405bc6
|
Rename const and make more available
|
2019-08-19 17:46:05 +09:00 |
|
Dean Herbert
|
4356f2ef9f
|
Add sample usage of looping skinnable
|
2019-08-19 17:45:54 +09:00 |
|
iiSaLMaN
|
cfa569b226
|
Add looping field and fix build
|
2019-08-15 05:35:47 +03:00 |
|
iiSaLMaN
|
07e7e1187c
|
Add adjustment function in SkinnableSound
|
2019-08-15 05:30:35 +03:00 |
|
Dean Herbert
|
bc49164cc1
|
Merge branch 'master' into animated-legacy-skins
|
2019-08-13 00:40:20 +09:00 |
|
smoogipoo
|
5486c77362
|
Remove explicit autosize
|
2019-08-09 15:25:42 +09:00 |
|
Dean Herbert
|
ec13143ab3
|
Add further xmldoc
|
2019-08-07 18:45:56 +09:00 |
|
jorolf
|
7b95741dab
|
fix crash and add some tests
- still missing special skin textures
|
2019-07-31 21:55:56 +02:00 |
|
jorolf
|
e01d3d85a3
|
Merge branch 'master' of git://github.com/ppy/osu into animated-legacy-skins
|
2019-07-30 20:29:04 +02:00 |
|
Dean Herbert
|
9335ebeb55
|
Fix missing anchor/origin specification
|
2019-07-30 23:45:55 +09:00 |
|
Dean Herbert
|
f6b6fa9633
|
Add disappeared null check
|
2019-07-30 23:44:47 +09:00 |
|
Dean Herbert
|
f9c95e21be
|
Merge remote-tracking branch 'upstream/master' into legacy-cursor-middle
|
2019-07-30 23:44:13 +09:00 |
|
Dean Herbert
|
21a8f566c3
|
Trim whitespace
|
2019-07-30 23:24:28 +09:00 |
|
Dean Herbert
|
d12de7dbfa
|
Add temporary scale hack to make cursors correct size
|
2019-07-30 23:20:35 +09:00 |
|
Dean Herbert
|
8e9f8bb565
|
Merge branch 'master' into slider-ball-scaling
|
2019-07-30 23:19:28 +09:00 |
|
Dean Herbert
|
fbc5285a1f
|
Add legacy skin hit animations (#5464)
Add legacy skin hit animations
|
2019-07-30 23:18:12 +09:00 |
|
Dean Herbert
|
6d279dba5c
|
Fix centering being incorrect for some skins
|
2019-07-30 23:07:41 +09:00 |
|
Dean Herbert
|
fb1f77bd04
|
Move implementation and colour logic to legacy implementation
|
2019-07-30 23:06:18 +09:00 |
|
Dean Herbert
|
e6bd02d276
|
Simplify namespace definition
|
2019-07-30 22:41:20 +09:00 |
|
Dean Herbert
|
307a6c1095
|
Remove DefaultCirclePiece
|
2019-07-30 22:38:29 +09:00 |
|
smoogipoo
|
1222536f7a
|
Rename resource string
|
2019-07-30 19:10:21 +09:00 |
|
Dan Balasescu
|
6a66a3b06f
|
Merge branch 'master' into skinning-test
|
2019-07-30 18:28:56 +09:00 |
|
Dean Herbert
|
766cf9295d
|
Merge remote-tracking branch 'upstream/master' into add-legacy-hit-animations
|
2019-07-29 19:03:36 +09:00 |
|
Dan Balasescu
|
ef229c0f80
|
Merge branch 'master' into legacy-cursor-middle
|
2019-07-29 18:52:11 +09:00 |
|
jorolf
|
0635680db5
|
fix some code quality
|
2019-07-29 11:49:59 +02:00 |
|
Dean Herbert
|
a4f30daf13
|
Merge pull request #5462 from peppy/skin-metric-parity
Bring playfield ratio in line with stable
|
2019-07-29 18:49:21 +09:00 |
|
Dean Herbert
|
d99408e979
|
Fix SkinChanged events triggering after disposal (#5461)
Fix SkinChanged events triggering after disposal
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
|
2019-07-29 18:48:53 +09:00 |
|
Dan Balasescu
|
98813222af
|
Adjust comment
|
2019-07-29 18:35:22 +09:00 |
|
Dean Herbert
|
c514cbe2b7
|
Add basic skinning test
|
2019-07-29 17:27:00 +09:00 |
|
jorolf
|
f4effd12c3
|
make legacy skins animatable
|
2019-07-28 21:04:55 +02:00 |
|
Dean Herbert
|
bfaf9d5f41
|
Remove unnecessary special cases
|
2019-07-25 16:24:10 +09:00 |
|
Dean Herbert
|
c1b0130857
|
Add legacy cursormiddle support
|
2019-07-25 16:23:04 +09:00 |
|
Dean Herbert
|
38e21caa5a
|
Add legacy hitcircle
|
2019-07-25 16:10:01 +09:00 |
|
Dean Herbert
|
900d17a4db
|
Merge branch 'fix-skin-changed-disposal' into add-legacy-hit-animations
|
2019-07-25 16:09:15 +09:00 |
|
Dean Herbert
|
58feba72a3
|
Fix scheduled events not running on previous drawables
|
2019-07-25 15:59:44 +09:00 |
|
Dean Herbert
|
46e17646ac
|
Align slider path size with legacy skins
|
2019-07-25 14:22:26 +09:00 |
|
Dean Herbert
|
9473f6d3e3
|
Fix incorrect ratios being applied to playfield / skin elements
This now matches osu-stable 1:1.
|
2019-07-25 14:22:22 +09:00 |
|
Dean Herbert
|
a290437286
|
Fix skin changed events triggering after disposal
|
2019-07-25 13:55:01 +09:00 |
|
Dean Herbert
|
7275beaf1a
|
Remove unnecessary type specification from SkinnableDrawable
|
2019-07-25 11:20:39 +09:00 |
|
Dean Herbert
|
36c557c752
|
Add null check and simplify scaling conditional logic via switch
|
2019-07-22 14:43:25 +09:00 |
|
Dean Herbert
|
9d091c96b8
|
Use cache to ensure correct DrawSize when deciding scaling
|
2019-07-22 14:43:04 +09:00 |
|
Dean Herbert
|
74c961bcff
|
Add more flexible skin element confine modes
|
2019-07-22 14:42:56 +09:00 |
|
smoogipoo
|
9f6ff63634
|
Fix judgement disposals causing huge LOH pressure
|
2019-07-17 19:25:41 +09:00 |
|
Dean Herbert
|
ba8df3ba92
|
Clean up stable lookup and mutate logic
|
2019-07-05 13:59:31 +09:00 |
|
Dean Herbert
|
8346c50ce1
|
Rename delete method and improve xmldoc
|
2019-07-05 13:55:25 +09:00 |
|
Dean Herbert
|
7575047db8
|
Merge branch 'master' into import-stable-scores
|
2019-07-04 01:00:42 +09:00 |
|
smoogipoo
|
fc8dee6123
|
Fix typo
|
2019-07-01 23:26:53 +09:30 |
|
Dean Herbert
|
0636df5660
|
Add support for legacy skins which use animation frames to hide elements
|
2019-07-01 18:13:14 +09:00 |
|
HoLLy
|
79fc143422
|
Only remove .osk files when importing skin archives
|
2019-06-30 16:52:39 +02:00 |
|
Dean Herbert
|
60ea3d4e1a
|
Fix skinning support for combobreak
|
2019-06-30 21:58:30 +09:00 |
|
welsar55
|
d6561531a3
|
Merge branch 'master' into combobreak
|
2019-06-29 11:55:10 -05:00 |
|
Welsar55
|
a22c166575
|
Make ComboEffects its own class
|
2019-06-29 11:28:40 -05:00 |
|
Welsar55
|
a57218e50e
|
Move to LocalSkinOverride
|
2019-06-28 20:45:11 -05:00 |
|
HoLLy
|
12350d18b5
|
Don't remove imported archives by default
|
2019-06-27 14:41:11 +02:00 |
|
HoLLy
|
55216dffb7
|
Merge remote-tracking branch 'origin/master' into import-stable-scores
|
2019-06-27 14:07:17 +02:00 |
|
Dean Herbert
|
06eaba766b
|
Move method below ctor
|
2019-06-24 15:27:46 +09:00 |
|
Dean Herbert
|
9593e66a96
|
Add some more xmldoc
|
2019-06-24 15:25:01 +09:00 |
|
Dean Herbert
|
3f22c0a311
|
Add SkinnableSprite implementation
|
2019-06-24 15:17:35 +09:00 |
|
HoLLy
|
802da225d4
|
Move responsibility for selecting paths to model managers
|
2019-06-21 17:32:47 +02:00 |
|
HoLLy
|
15c75b4442
|
Add basic score import from stable
|
2019-06-19 18:33:51 +02:00 |
|
smoogipoo
|
f090e292c9
|
Move ArchiveModelManager import process to async flow
|
2019-06-10 13:42:22 +09:00 |
|
Dean Herbert
|
8607f3b765
|
Merge remote-tracking branch 'upstream/master' into databased-sin-setting
|
2019-06-05 19:03:57 +09:00 |
|
Dean Herbert
|
80d65f9a3b
|
Update resource stores with GetAvailableResources
|
2019-05-31 14:33:18 +09:00 |
|
Dean Herbert
|
1629534a0c
|
More disposal?
|
2019-05-31 14:28:53 +09:00 |
|
Dean Herbert
|
a20eda7b5f
|
Fix remaining cases to work without things
|
2019-05-28 23:54:42 +09:00 |
|
Dean Herbert
|
4ca34bd5e8
|
Update osu! in line with audio subsystem refactor
|
2019-05-28 17:06:01 +09:00 |
|
Dean Herbert
|
31e6a4fa59
|
Add optional skin foreign key to databased settings
|
2019-05-27 01:56:19 +09:00 |
|
Dean Herbert
|
487a56549e
|
Fix CI issues
|
2019-05-12 22:53:12 +09:00 |
|
Dean Herbert
|
41e13aef23
|
Use more standard parsing method
|
2019-05-12 22:53:03 +09:00 |
|
Dean Herbert
|
ce0e4c506e
|
Merge branch 'master' into dev
|
2019-05-12 21:45:52 +09:00 |
|
smoogipoo
|
d7c09e7dbd
|
Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
# osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
# osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
# osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
# osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
# osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Graphics/OsuFont.cs
# osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/Skinning/LegacySkinDecoder.cs
|
2019-05-07 13:20:17 +09:00 |
|