1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 08:22:56 +08:00
Commit Graph

840 Commits

Author SHA1 Message Date
Dean Herbert
ced6e5efd0 Synchronise animation; reduce flashiness 2018-09-07 17:17:03 +09:00
Dean Herbert
1e39b84089 Increase visibility of osu!mania long notes 2018-09-06 23:49:54 +09:00
Dean Herbert
68a79f895a Fix mania throwing an exception on start of map 2018-08-30 14:58:00 +09:00
smoogipoo
49913f00f0 Fix xmldoc 2018-08-25 00:07:48 +09:00
smoogipoo
26dfabc86c Aggressively check for valid columns before iterating endlessly 2018-08-24 23:57:44 +09:00
smoogipoo
6475dfaeef Allow 2B maps to be converted to mania 2018-08-23 09:19:33 +09:00
Dean Herbert
786ed8203f
Merge branch 'master' into fix-mirror-note-conversion 2018-08-17 14:47:16 +09:00
smoogipoo
3d6721111a Increase the maximum allowable iterations during mania conversion 2018-08-17 13:26:53 +09:00
smoogipoo
99ace9805f Fix mirror note generation never completing 2018-08-17 12:54:32 +09:00
Dean Herbert
dfecb3235b Fix custom exception stack trace output 2018-08-16 20:41:53 +09:00
Dean Herbert
b26c8e3b9e Fix notifiation stack trace output on mania conversion failure 2018-08-16 14:04:48 +09:00
Dean Herbert
6cc6d77815
Merge branch 'master' into mania-conversion-safety 2018-08-16 11:19:14 +09:00
smoogipoo
74a79bfcfa Fix hold note head/tails not being nested hitobjects 2018-08-16 10:45:06 +09:00
Dean Herbert
d28acaada1
Merge branch 'master' into mania-conversion-safety 2018-08-16 10:37:07 +09:00
smoogipoo
26d4bb5451 xmldoc + reword 2018-08-15 09:51:02 +09:00
smoogipoo
2019a89a08 Softly-handle infinite loops in mania beatmap conversion 2018-08-14 16:45:35 +09:00
Dean Herbert
270dc2d1be
Merge branch 'master' into judgement-rework 2018-08-14 13:16:16 +09:00
smoogipoo
f719b9bef5 Fix mania scroll direction not being read from database 2018-08-07 12:20:24 +09:00
Dan Balasescu
c1517e1521
Merge branch 'master' into judgement-rework 2018-08-06 12:30:46 +09:00
smoogipoo
3a7488767c Make HitObject not store the judgement 2018-08-06 11:50:18 +09:00
smoogipoo
741ec0021e Rename more judgement-related methods to "result" 2018-08-06 11:31:46 +09:00
smoogipoo
5fd4ed2f4e Rename judgement-related methods/events + commenting 2018-08-06 10:55:25 +09:00
Dean Herbert
0c920fe486
Merge branch 'master' into mania-mask-container 2018-08-06 04:22:21 +09:00
smoogipoo
2a4994e5ce Make hitobjects only have one judgement + result 2018-08-03 15:38:48 +09:00
smoogipoo
807794d512 Make Rulesets.Mania use the new judgement result structure 2018-08-02 20:36:54 +09:00
smoogipoo
cd70e5e30b Migrate Rulesets.Mania to the new judgement system 2018-08-02 16:44:01 +09:00
Dean Herbert
3c06655672 Split out Special mods into Automation and Conversion 2018-07-31 18:00:42 +09:00
Dean Herbert
aead4be134 Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container 2018-07-23 06:36:10 +02:00
Dean Herbert
d868d81b59
Merge branch 'master' into centralise-judgement-display 2018-07-23 02:58:49 +09:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
smoogipoo
1139f0dbf2 Centralise method of disabling playfield judgements 2018-07-20 17:04:33 +09:00
Dan Balasescu
824c217a0d Adjust comment 2018-07-19 19:46:03 +09:00
Dan Balasescu
5dba048c46
Merge branch 'master' into mania-mask-container 2018-07-19 19:38:43 +09:00
smoogipoo
c3c270621b Fix hold note note masks blocking mouse input 2018-07-19 19:32:47 +09:00
smoogipoo
be297ddf76 Fix direction reversal not quite working correctly 2018-07-19 19:30:20 +09:00
smoogipoo
b7721edc80 Remove more unnecessary changes 2018-07-19 18:25:28 +09:00
smoogipoo
54e288f09b Correctly give note masks a scrolling info 2018-07-17 16:55:50 +09:00
smoogipoo
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
Dan Balasescu
64cde1ebad
Merge branch 'master' into use-switch-over-if 2018-07-17 16:44:57 +09:00
smoogipoo
c51fe6a119 Remove more unused stuff 2018-07-17 16:01:47 +09:00
smoogipoo
48c1561676 Remove now unnecessary mask layer 2018-07-17 16:01:14 +09:00
smoogipoo
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
smoogipoo
827c5c4939 Remove scroll direction from ScrolingPlayfield constructor 2018-07-17 15:14:03 +09:00
Dean Herbert
825941aff1 Use switch with type matching in place of if-else where possible 2018-07-17 14:35:09 +09:00
smoogipoo
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
Dean Herbert
58fe434dd0 Don't use in invalidation logic to avoid incorrect execution 2018-07-16 16:39:52 +09:00
Dean Herbert
98cddc0c04 Fix some legacy cases 2018-07-16 16:26:37 +09:00
Dean Herbert
dbc538abbe Use Enum.HasFlag
With .NET core 2.0+ this is as efficient as the ugly code we've been using.
2018-07-16 16:18:46 +09:00
Dean Herbert
24054246b8 Fix DI regression 2018-07-11 17:54:01 +09:00
Dean Herbert
fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00