Bartłomiej Dach
f5f0b94944
Fix incorrect fallback logic
...
The recently-modified skin texture fallback logic was very subtly
incorrect. If at the end of the first loop no texture was found, it
would be checked for null to avoid setting scale adjust on a null
texture, but then returned anyway, bypassing the fallback logic for
subsequent possible paths entirely.
Invert the check and explicitly continue to the next fallback path
if neither a 2x, nor 1x texture with the given name is found in the
store.
2020-04-07 22:50:25 +02:00
Dan Balasescu
35d66c3c1d
Fix missing comma
2020-04-07 23:37:30 +09:00
Dean Herbert
2062087155
Merge branch 'master' into more-mania-colours
2020-04-07 23:36:42 +09:00
Dean Herbert
9ff4458fd6
Merge branch 'master' into mania-skin-note-images
2020-04-07 22:41:22 +09:00
Dean Herbert
780784217d
Merge pull request #8652 from smoogipoo/mania-multiple-columnwidth
...
Make note height scale by minimum column width
2020-04-07 22:38:12 +09:00
Dean Herbert
f0443bca3c
Merge pull request #8643 from smoogipoo/fix-legacy-version
...
Make version-less skins fallback to version 1.0
2020-04-07 21:28:06 +09:00
smoogipoo
2568f3f588
Fix off-by-one indexing
2020-04-07 17:11:32 +09:00
smoogipoo
11d58fb7f6
Implement column background and light colours
2020-04-07 16:53:55 +09:00
smoogipoo
9fd73492ca
Implement judgement line colour
2020-04-07 16:53:55 +09:00
smoogipoo
3ecb99462f
Make note height scale by minimum column width
2020-04-07 16:07:18 +09:00
Dan Balasescu
6dbe8cd575
Merge branch 'master' into animate-judgements
2020-04-07 11:29:07 +09:00
smoogipoo
a4208f35c4
Make versionless skins fallback to version 1.0
2020-04-06 19:36:17 +09:00
smoogipoo
db6db861c0
Implement mania note + key image configs
2020-04-06 19:04:02 +09:00
smoogipoo
eff17c2da5
Allow legacy skin textures from subpaths
2020-04-06 19:03:15 +09:00
smoogipoo
0182448262
Fix performance when parsing mania skins
2020-04-06 18:35:39 +09:00
Dean Herbert
33c64428a8
Fix playback position being set incorrectly for IAnimationTimeReference
2020-04-06 13:04:32 +09:00
Endrik Tombak
6700ef910f
use startAtCurrentTime
2020-04-04 11:35:15 +03:00
Dean Herbert
51db361c32
Update usages of Animation and Video in line with framework changes
2020-04-03 16:00:06 +09:00
smoogipoo
24a7b5f0d6
Fix missing comma
2020-04-02 23:59:53 +09:00
Dean Herbert
f919a2f267
Merge branch 'master' into mania-hitexplosion-skinning
2020-04-02 23:57:03 +09:00
smoogipoo
2a6c0de225
Add frameLength parameter to GetAnimation
2020-04-02 22:56:30 +09:00
smoogipoo
62f1bc276d
Add skinning support for column line colour
2020-04-02 18:10:17 +09:00
smoogipoo
a77933f5e0
Add support for parsing mania skin colours
2020-04-02 17:56:12 +09:00
smoogipoo
fa3a449c3b
Implement legacy normal hit explosions
2020-04-02 14:37:29 +09:00
smoogipoo
b375a02cff
Cleanup positioning factor definition
2020-04-02 14:37:29 +09:00
smoogipoo
beb1f037e9
Add startAtCurrentTime parameter to GetAnimation()
2020-04-02 14:33:15 +09:00
Dean Herbert
a76428f965
Move lookup to own function
2020-04-01 23:46:50 +09:00
Dean Herbert
c2c7ff7334
Add temporary logic to LegacySkin
2020-04-01 23:32:48 +09:00
smoogipoo
ff2c5b446e
Fix column lights positioned incorrectly
2020-04-01 16:06:09 +09:00
smoogipoo
2d6d1a8cc6
Implement column width and column spacing
2020-04-01 13:38:03 +09:00
杜Nate
9d9780707d
Merge branch 'master' into mania-skinning-refactor
2020-04-01 10:27:40 +08:00
Dean Herbert
3454983d7a
Merge branch 'master' into mania-hold-note-skinning
2020-04-01 00:04:49 +09:00
Dean Herbert
1e88d3c17a
Merge conflict "resolution"
2020-03-31 23:36:06 +09:00
mcendu
c0f8c1dc28
rename variable used for mania lookup key storage
2020-03-31 17:22:46 +08:00
smoogipoo
1952fcc0ce
Implement mania hold note skinning
2020-03-31 16:42:35 +09:00
smoogipoo
c4f76ffdaf
Implement mania note skinning
2020-03-31 15:29:25 +09:00
smoogipoo
b926d570ee
Allow skinnabledrawable to be auto-sized
2020-03-31 15:28:50 +09:00
smoogipoo
211a8db4c5
Merge branch 'mania-key-area-skinning' into mania-note-skinning
2020-03-31 15:23:59 +09:00
smoogipoo
538dc0c558
Merge branch 'mania-hitobject-area-skinning' into mania-note-skinning
2020-03-31 15:20:56 +09:00
smoogipoo
71387016b2
Add missing judgement line
2020-03-31 12:26:31 +09:00
smoogipoo
02237133cb
Implement mania hit target skinning
2020-03-31 12:17:44 +09:00
smoogipoo
cb1513b374
Add mania key area skinning
2020-03-31 11:23:33 +09:00
smoogipoo
44727eb2b8
Implement column background skinning
2020-03-31 10:57:56 +09:00
smoogipoo
2b5e9885f6
Implement mania skin reading functionality
2020-03-31 10:55:58 +09:00
smoogipoo
a8f7d7ea42
Add structure for mania configuration lookups
2020-03-30 23:21:40 +09:00
smoogipoo
881ec146af
Ignore duplicate configs
2020-03-30 17:36:57 +09:00
smoogipoo
4719aac235
Add basic mania skin parsing
2020-03-30 17:18:09 +09:00
Dean Herbert
d8041a0dcb
Increase sample concurrency to better match stable
2020-03-22 02:16:28 +09:00
Kelvin
c8ea922577
Update osu.Game/Skinning/LegacySkinExtensions.cs
...
Co-Authored-By: Dean Herbert <pe@ppy.sh>
2020-03-12 04:18:57 -07:00
Kelvin
317bb5d0a4
Fallback on invalid AnimationFramerate for legacy skins
2020-03-12 03:55:45 -07:00