1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 07:42:54 +08:00
Commit Graph

28625 Commits

Author SHA1 Message Date
Endrik Tombak
657bf5ad86 Merge branch 'master' of https://github.com/ppy/osu into present-recommended 2020-04-25 10:13:57 +03:00
Dan Balasescu
fc706c19d7
Merge pull request #8846 from peppy/taiko-playfield-background-skinning
Refactor osu!taiko playfield and add background skinning support
2020-04-24 19:55:25 +09:00
Dan Balasescu
b3175f9dfa
Merge branch 'master' into taiko-playfield-background-skinning 2020-04-24 19:27:38 +09:00
Dan Balasescu
b7a2c031a8
Merge pull request #8858 from peppy/fix-comments-container-crash
Fix crash on switching comments page at an inopportune time
2020-04-24 19:06:29 +09:00
Dean Herbert
cbcd915ec8 Fix crash on switching comments page at an inopportune time 2020-04-24 18:18:10 +09:00
Dean Herbert
59bd2b3035
Merge pull request #8823 from smoogipoo/all-ruleset-encoders
Implement legacy beatmap encoding for all rulesets
2020-04-24 17:49:34 +09:00
Dean Herbert
f880bd2d89
Merge pull request #8843 from smoogipoo/fix-mania-placement
Fix mania editor placement not working correctly
2020-04-24 17:28:05 +09:00
Dean Herbert
fe0038ed14
Merge branch 'master' into fix-mania-placement 2020-04-24 17:00:12 +09:00
Dean Herbert
05b3db0147 Remove masking 2020-04-24 16:56:18 +09:00
Dean Herbert
789bf95548 Merge branch 'master' into taiko-playfield-background-skinning 2020-04-24 16:53:05 +09:00
Dean Herbert
196e74940c
Merge pull request #8842 from smoogipoo/improve-osu-placement
Make osu! ruleset placements happen on mouse down
2020-04-24 13:36:18 +09:00
smoogipoo
2b0deec491 Finish note placement on mouse down 2020-04-24 13:20:41 +09:00
Dan Balasescu
2a1335a21e
Merge pull request #8856 from peppy/fix-editor-hard-crash
Fix editor crashing when entering with no beatmap selected
2020-04-24 12:53:59 +09:00
Dan Balasescu
e67ac515fc
Merge branch 'master' into fix-editor-hard-crash 2020-04-24 12:29:48 +09:00
smoogipoo
ca692f30e6 Do full placement on mouse down 2020-04-24 12:27:56 +09:00
Dean Herbert
131f011239
Merge branch 'master' into all-ruleset-encoders 2020-04-24 11:32:48 +09:00
Dean Herbert
ce602f84be
Merge branch 'master' into improve-osu-placement 2020-04-24 11:24:48 +09:00
Dean Herbert
92182ad706
Merge pull request #8834 from smoogipoo/fix-testbeatmap-rulesetid
Fix TestBeatmap not setting appropriate ruleset ID
2020-04-24 11:23:34 +09:00
Dean Herbert
ff82de69e7 Merge branch 'master' into fix-testbeatmap-rulesetid 2020-04-24 10:58:50 +09:00
Dean Herbert
1c13fa6c61 Fix editor crashing when entering with no beatmap selected 2020-04-24 10:27:32 +09:00
Dean Herbert
55652609d8
Merge pull request #8849 from iiSaLMaN/rename-editor-to-editing
Rename editor tests namespace from "Editor" to "Editing"
2020-04-24 09:53:00 +09:00
Salman Ahmed
e3a3144236
Rename editor tests namespace from "Editor" to "Editing" 2020-04-23 11:07:55 +03:00
Dean Herbert
ab93c819b5 Add metric right background element 2020-04-23 15:26:03 +09:00
Dean Herbert
158460f1b8 Merge branch 'master' into taiko-playfield-background-skinning 2020-04-23 13:48:19 +09:00
Dean Herbert
b4e1ad81d0 Fix alignment of right half of legacy input drum 2020-04-23 13:48:08 +09:00
Dean Herbert
f804be25d1 Remove incorrect area sizing (now using fillmode / relative instead) 2020-04-23 13:39:44 +09:00
Dean Herbert
559487b205 Move playfield background implementation to its own file 2020-04-23 13:23:49 +09:00
Dean Herbert
4032d66959 Apply same legacy scale adjust logic to TaikoLegacyHitTarget 2020-04-23 13:17:46 +09:00
Dean Herbert
61d2580e1c Fix gap to left of InputDrum on legacy skins 2020-04-23 13:07:38 +09:00
smoogipoo
4f0b5a34d3 Fix hold note placement body sized incorrectly 2020-04-23 12:53:23 +09:00
smoogipoo
22d2607ff5 Only commit if placement is active 2020-04-23 12:53:09 +09:00
Dean Herbert
2e022fbcb5 Add comment about padding update computation 2020-04-23 12:49:53 +09:00
Dean Herbert
49568a3d56 Adjust input drum to work with new playfield changes 2020-04-23 12:49:53 +09:00
Dean Herbert
37f7e0a734 Restructure TaikoPlayfield for better skin support 2020-04-23 12:49:53 +09:00
smoogipoo
c59096a941 Fix note placement 2020-04-23 12:36:40 +09:00
Dean Herbert
58bf288595 Remove DrawableHit's custom sizing logic
Turns out this was unnecessary and never actually being used.
2020-04-23 12:17:52 +09:00
smoogipoo
8d5732aabd Make placements happen on mouse down 2020-04-23 12:17:11 +09:00
Dean Herbert
ca56e6c0d2 Rename taiko HitTarget classes to avoid conflict with mania 2020-04-23 12:11:30 +09:00
smoogipoo
6df45164fa Expose direction from scrolling test container 2020-04-23 11:17:16 +09:00
smoogipoo
86ef73aa27 Implement HitObjectContainer.Clear() 2020-04-23 11:16:59 +09:00
smoogipoo
40f11ed15c Resolve broken test scene 2020-04-23 10:37:05 +09:00
smoogipoo
7796593b2c Merge branch 'master' into fix-testbeatmap-rulesetid 2020-04-23 10:35:08 +09:00
Dean Herbert
dd9ceed802
Merge branch 'master' into all-ruleset-encoders 2020-04-22 22:51:42 +09:00
Dean Herbert
97dcd546f1
Merge pull request #8833 from smoogipoo/remove-obsoletes
Remove obsolete nested hitobject methods
2020-04-22 22:40:06 +09:00
Dean Herbert
baeeafa941
Merge pull request #8832 from smoogipoo/editor-platform-bindings
Use platform bindings for editor actions
2020-04-22 22:39:38 +09:00
smoogipoo
08982e0e00 Ensure editor tests wait for load to complete 2020-04-22 19:49:21 +09:00
smoogipoo
0a34fddcc3 Fix TestBeatmap not setting appropriate ruleset ID 2020-04-22 19:38:27 +09:00
Dan Balasescu
e91018bce2
Merge pull request #8830 from iiSaLMaN/replace-catcher-construction-with-static-calculation-methods
Add static internal catcher calculation methods for CatchDifficultyCalculator
2020-04-22 19:15:31 +09:00
smoogipoo
93151f7612 Add back necessary events + addition to list 2020-04-22 18:32:59 +09:00
Dan Balasescu
402fba131b
Merge branch 'master' into replace-catcher-construction-with-static-calculation-methods 2020-04-22 18:29:16 +09:00