Commit Graph

319 Commits

Author SHA1 Message Date
0a0023920f Fix not being able to drag control points mid-snake 2018-11-02 04:09:33 +09:00
5eaf80ab76 Add missing newline 2018-10-31 12:07:06 +09:00
72d48aa7f5 Add xmldocs to IPlacementHandler 2018-10-18 16:46:30 +09:00
0e841628b6 Implement hitobject deletion 2018-10-18 16:36:06 +09:00
969477dadd Remove placement events, make everything pass top-down 2018-10-17 17:43:16 +09:00
62635c5ab8 Add container to handle placement mask 2018-10-17 16:17:49 +09:00
4ea4ec0d25 Move placement handling events to a higher level 2018-10-17 15:46:30 +09:00
70f1d17b7e Merge remote-tracking branch 'origin/master' into editor-mask-placement
# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
#	osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
#	osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
#	osu.Game/Rulesets/UI/RulesetContainer.cs
2018-10-16 17:28:16 +09:00
841b2e8692 Merge branch 'master' into consistent-terminology-format 2018-10-10 19:19:36 +09:00
934b687965 Fix selection masks not being added for new objects 2018-10-03 16:49:59 +09:00
4cdb6dcea5 Rename HitObjectMask -> SelectionMask 2018-10-03 13:28:00 +09:00
50091252e2 Adapt signature change of event handlers 2018-10-02 12:02:55 +09:00
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
f99eff1192 Use consistent terminology format 2018-09-15 07:30:11 -07:00
22dce64d6d Merge branch 'master' into circular-button 2018-08-21 19:15:20 +09:00
85dc42d47a Re-namespace/rename CircularButton 2018-08-15 16:49:53 +09:00
6ee06602b8 Merge branch 'master' into mania-mask-container 2018-08-02 20:41:27 +09:00
4bd811bd2d Merge branch 'master' into circular-button 2018-08-02 20:25:45 +09:00
10b8708d4e Make SetupCircularButton adjust corner radius by height 2018-08-01 17:47:32 +09:00
9eb47ae691 Make SetupCircularButton inherit OsuButton 2018-08-01 17:02:52 +09:00
47533f83c3 Update TabControl subclasses to use AddInternal 2018-07-31 20:52:11 +09:30
c9d4332846 size_x, size_y -> width, height 2018-07-31 16:44:20 +09:00
c5a772bbc8 Completely reuse TriangleButton 2018-07-31 15:49:04 +09:00
93cf063c97 Remove useless things 2018-07-27 12:52:33 +03:00
1962797e20 Remove unnecessary using directive 2018-07-27 12:40:38 +03:00
78cde95132 Privatise constants 2018-07-27 12:34:11 +03:00
3ee1353976 Remove whitespace 2018-07-27 12:28:47 +03:00
2a819a53c0 Prefer inheriting TriangleButton instead of Container 2018-07-27 12:26:37 +03:00
c4b1ba2979 Remove padding, fix corner radiuses 2018-07-25 15:14:40 +03:00
206e3686f2 Add back blue border 2018-07-25 18:38:50 +09:00
b60e4b0728 Cleanup 2018-07-25 18:34:47 +09:00
6675c455f3 Trim whitespace that magically appeared 2018-07-24 22:33:19 +03:00
3ca112aef0 Clean code and apply requested changes 2018-07-24 22:04:02 +03:00
ebf14c9c93 Update framework from current master 2018-07-24 11:32:24 +03:00
d304aca08f Merge branch 'master' into circular-button 2018-07-24 11:30:56 +03:00
4d0d4523ca Add test case, rename component 2018-07-24 11:23:38 +03:00
0e50e4ee34 Clean code 2018-07-24 10:10:17 +03:00
765c6e4ecc Remove custom text box 2018-07-24 09:46:24 +03:00
2f452c162c Make text colour white 2018-07-24 09:21:01 +03:00
a833fa3d92 Update framework and apply suggested changes 2018-07-24 09:19:45 +03:00
cd37b0df23 Merge branch 'master' into labelled-text-box 2018-07-24 09:19:22 +03:00
dd56a2d95f Apply proposed changes (untested) 2018-07-23 15:44:10 +03:00
aead4be134 Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container 2018-07-23 06:36:10 +02:00
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
7b4616c6c1 Add circular button file 2018-07-20 14:02:02 +03:00
f200cfe40d Add labelled text box files 2018-07-20 13:05:19 +03:00
b7721edc80 Remove more unnecessary changes 2018-07-19 18:25:28 +09:00
c51fe6a119 Remove more unused stuff 2018-07-17 16:01:47 +09:00
9f730dd784 Merge branch 'editor-composer-cleanup' into mania-mask-container
# Conflicts:
#	osu.Game/Rulesets/Edit/HitObjectComposer.cs
#	osu.Game/Screens/Edit/Screens/Compose/Layers/HitObjectMaskLayer.cs
2018-07-17 16:00:46 +09:00