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
955361be08
Merge pull request #8656 from peppy/per-ruleset-skinnable-tests
...
Add per-ruleset skinnable test scenes to correct dynamic compilation cases
2020-04-07 23:35:52 +09:00
Dan Balasescu
7951a52a15
Merge branch 'master' into per-ruleset-skinnable-tests
2020-04-07 22:59: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
fcb3d3091a
Merge pull request #8660 from peppy/better-resources-retrieval
...
Retrieve dll resources using a more reliable method
2020-04-07 22:31:50 +09:00
Dean Herbert
e597ee9ffd
Update framework
2020-04-07 21:52:15 +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
Dean Herbert
c9872f1d93
Retrieve dll resources using a more reliable method
2020-04-07 18:55:03 +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
Dean Herbert
0a340bac5a
Ensure the correct (up-to-date) ruleset is retrieved
2020-04-07 16:20:13 +09:00
Dean Herbert
39fd297d7d
Merge pull request #8650 from peppy/skinnable-test-scene-recompilation
...
Fix SkinnableTestScene losing test resources on dynamic recompilation
2020-04-07 16:20:00 +09:00
smoogipoo
3ecb99462f
Make note height scale by minimum column width
2020-04-07 16:07:18 +09:00
smoogipoo
ed3e0a01e1
Re-namespace into song select
2020-04-07 15:31:22 +09:00
smoogipoo
ed17a1c990
Improve visual display
2020-04-07 15:30:06 +09:00
smoogipoo
933314d724
Remove unnecessary method
2020-04-07 14:50:11 +09:00
smoogipoo
c46ea7bdef
Add disposal, prevent memory leaks
2020-04-07 14:49:24 +09:00
Dan Balasescu
de99eab52a
Merge branch 'master' into fix-storyboard-video-offset
2020-04-07 14:30:37 +09:00
Dean Herbert
8506029237
Fix SkinnableTestScene losing test resources on dynamic recompilation
2020-04-07 13:46:37 +09:00
Dan Balasescu
5758a9fa4d
Merge branch 'master' into fix-results-star-display-alignment
2020-04-07 12:28:33 +09:00
Dan Balasescu
cc9757f958
Merge pull request #8630 from iiSaLMaN/add-break-period-constructor
...
Add a simple constructor for BreakPeriod
2020-04-07 12:13:40 +09:00
Dan Balasescu
6fc9507cbf
Merge branch 'master' into add-break-period-constructor
2020-04-07 11:39:31 +09:00
Dan Balasescu
6dbe8cd575
Merge branch 'master' into animate-judgements
2020-04-07 11:29:07 +09:00
Dean Herbert
b7308f5ed4
Fix storyboard videos being offset incorrectly
2020-04-07 00:26:38 +09:00
dependabot-preview[bot]
9ed0560da3
Bump SharpCompress from 0.24.0 to 0.25.0
...
Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress ) from 0.24.0 to 0.25.0.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases )
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.24...0.25 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-06 11:37:56 +00:00
Dean Herbert
00f390c850
Update framework
2020-04-06 20:13:53 +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
Joehu
57b6a91449
Remove unnecessary input override on footer button mods
...
Was used when it expanded on hover, but doesn't anymore.
2020-04-05 14:57:44 -07:00
Joehu
0f11ecce01
Make icons container private
2020-04-05 14:53:49 -07:00
Salman Ahmed
0eaea8ef9d
Create a constructor for break period
...
For simple construction of break periods (e.g. filling a method with an array of break periods inside a test case)
2020-04-05 21:29:03 +03:00
Santeri Nogelainen
da59baa779
Add line break
2020-04-04 22:42:13 +03:00
Santeri Nogelainen
163de36777
Merge remote-tracking branch 'upstream/master'
2020-04-04 22:29:15 +03:00
Santeri Nogelainen
1e8badb14a
Move all logic to TopLocalRank and remove CarouselBeatmapRank
2020-04-04 22:28:36 +03:00
Endrik Tombak
6700ef910f
use startAtCurrentTime
2020-04-04 11:35:15 +03:00
Joehu
88cc552534
Fix results star rating display not being centered when no mods are present
...
Needed or the spacing will apply to the fill flow container, causing alignment issues.
2020-04-03 11:30:22 -07:00
Joehu
493b654011
Remove horizontal margin from mod display
...
Can skew center alignment on fill flow containers.
Fixes affected areas. Vector2(5, 0) is similar to MarginPadding { Left = 10 }.
2020-04-03 11:30:02 -07:00
Dean Herbert
7b2144a1a7
Fix merge mishap
2020-04-03 23:31:46 +09:00
Dean Herbert
3289fa7c66
Merge branch 'master' into better-mania-scrollspeed
2020-04-03 23:25:14 +09:00
Dean Herbert
eacbb20d87
Merge branch 'master' into fix-convert-scroll-speed
2020-04-03 22:47:53 +09:00
Dean Herbert
53c99d137a
Merge branch 'master' into mania-config-lookup-refactor
2020-04-03 22:22:59 +09:00
Dean Herbert
258dcceffc
Merge branch 'master' into update-animation-usage
2020-04-03 21:54:11 +09:00
Dean Herbert
f59479fa07
Update framework
2020-04-03 21:09:33 +09:00
smoogipoo
d90db5649d
Improve comment slightly
2020-04-03 18:32:07 +09:00
Dean Herbert
fd9d4a8d32
Update resources
2020-04-03 18:29:32 +09:00
smoogipoo
1ff2cc31d1
Implement more familiar scroll speed options in mania
2020-04-03 18:25:01 +09:00
smoogipoo
b1268a73f1
Add keybinding repeat extension method
2020-04-03 18:15:24 +09:00
Dean Herbert
51db361c32
Update usages of Animation and Video in line with framework changes
2020-04-03 16:00:06 +09:00
smoogipoo
b42d1104b7
Fix mania converts scrolling at incorrect speeds
2020-04-03 13:16:01 +09:00
smoogipoo
1f797207f7
Rework lookups to not require total playfield columns
2020-04-03 12:31:05 +09:00
Will Kennedy
57944bd335
fix(?) InspectCode warnings
2020-04-02 21:36:31 -04:00
Will Kennedy
c042e709a5
Fix GetDecoder getting fallback decoder too often
2020-04-02 20:43:54 -04: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
Dean Herbert
c35dd0153d
Merge branch 'master' into mania-column-line-colour
2020-04-02 23:03:22 +09:00
smoogipoo
2a6c0de225
Add frameLength parameter to GetAnimation
2020-04-02 22:56:30 +09:00
Dean Herbert
23b53bee56
Update resources
2020-04-02 22:05:32 +09:00
Dean Herbert
8f2a3578bd
Merge branch 'master' into mania-hitexplosion-skinning
2020-04-02 21:59:01 +09:00
Dean Herbert
a6d6bab0cc
Update framework
2020-04-02 21:21:29 +09:00
Dean Herbert
c18248c827
Fix crash caused by user json order changing
2020-04-02 18:46:09 +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
Dean Herbert
4d8b6c47cc
Update framework
2020-04-01 21:23:43 +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
smoogipoo
66486b094c
Remove unnecessary dependency, allow null mods
2020-04-01 13:31:17 +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
Andrei Zavatski
e26fbd5ed8
Remove overcomplicated stuff
2020-03-31 13:45:59 +03:00
Andrei Zavatski
fd8d4cf23b
Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-scroll-container
2020-03-31 13:33:27 +03:00
Dean Herbert
da129ddf6a
Merge pull request #8513 from smoogipoo/mania-skinning-testability
...
Implement basis for mania skinning
2020-03-31 19:03:18 +09:00
mcendu
c0f8c1dc28
rename variable used for mania lookup key storage
2020-03-31 17:22:46 +08:00
Dean Herbert
f2416f15a3
Merge pull request #8509 from bdach/fix-widescreen-storyboards
...
Support widescreen per-layer storyboard masking
2020-03-31 17:47:42 +09:00
Dean Herbert
9602ab17b0
Fix replay imports failing for certain mod combinations
2020-03-31 17:13:42 +09: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
Dean Herbert
2109c98481
Merge branch 'master' into fix-widescreen-storyboards
2020-03-31 15:28:22 +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
1a858c602a
Merge branch 'mania-column-background-skinning' into mania-note-skinning
2020-03-31 15:20:14 +09:00
smoogipoo
4b05f7ff27
Merge branch 'mania-skinning-testability' into mania-key-area-skinning
2020-03-31 15:11:32 +09:00
Dean Herbert
877d5849bb
Merge branch 'master' into mania-skinning-testability
2020-03-31 15:09:11 +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
