2d3ea95469
Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-scroll-container
2020-04-09 13:06:22 +03:00
e8f836a410
Merge pull request #8454 from TheWildTree/update-overlay-headers
...
Update overlay header elements to match osu-web
2020-04-09 17:17:03 +09:00
e10576325c
Merge branch 'master' into update-overlay-headers
2020-04-09 16:29:34 +09:00
cb6372acac
Merge branch 'master' into mania-stage-background-skinning
2020-04-09 15:37:48 +09:00
260de77304
Merge branch 'master' into select-recommended
2020-04-09 15:30:35 +09:00
53b2f58eda
Merge branch 'master' into overlay-scroll-container
2020-04-09 15:05:49 +09:00
c5005eb378
Adjust gradient size slightly and make const
2020-04-09 14:55:02 +09:00
5a78e74470
Use Lerp instead of ValueAt
2020-04-09 14:51:50 +09:00
c44957db3f
Change initial health to 1 to avoid false fail display
2020-04-09 14:49:09 +09:00
52c9762651
Remove pointless keywords
2020-04-09 14:36:04 +09:00
947745d87e
Change fail effect to be less distracting
2020-04-09 14:34:23 +09:00
4976f80b71
Move implementation to HUD
2020-04-09 14:31:25 +09:00
0e2d5213ce
Merge branch 'master' into low-hp-red-layer
2020-04-09 13:53:57 +09:00
4bfc738f5b
Merge pull request #7639 from santerinogelainen/master
...
Add top rank to the beatmap carousel
2020-04-08 23:36:47 +09:00
9bdc881b3c
Merge pull request #8677 from smoogipoo/fix-minwidth-override
...
Fix hidden notes due to 0 minimum width
2020-04-08 23:32:25 +09:00
825a9bcf42
Merge pull request #8681 from peppy/fix-drum-alignment
...
Fix osu!taiko input drum alignment for old skin versions
2020-04-08 23:11:33 +09:00
61d8cfd224
Fix triangle intro video being out of time
2020-04-08 19:51:55 +09:00
4b16b2e720
Bump legacy skin version
2020-04-08 19:42:31 +09:00
7d787dde89
Move comparison to decoder
2020-04-08 18:17:45 +09:00
3d975f30a3
Merge branch 'timing-equivalence' of https://github.com/Alchyr/osu into timing-equivalence
2020-04-08 01:45:53 -07:00
65823fb2e1
Use redundancy test
2020-04-08 01:42:35 -07:00
2ddea018cf
Fix hidden notes due to 0 minimum width
2020-04-08 17:15:59 +09:00
83db6cebb6
Implement bottom stage image
2020-04-08 16:20:54 +09:00
cd15b672eb
Implement left and right stage images
2020-04-08 16:20:47 +09:00
46ce258ebb
Merge branch 'master' into timing-equivalence
2020-04-07 18:57:18 -07:00
d63cfdc024
Merge pull request #8669 from bdach/fix-legacy-skin-fallback
...
Fix legacy skin texture fallback logic
2020-04-08 10:47:11 +09:00
66a474619c
Adjust TimingControlPoint equivalency
2020-04-07 18:13:26 -07:00
737a3b608a
Correct spelling
2020-04-07 17:34:18 -07:00
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
35d66c3c1d
Fix missing comma
2020-04-07 23:37:30 +09:00
2062087155
Merge branch 'master' into more-mania-colours
2020-04-07 23:36:42 +09:00
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
7951a52a15
Merge branch 'master' into per-ruleset-skinnable-tests
2020-04-07 22:59:42 +09:00
9ff4458fd6
Merge branch 'master' into mania-skin-note-images
2020-04-07 22:41:22 +09:00
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
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
e597ee9ffd
Update framework
2020-04-07 21:52:15 +09:00
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
c9872f1d93
Retrieve dll resources using a more reliable method
2020-04-07 18:55:03 +09:00
2568f3f588
Fix off-by-one indexing
2020-04-07 17:11:32 +09:00
11d58fb7f6
Implement column background and light colours
2020-04-07 16:53:55 +09:00
9fd73492ca
Implement judgement line colour
2020-04-07 16:53:55 +09:00
0a340bac5a
Ensure the correct (up-to-date) ruleset is retrieved
2020-04-07 16:20:13 +09:00
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
3ecb99462f
Make note height scale by minimum column width
2020-04-07 16:07:18 +09:00
ed3e0a01e1
Re-namespace into song select
2020-04-07 15:31:22 +09:00
ed17a1c990
Improve visual display
2020-04-07 15:30:06 +09:00
933314d724
Remove unnecessary method
2020-04-07 14:50:11 +09:00
c46ea7bdef
Add disposal, prevent memory leaks
2020-04-07 14:49:24 +09:00
de99eab52a
Merge branch 'master' into fix-storyboard-video-offset
2020-04-07 14:30:37 +09:00