1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 01:07:24 +08:00
Commit Graph

29306 Commits

Author SHA1 Message Date
Tim Oliver
b471a240cc Fixed merge typo in playfield members 2020-04-23 16:59:56 +08:00
smoogipoo
4ebb28d3e7 wip 2020-04-23 17:52:54 +09:00
smoogipoo
0a840a2613 Fix mania not getting its own selection handler 2020-04-23 17:41:33 +09:00
Salman Ahmed
e3a3144236
Rename editor tests namespace from "Editor" to "Editing" 2020-04-23 11:07:55 +03:00
Dean Herbert
712331a2fe Add metric barline element 2020-04-23 15:26:20 +09:00
Dean Herbert
ab93c819b5 Add metric right background element 2020-04-23 15:26:03 +09:00
Dean Herbert
8f31846def Add playfield background to test scene to better understand bounds 2020-04-23 14:39:34 +09:00
Dean Herbert
12f156dcec Add taiko barline skinning support 2020-04-23 14:32:48 +09:00
Dean Herbert
2a1cc35541 Add test scene 2020-04-23 14:01:50 +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
smoogipoo
12c235027d Remove stale file 2020-04-23 13:28:27 +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
Salman Ahmed
6376128bde
Remove unnecessary using directive 2020-04-23 05:33:28 +03:00
Salman Ahmed
278c3795e4
Merge remote-tracking branch 'upstream/master' into catch-hyperdash-catcher-colouring 2020-04-23 05:21:56 +03: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
Tim Oliver
81c51f0661 Merge branch 'master' into taiko-drumroll-party
# Conflicts:
#	osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
#	osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
2020-04-22 23:15:48 +08:00
Tim Oliver
2600518b1b Moved drumroll container and removed rewound notes 2020-04-22 22:50:00 +08:00
Tim Oliver
26779a57b4 Exposed public ability to unproxy content 2020-04-22 22:49:30 +08: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
Craftplacer
8446fa98b5 Merge remote-tracking branch 'upstream/master' into taiko-don 2020-04-22 15:21:54 +02:00
Craftplacer
617d27ace9 Restart branch 2020-04-22 15:19:29 +02: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
smoogipoo
e1142b424d Fix test failures 2020-04-22 18:14:21 +09:00
smoogipoo
8b0274fedd Remove obsolete methods 2020-04-22 17:55:50 +09:00
smoogipoo
9c22d2f1dd Use platform bindings for editor actions 2020-04-22 17:41:24 +09:00
Tim Oliver
44405d4771 Moved result to load complete for flying hits 2020-04-22 15:50:23 +08:00
Salman Ahmed
bffe6742e0
Replace finishing catcher transforms with until-true step 2020-04-22 10:43:49 +03:00
Salman Ahmed
730b5ea1a9
Make the Catcher.Colour assertion read better 2020-04-22 10:40:21 +03:00