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

28702 Commits

Author SHA1 Message Date
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
Dean Herbert
dba737105e Update test scene for dynamic compilation 2020-04-24 08:57:01 +09:00
Shivam
28dcfe867c Add Chroma keying to the background of the showcase video. 2020-04-23 21:09:12 +02:00
Shivam
085b6ae25f Add background video for showcase scene (Tournament Client) 2020-04-23 20:24:03 +02:00
Tim Oliver
029d15f2a2 Fixed syntax warning for playfield children 2020-04-23 20:14:39 +08:00
Tim Oliver
1fa3764a1d Cleaned up Update method in Taiko Playfield 2020-04-23 18:26:53 +08:00
Tim Oliver
c059588a09 Removed un-needed unproxy method 2020-04-23 18:26:40 +08:00
Tim Oliver
dded4f8176 Fixed syntax warnings in Taiko playfield 2020-04-23 18:17:31 +08:00
Tim Oliver
f1ae8af581 Removed un-needed using directives 2020-04-23 18:16:05 +08:00
Tim Oliver
a9897ba627 Moved proxy behaviour to drumroll container 2020-04-23 18:15:12 +08:00
Tim Oliver
b471a240cc Fixed merge typo in playfield members 2020-04-23 16:59:56 +08: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
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
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