1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-30 23:17:25 +08:00
Commit Graph

133 Commits

Author SHA1 Message Date
Dean Herbert
68a79f895a Fix mania throwing an exception on start of map 2018-08-30 14:58:00 +09:00
Dean Herbert
aead4be134 Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container 2018-07-23 06:36:10 +02:00
smoogipoo
1139f0dbf2 Centralise method of disabling playfield judgements 2018-07-20 17:04:33 +09:00
smoogipoo
b7721edc80 Remove more unnecessary changes 2018-07-19 18:25:28 +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
smoogipoo
827c5c4939 Remove scroll direction from ScrolingPlayfield constructor 2018-07-17 15:14:03 +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
smoogipoo
f49b7d6e16 Add mania direction to settings 2018-06-11 14:36:19 +09:00
smoogipoo
ee64760406 Add mania stage test case 2018-06-08 14:28:27 +09:00
smoogipoo
9b10cc4e0c Remove invertability of ManiaStage 2018-06-07 19:53:47 +09:00
AlFasGD
d504a44dfb Implement mask layering (incomplete) 2018-05-21 23:08:04 +03:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
smoogipoo
45e8a2b69b Remove ManiaPlayfield local scrollTime bindable
Now not needed due to having this databased.
2018-01-25 20:49:25 +09:00
Dean Herbert
1fda45fe10 Fix broken formatting 2018-01-23 16:40:18 +09:00
Dean Herbert
c01f67b0d8 Merge remote-tracking branch 'upstream/master' into ruleset-configs 2018-01-23 16:23:25 +09:00
smoogipoo
68a6323168 Remove SpecialColumnPosition for now
This needs to be re-implemented in the future, perhaps in a way that allows it to be dynamically changed.
2018-01-22 16:19:05 +09:00
smoogipoo
8a8b3f25e7 SpecialColumn -> SpecialColumnPosition 2018-01-22 16:12:45 +09:00
smoogipoo
293023d99a Fix keybinding offsets due to special keys 2018-01-22 14:38:41 +09:00
smoogipoo
dee298c395 No more statics + better unregistration 2018-01-18 17:40:05 +09:00
ANDY840119-PC\andy840119
3b291abf60 Merge branch 'master' of https://github.com/ppy/osu into mania_stage_fix
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
#	osu.Game/Rulesets/UI/Playfield.cs
2018-01-17 22:27:32 +09:00
smoogipoo
db27faa471 Add a ScrollTime config setting to osu!mania 2018-01-17 21:13:14 +09:00
smoogipoo
c309cc9454 Privatise OnJudgements as much as possible 2018-01-16 15:37:32 +09:00
smoogipoo
8c5ef0a330 Remove base OnJudgement from Playfield to properly accomodate nested playfields 2018-01-15 20:48:57 +09:00
smoogipoo
39b6425c3e Use a grid container to position the stages
Should be more flexible in the future + provides a more dual-stage feel.
2018-01-15 19:55:15 +09:00
smoogipoo
28586317dd Give stages a size again 2018-01-15 19:44:42 +09:00
smoogipoo
b9909ed1cf Refactor addition of hitobjects 2018-01-15 18:20:43 +09:00
smoogipoo
89c3fcbf6a Refactor column construction 2018-01-15 18:11:53 +09:00
ANDY840119-PC\andy840119
cf0d9e4d9b not sure is it a goodway to delete mania ManiaAction.Special or add more 2018-01-14 21:20:01 +09:00
ANDY840119-PC\andy840119
2d266a8604 fix :
1. Instead of this property, turn SpecialColumnPosition into a
2. special column does not display
2018-01-14 20:44:17 +09:00
ANDY840119-PC\andy840119
5ecfc3a57c fix CI error 2018-01-14 13:06:37 +09:00
ANDY840119-PC\andy840119
58bf611d17 This should be done in the stage instead of the playfield. 2018-01-14 12:51:55 +09:00
ANDY840119-PC\andy840119
d07636a105 Fix :
1. This (along with OnJudgement above) should be done in the following three steps:
2. How about giving the stages an Inverted BindableBool, and having them decide their scale?
2018-01-14 12:49:01 +09:00
ANDY840119-PC\andy840119
f7a908fbfa Fix :
This (along with OnJudgement above) should be done in the following three steps:
.
i'm not sure does it means the code i write
2018-01-14 12:08:09 +09:00
ANDY840119-PC\andy840119
4f0e1f03d2 fix the problem that smoogipoo suggest
1. Rename to stages
2. This should be checking for null or 0, with two exceptions:
3. Space before and after =.
4. foreach (var stage ...
5. Rename to getStageByColumn, and actualColumn -> column.
2018-01-14 11:49:23 +09:00
ANDY840119-PC\andy840119
e947e46566 fix :
1. Add space before {, before Duration, and after 1000
2. How about just ManiaStage?
3. This is really just Columns.Count, you're not saving much with this extra variable here.
2018-01-14 11:41:52 +09:00
ANDY840119-PC\andy840119
561c9f2233 update rom ppy master
.
Find out that has some problem long hit note will not show hit result
2018-01-14 11:32:54 +09:00
smoogipoo
712d586d41 Revert "Add OSD + config value for scroll speed"
This reverts commit a6d8b28221.
2018-01-12 12:28:43 +09:00
smoogipoo
a6d8b28221 Add OSD + config value for scroll speed 2018-01-11 13:40:46 +09:00
ANDY840119-PC\andy840119
118e0b63eb fix CI error 2018-01-11 00:07:27 +09:00
ANDY840119-PC\andy840119
cc0520d722 1. because set stage's width doesn't help, so use margin instead
2. adjust spacing when has different number of stages
2018-01-10 23:47:38 +09:00
smoogipoo
86b5591583 Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite 2018-01-10 18:02:49 +09:00
ANDY840119-PC\andy840119
d5b436d91b use public List<Column> Columns => listColumnStages.SelectMany(x => x.Columns).ToList(); instead 2018-01-08 23:11:20 +09:00
為什麼
98929952e3
Merge branch 'master' into master 2018-01-06 11:17:15 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo
e0e84ff370 Fix mania playfield scrolling hitobjects in the wrong direction 2018-01-04 22:05:20 +09:00
smoogipoo
a7aab21a29 Re-namespace files 2018-01-04 19:22:15 +09:00
smoogipoo
651e24e3cc Implement proper scrolling directions 2018-01-04 19:17:40 +09:00
smoogipoo
f34131f8f4 Initial game-wide replacement of scrolling playfields 2018-01-04 18:50:17 +09:00
ANDY840119-PC\andy840119
a855a21ccb group -> stage 2018-01-03 23:04:51 +09:00
ANDY840119-PC\andy840119
5326f71ed9 fix some error that smoogipoo says 2018-01-03 22:58:08 +09:00