Commit Graph

340 Commits

Author SHA1 Message Date
d1c976880c Fix incorrect margin/spacing handling 2018-11-29 14:15:28 +09:00
8fd04cb47b Fix mania placement blueprints appearing outside valid stage placement area 2018-11-29 13:20:37 +09:00
2ee181daf7 Re-namespace replay-related classes 2018-11-28 17:20:37 +09:00
4cfeb1b9a1 Merge branch 'master' into note-placement 2018-11-26 14:35:31 +09:00
c944e8bb29 Merge branch 'master' into fix-deletion-crash 2018-11-26 14:20:02 +09:00
c0fcbc283e Merge branch 'note-placement' into inter-column-movements
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
2018-11-26 11:47:22 +09:00
56032a4522 Merge branch 'mania-selection-movement' into inter-column-movements
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
#	osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
2018-11-26 11:45:48 +09:00
91aa00b0e9 Add helper method to get column by position 2018-11-26 10:54:54 +09:00
4ba3fa4ab6 osuTK 2018-11-26 10:44:48 +09:00
1da2006dea Merge branch 'master' into note-placement 2018-11-22 19:44:39 +09:00
dc8cd51e15 Implement mania note deletion 2018-11-20 17:26:00 +09:00
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
595e2ffbff Unbind event when column changes 2018-11-19 16:20:21 +09:00
f7fc2ca569 Basic inter-column selection movement 2018-11-15 21:37:22 +09:00
25101ecd2c Snap placement blueprint to columns 2018-11-13 14:13:29 +09:00
3a1fee59fb Implement note placement 2018-11-12 18:24:18 +09:00
10543cf1b6 Move rest of ScrollingPlayfield into ScrollingRulesetContainer 2018-11-12 17:34:35 +09:00
ad45bc7666 Move scroll direction to scrollinginfo 2018-11-12 17:34:35 +09:00
9fde7f7f44 Move scrolling info to osu.Game 2018-11-12 17:34:35 +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
ff559a3a1b Merge remote-tracking branch 'origin/master' into playfield-scaling-rework
# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
#	osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-10-05 10:40:16 +09:00
540a010fbb Implement an intermediary EditRulesetContainer 2018-10-03 15:36:24 +09:00
88b0c234cc Move judgement text to internal container 2018-09-30 04:01:33 -04:00
0bc2bcaf14 Remove GetAspectAdjustedSize() and PlayfieldArea 2018-09-21 15:14:49 +09:00
368ceec47c Simplify creation of a playfield 2018-09-21 14:35:50 +09:00
68a79f895a Fix mania throwing an exception on start of map 2018-08-30 14:58:00 +09:00
270dc2d1be Merge branch 'master' into judgement-rework 2018-08-14 13:16:16 +09:00
f719b9bef5 Fix mania scroll direction not being read from database 2018-08-07 12:20:24 +09:00
c1517e1521 Merge branch 'master' into judgement-rework 2018-08-06 12:30:46 +09:00
741ec0021e Rename more judgement-related methods to "result" 2018-08-06 11:31:46 +09:00
5fd4ed2f4e Rename judgement-related methods/events + commenting 2018-08-06 10:55:25 +09:00
807794d512 Make Rulesets.Mania use the new judgement result structure 2018-08-02 20:36:54 +09:00
aead4be134 Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container 2018-07-23 06:36:10 +02:00
1139f0dbf2 Centralise method of disabling playfield judgements 2018-07-20 17:04:33 +09:00
b7721edc80 Remove more unnecessary changes 2018-07-19 18:25:28 +09:00
54e288f09b Correctly give note masks a scrolling info 2018-07-17 16:55:50 +09:00
6437fdd9db Merge remote-tracking branch 'origin/master' into mania-mask-container
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-07-17 16:46:48 +09:00
827c5c4939 Remove scroll direction from ScrolingPlayfield constructor 2018-07-17 15:14:03 +09:00
577ff4cc7f Merge remote-tracking branch 'origin/master' into mania-mask-container
# Conflicts:
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
#	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
#	osu.Game.Rulesets.Mania/UI/ManiaStage.cs
2018-07-17 13:13:57 +09:00
24054246b8 Fix DI regression 2018-07-11 17:54:01 +09:00
fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00
f007e71c87 Retrieve the mania key action through DI 2018-07-02 12:31:41 +09:00
a397827841 Reduce line length 2018-06-25 19:28:38 +09:00
57011ff13b Merge branch 'master' into mania-playfield-inversions 2018-06-15 18:33:40 +09:00
30f7837b03 Merge branch 'master' into fix-taiko-hitexplosions 2018-06-15 17:52:53 +09:00
ae136e89a4 Merge branch 'master' into ruleset-configs 2018-06-12 13:13:18 +09:00
7651819fb0 Add same change to mania's hit explosions 2018-06-12 12:53:53 +09:00
9994c69d58 Merge branch 'master' into fix-object-ordering 2018-06-11 17:53:33 +09:00
3bad319dd2 Fix filename 2018-06-11 16:19:57 +09:00
10d1dfa7cd A bit of cleanup 2018-06-11 16:10:27 +09:00