1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 14:17:26 +08:00
Commit Graph

26508 Commits

Author SHA1 Message Date
Dean Herbert
e1140d7c91 Fix caught fruit radius being incorrect due to moved scale 2020-02-19 17:28:40 +09:00
Dean Herbert
579638976d Merge branch 'catch-fix-cycle-rate' into catch-fruit-skinning 2020-02-19 17:12:10 +09:00
Dean Herbert
d3844f912a Fix fruit representation not cycling as often as it should 2020-02-19 17:07:56 +09:00
Dean Herbert
dff218afd1 Fix ordering of fruits to match stable 2020-02-19 17:07:56 +09:00
Dean Herbert
ccd6b5d933 Merge branch 'fix-index-transfer' into catch-fruit-skinning 2020-02-19 16:43:33 +09:00
Dean Herbert
1938dd04cf Fix indices in beatmap not being transferred to children (and being off by one) 2020-02-19 16:43:17 +09:00
Dean Herbert
14ebcc95fb Fix test scene dynamic compilation 2020-02-19 16:33:49 +09:00
Dean Herbert
4225df51ba Merge branch 'combo-colour-independence' into catch-fruit-skinning 2020-02-19 16:30:51 +09:00
Dean Herbert
345eaff76d Fix regressing tests 2020-02-19 16:07:00 +09:00
Dean Herbert
5340d1de59 Move combo colour update logic to osu! ruleset 2020-02-19 16:07:00 +09:00
Dean Herbert
afbf3a3a79 Fix regressing tests 2020-02-19 15:57:15 +09:00
Dean Herbert
4c4140ae54 Adjust droplets to match stable 2020-02-19 15:55:22 +09:00
Dean Herbert
5261579531 Fix indices in beatmap not being transferred to children (and being off by one) 2020-02-19 15:37:12 +09:00
Dean Herbert
69b5d5606a Fix nested catch objects not having a correct IndexInBeatmap 2020-02-19 15:32:24 +09:00
Dean Herbert
3f99d25e37 Use new UpdateComboColour method to simplify colouring 2020-02-19 15:28:29 +09:00
Dean Herbert
fec5c4a73a Move combo colour to accent propagation logic to osu! ruleset 2020-02-19 15:16:07 +09:00
Dean Herbert
618fb4ccfb Move combo colour update logic to osu! ruleset 2020-02-19 15:05:04 +09:00
Dean Herbert
26fe15b038 Fix fruit representation not cycling as often as it should 2020-02-19 14:41:25 +09:00
Dean Herbert
aeb45c8442 Fix ordering of fruits to match stable 2020-02-19 14:31:43 +09:00
Dean Herbert
24e33abcbf Fix banana colouring for skins 2020-02-19 14:31:32 +09:00
Dean Herbert
3eeb60f60f Centralise and fix scaling 2020-02-19 14:31:14 +09:00
Dean Herbert
ce1a57550f Add droplet skinning support 2020-02-19 13:29:05 +09:00
Dean Herbert
0f85e81240 Fix handling of bindable changes in accent colour 2020-02-19 12:10:09 +09:00
Dan Balasescu
02f3e78b14
Merge pull request #7893 from EVAST9919/rankings-refactor
Various RankingsOverlay fixes
2020-02-19 11:20:04 +09:00
Dean Herbert
f245fe5934 Fix catch combo colouring 2020-02-19 10:28:20 +09:00
Dan Balasescu
255e01564f
Merge branch 'master' into rankings-refactor 2020-02-19 10:28:13 +09:00
Dan Balasescu
67a568e67f
Merge pull request #7892 from EVAST9919/beatmap-listing-search-section
Implement BeatmapListingSearchSection component
2020-02-19 10:24:18 +09:00
Dean Herbert
ab863cdfd9 Fix incorrect scaling factor being applied 2020-02-19 09:52:29 +09:00
Dean Herbert
73e5018696 Move radius adjust local to fruit piece 2020-02-19 09:39:56 +09:00
Dean Herbert
ded7f5ff1b Merge branch 'master' into catch-fruit-skinning 2020-02-19 09:38:03 +09:00
Andrei Zavatski
e9003346d4 Add missing blank line 2020-02-18 21:28:38 +03:00
Andrei Zavatski
5347119a85 Various RankingsOverlay fixes 2020-02-18 21:26:25 +03:00
Andrei Zavatski
37003e11b9 Make fields readonly 2020-02-18 18:04:39 +03:00
Andrei Zavatski
bb22243903 TestScene improvements 2020-02-18 17:47:44 +03:00
Andrei Zavatski
b6423dd92e Small textbox adjustments 2020-02-18 17:40:12 +03:00
Andrei Zavatski
7228900361 Implement BeatmapListingSearchSection component 2020-02-18 17:25:12 +03:00
Dean Herbert
6a5c69e544
Merge pull request #7891 from peppy/fix-playlist-selected-state
Fix playlist items potentially not updating to the correct selected state
2020-02-18 21:38:44 +09:00
Dan Balasescu
a195886e1b
Merge branch 'master' into fix-playlist-selected-state 2020-02-18 21:17:03 +09:00
Dean Herbert
8d7a356469
Merge pull request #7874 from smoogipoo/bindable-list-events
Update with framework-side bindable list changes
2020-02-18 19:24:30 +09:00
Dean Herbert
2f4c252fc0 Fix playlist items potentially not updating to the correct selected state 2020-02-18 19:19:04 +09:00
Dean Herbert
a1bfb18ce0 Fix accessing incorrect items list in event 2020-02-18 19:00:02 +09:00
Dean Herbert
b7849dd91a Update framework 2020-02-18 18:47:21 +09:00
Dean Herbert
b18f9e195e Merge branch 'master' into bindable-list-events 2020-02-18 18:47:06 +09:00
Dan Balasescu
5c3280f5ff
Merge pull request #7820 from EVAST9919/italic-rankings-stuff
Update design of username and country name in RankingsOverlay
2020-02-18 16:30:38 +09:00
Dan Balasescu
9e816e3479
Merge branch 'master' into italic-rankings-stuff 2020-02-18 16:05:18 +09:00
Dean Herbert
e27fcb3203
Merge pull request #7888 from peppy/fix-catch-skin-change
Fix osu!catch fruit exploding/dropping multiple timed is skin is changed during explode animation
2020-02-18 14:07:33 +09:00
Dean Herbert
181774e569
Merge pull request #7889 from smoogipoo/fix-ogg-samples
Fix ogg beatmap/skin samples not loading
2020-02-18 14:07:12 +09:00
Dean Herbert
65320ace47 Merge branch 'master' into fix-catch-skin-change 2020-02-18 13:41:00 +09:00
Dean Herbert
79f3249d37 Fix typo in method 2020-02-18 13:40:50 +09:00
Dean Herbert
c49637dfb7
Merge pull request #7879 from peppy/catch-skin-test-updates
Update osu!catch test scenes to show skinnable versions
2020-02-18 13:31:11 +09:00