1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-27 03:27:31 +08:00

18024 Commits

Author SHA1 Message Date
smoogipoo
575b061dd7 Add change state support to more editor components 2020-04-09 22:02:42 +09:00
smoogipoo
2e33d38cd7 Merge branch 'master' into editor-undo-redo 2020-04-09 22:02:28 +09:00
Dean Herbert
cc0bcea6e5
Merge pull request #8693 from smoogipoo/editorbeatmap-update-cleanup
Cleanup handling of hitobject updates
2020-04-09 21:32:58 +09:00
smoogipoo
14eca3655b Add change state handling to the editor 2020-04-09 21:22:07 +09:00
Dean Herbert
a457880eaa
Merge pull request #8695 from smoogipoo/fix-timeline-crash
Fix crash when trying to edit long beatmaps
2020-04-09 21:05:25 +09:00
smoogipoo
86243d463f Add legacy beatmap diffing 2020-04-09 20:48:59 +09:00
Dean Herbert
f961ae862a
Merge pull request #8694 from smoogipoo/fix-encoder-nullref
Fix possible legacy beatmap encoder nullref
2020-04-09 20:44:08 +09:00
smoogipoo
e58bf8a0d0 Add DiffPlex package 2020-04-09 20:38:38 +09:00
smoogipoo
aad0ada20b Merge branch 'fix-encoder-nullref' into editor-undo-redo 2020-04-09 20:37:00 +09:00
smoogipoo
fde5cd34b2 Merge branch 'editorbeatmap-update-cleanup' into editor-undo-redo 2020-04-09 20:36:57 +09:00
smoogipoo
683302a77d Fix crash when trying to edit long beatmaps 2020-04-09 20:25:26 +09:00
smoogipoo
b900f229e7 Fix possible legacy beatmap encoder nullref 2020-04-09 20:21:42 +09:00
smoogipoo
ee6ea08cf8 Cleanup handling of hitobject updates 2020-04-09 20:16:44 +09:00
Andrei Zavatski
134feefa14 Remove bindable 2020-04-09 13:10:09 +03:00
Andrei Zavatski
2d3ea95469 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-scroll-container 2020-04-09 13:06:22 +03:00
Dean Herbert
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
Dean Herbert
e10576325c
Merge branch 'master' into update-overlay-headers 2020-04-09 16:29:34 +09:00
Dean Herbert
cb6372acac
Merge branch 'master' into mania-stage-background-skinning 2020-04-09 15:37:48 +09:00
Dean Herbert
260de77304
Merge branch 'master' into select-recommended 2020-04-09 15:30:35 +09:00
Dean Herbert
53b2f58eda
Merge branch 'master' into overlay-scroll-container 2020-04-09 15:05:49 +09:00
Dean Herbert
c5005eb378 Adjust gradient size slightly and make const 2020-04-09 14:55:02 +09:00
Dean Herbert
5a78e74470 Use Lerp instead of ValueAt 2020-04-09 14:51:50 +09:00
Dean Herbert
c44957db3f Change initial health to 1 to avoid false fail display 2020-04-09 14:49:09 +09:00
Dean Herbert
52c9762651 Remove pointless keywords 2020-04-09 14:36:04 +09:00
Dean Herbert
947745d87e Change fail effect to be less distracting 2020-04-09 14:34:23 +09:00
Dean Herbert
4976f80b71 Move implementation to HUD 2020-04-09 14:31:25 +09:00
Dean Herbert
0e2d5213ce
Merge branch 'master' into low-hp-red-layer 2020-04-09 13:53:57 +09:00
Dean Herbert
4bfc738f5b
Merge pull request #7639 from santerinogelainen/master
Add top rank to the beatmap carousel
2020-04-08 23:36:47 +09:00
Dean Herbert
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
Dean Herbert
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
Dean Herbert
61d8cfd224 Fix triangle intro video being out of time 2020-04-08 19:51:55 +09:00
Dean Herbert
4b16b2e720 Bump legacy skin version 2020-04-08 19:42:31 +09:00
smoogipoo
7d787dde89 Move comparison to decoder 2020-04-08 18:17:45 +09:00
Alchyr
3d975f30a3 Merge branch 'timing-equivalence' of https://github.com/Alchyr/osu into timing-equivalence 2020-04-08 01:45:53 -07:00
Alchyr
65823fb2e1 Use redundancy test 2020-04-08 01:42:35 -07:00
smoogipoo
2ddea018cf Fix hidden notes due to 0 minimum width 2020-04-08 17:15:59 +09:00
smoogipoo
83db6cebb6 Implement bottom stage image 2020-04-08 16:20:54 +09:00
smoogipoo
cd15b672eb Implement left and right stage images 2020-04-08 16:20:47 +09:00
Alchyr
46ce258ebb
Merge branch 'master' into timing-equivalence 2020-04-07 18:57:18 -07:00
Dean Herbert
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
Alchyr
66a474619c Adjust TimingControlPoint equivalency 2020-04-07 18:13:26 -07:00
Alchyr
737a3b608a Correct spelling 2020-04-07 17:34:18 -07:00
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
Lucas A
2087d8d09e Don't search for user rulesets if rulesetsStorage isn't set (Testing environnment) 2020-04-07 16:01:47 +02: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