smoogipoo
0bc2bcaf14
Remove GetAspectAdjustedSize() and PlayfieldArea
2018-09-21 15:14:49 +09:00
smoogipoo
368ceec47c
Simplify creation of a playfield
2018-09-21 14:35:50 +09:00
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
Dan Balasescu
282a99fb88
Merge branch 'master' into fix-spelling
2018-07-10 16:32:14 +09:00
Dan Balasescu
a1d2092cc9
Fix incorrect default drain time
2018-07-06 13:29:40 +09:00
Dan Balasescu
290812cf65
Merge branch 'master' into more-mania-conversion-fixes
2018-07-06 13:29:16 +09:00
Dean Herbert
1d6609d9f3
Add common custom words to dotsettings dictionary
...
Also fixes some typos and reduces spelling suggestions to hints.
2018-07-05 15:54:41 +09:00
smoogipoo
f007e71c87
Retrieve the mania key action through DI
2018-07-02 12:31:41 +09:00
Dean Herbert
c0b65a6a73
Change default IsBonus definition and remove unnecessary overrides
2018-06-29 17:07:08 +09:00
Dean Herbert
0940715631
Merge branch 'master' into catch-scoring
2018-06-29 14:59:15 +09:00
Dean Herbert
22138d39ca
Merge branch 'master' into more-diffcalc-attributes
2018-06-25 19:53:22 +09:00
Dean Herbert
a397827841
Reduce line length
2018-06-25 19:28:38 +09:00
Dean Herbert
594cc0d21d
Merge branch 'master' into mania-playfield-inversions
2018-06-25 18:36:23 +09:00
smoogipoo
97057ced85
Merge remote-tracking branch 'origin/master' into full-mania-fix
2018-06-25 12:43:49 +09:00
Jean-Denis Boivin
55364af56c
I guess you meant an "or" ?
2018-06-24 14:55:27 -04:00
ekrctb
d6084c0b30
Adapt to new input handling changes
2018-06-22 18:10:27 +09:00
smoogipoo
48989df6eb
Make sure that 0 SR is returned when there are no hitobjects
2018-06-21 12:04:14 +09:00
Dan Balasescu
bf11a61d52
Merge branch 'master' into more-diffcalc-attributes
2018-06-21 09:26:50 +09:00
smoogipoo
6cd9a22e26
Update testcase
2018-06-19 13:52:24 +09:00
smoogipoo
a623155b9f
Fix missing using
2018-06-19 13:51:53 +09:00
smoogipoo
f090e82b63
Fix inverted conditional
2018-06-18 21:06:09 +09:00
smoogipoo
0625bfda30
Don't split single hitobject into multiple patterns
2018-06-18 20:17:49 +09:00
smoogipoo
8529cece4a
Fix precision error
2018-06-18 20:17:19 +09:00
Dean Herbert
1d9d240454
Merge branch 'master' into mania-playfield-inversions
2018-06-18 04:41:17 +09:00
Dean Herbert
6fa72c510f
Avoid listing the base mods twice
2018-06-18 00:48:35 +09:00
smoogipoo
0a99d21938
Use the passed-in ruleset
2018-06-17 18:01:28 +09:00
smoogipoo
55f0b3c42c
Distance object generator should output a secondary pattern
...
In osu!stable, only the hitobjects which ended at the distance object's EndTime would be considered for further pattern generation.
Previously this generator was group _all_ objects including those that don't end at the object's EndTime, resulting in incorrect hitobject count for further pattern generation.
2018-06-15 22:10:57 +09:00
smoogipoo
2d59ae9354
Commit forgotten variable
2018-06-15 22:08:24 +09:00
smoogipoo
53a6d01304
Fix stair type not being flipped correctly
2018-06-15 21:06:54 +09:00
smoogipoo
5f5d797c1e
Remove unused field
2018-06-15 21:06:35 +09:00
smoogipoo
e51f96e181
Fix some notes not being recorded
2018-06-15 20:53:18 +09:00
smoogipoo
c1f7db80f1
Forgot to commit random change
2018-06-15 20:52:09 +09:00
smoogipoo
fe9aaf000c
Fix missing conditional
2018-06-15 20:50:36 +09:00
smoogipoo
481546ec7a
Fix drain time not being rounded to the second
2018-06-15 20:49:11 +09:00
smoogipoo
afbf35b814
Add rng components to mania conversion tests
2018-06-15 20:48:48 +09:00
Dean Herbert
57011ff13b
Merge branch 'master' into mania-playfield-inversions
2018-06-15 18:33:40 +09:00
Dean Herbert
719056ca4a
Merge branch 'master' into mania-keymod-optimisation
2018-06-15 18:29:27 +09:00
Dean Herbert
f9a7e761e4
Merge branch 'master' into more-diffcalc-attributes
2018-06-15 18:29:20 +09:00
Dean Herbert
a6437c005c
Merge branch 'master' into diffcalc-rework
2018-06-15 18:02:18 +09:00
Dean Herbert
30f7837b03
Merge branch 'master' into fix-taiko-hitexplosions
2018-06-15 17:52:53 +09:00
smoogipoo
fd84afb89b
Fix non-inverted calculation
2018-06-14 19:38:48 +09:00
smoogipoo
a3bf16e481
Fix missing convert type
2018-06-14 19:37:32 +09:00
smoogipoo
b25a6a33cc
Fix 1K breaking hitcircle / slider conversions
2018-06-14 19:37:21 +09:00
smoogipoo
08b9cf75e9
Don't compute keymod difficulties for mania-specific beatmaps
...
These don't affect the number of keys in the beatmap at all for mania-specific beatmaps.
2018-06-14 17:10:08 +09:00
smoogipoo
22add2abc5
Move mania difficulty attributes to ManiaDifficultyCalculator
2018-06-14 16:25:44 +09:00
smoogipoo
8f7334874c
Fix up performance calculators
2018-06-14 16:04:48 +09:00
smoogipoo
966099fabc
Adjust ManiaDifficultyCalculator in-line with changes
2018-06-14 15:54:05 +09:00
Dean Herbert
ae136e89a4
Merge branch 'master' into ruleset-configs
2018-06-12 13:13:18 +09:00
smoogipoo
7651819fb0
Add same change to mania's hit explosions
2018-06-12 12:53:53 +09:00
Dan Balasescu
9994c69d58
Merge branch 'master' into fix-object-ordering
2018-06-11 17:53:33 +09:00
smoogipoo
3bad319dd2
Fix filename
2018-06-11 16:19:57 +09:00
smoogipoo
10d1dfa7cd
A bit of cleanup
2018-06-11 16:10:27 +09:00
smoogipoo
b9bf3a1829
Make mania scroll downwards by default
2018-06-11 15:56:30 +09:00
smoogipoo
162237dc46
Fix bar lines being offset
2018-06-11 15:43:15 +09:00
smoogipoo
f49b7d6e16
Add mania direction to settings
2018-06-11 14:36:19 +09:00
smoogipoo
93696fb5e5
Merge branch 'ruleset-configs' into mania-playfield-inversions
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-06-11 13:46:39 +09:00
smoogipoo
4fb6a8627e
Merge remote-tracking branch 'origin/master' into mania-playfield-inversions
2018-06-11 13:45:47 +09:00
smoogipoo
baaf431b9e
Make IScrollingInfo and store direction as bindable
2018-06-11 13:42:13 +09:00
smoogipoo
ca5103615d
DI the scrolling info rather than pass by ctor
2018-06-11 13:42:13 +09:00
smoogipoo
eca016ec6c
Move ruleset config managers to Ruleset
2018-06-11 13:17:08 +09:00
smoogipoo
22e8a0bb6e
Make ruleset config manager variants nullable
2018-06-11 13:13:36 +09:00
Crusensis
fbc0cd6f5f
Split AffectsCombo into IsBonus
2018-06-09 18:14:33 -07:00
Dean Herbert
aaa65c428f
Merge branch 'master' into diffcalc-modtypes
2018-06-09 23:35:17 +09:00
smoogipoo
0fb4e6b41b
Fix hold note body not following the scroll direction
2018-06-08 18:16:55 +09:00
Dan Balasescu
4dfc328117
Remove unused array
2018-06-08 17:46:38 +09:00
smoogipoo
5c8bea82f8
Fix scroll direction not applying to nested hitobjects
2018-06-08 15:29:08 +09:00
smoogipoo
7deaffdb62
Fix hit explosions not following the scroll direction
2018-06-08 15:24:19 +09:00
smoogipoo
d73c2a1654
Fix various note elements not following the scroll direction
2018-06-08 15:24:19 +09:00
smoogipoo
80a577f182
Fix notes not scrolling correctly
2018-06-08 15:16:45 +09:00
smoogipoo
ee64760406
Add mania stage test case
2018-06-08 14:28:27 +09:00
smoogipoo
32037701bf
Make the column hitobject area follow the scroll direction
2018-06-07 21:40:12 +09:00
smoogipoo
0c35908802
Reorder fields
2018-06-07 21:19:31 +09:00
smoogipoo
207cdbdefe
Make the column key area follow the scroll direction
2018-06-07 21:13:57 +09:00
smoogipoo
11f067d7d6
Fix background input
2018-06-07 21:13:29 +09:00
smoogipoo
d49758d149
Make background handle its own lit state
2018-06-07 20:59:04 +09:00
smoogipoo
4af8baefc1
Make the column background follow the scroll direction
2018-06-07 20:49:31 +09:00
smoogipoo
9b10cc4e0c
Remove invertability of ManiaStage
2018-06-07 19:53:47 +09:00
smoogipoo
ce7a5e8914
Update visual style to match new notes
2018-06-07 19:19:32 +09:00
smoogipoo
55475d129f
Merge remote-tracking branch 'origin/master' into mania-mask-container
...
# Conflicts:
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
2018-06-07 19:19:20 +09:00
smoogipoo
24b314b51f
Fix hold note masks not working
2018-06-07 19:00:02 +09:00
smoogipoo
f299ae0fbd
Fix positioning
2018-06-07 18:59:52 +09:00
smoogipoo
cd532cde2d
Fix note masks not working
2018-06-07 18:28:49 +09:00
smoogipoo
d1b469c1a3
Better handling of nested playfields' hitobjects
2018-06-07 16:28:21 +09:00
smoogipoo
279a2844f0
Actually make ManiaHitObjectComposer constructible/testable
2018-06-07 16:08:37 +09:00
smoogipoo
f715734662
Remove unnecessary csproj edit
2018-06-07 15:57:21 +09:00
smoogipoo
485026da6f
Merge remote-tracking branch 'origin/master' into mania-mask-container
...
# Conflicts:
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
2018-06-07 15:32:31 +09:00
Dan Balasescu
8d0161c2fc
Refactoring
2018-06-07 15:11:48 +09:00
Dean Herbert
f9449e841a
Improve overall visual clarity and explosion effects
2018-06-07 14:30:27 +09:00
Dean Herbert
dff4b360b7
Fix ticks not getting accent colour
2018-06-07 14:30:27 +09:00
Dean Herbert
56ea1c1d63
Adjust hold note visibility and glow composition
2018-06-07 14:30:27 +09:00
Dean Herbert
81a3a8a1a4
Add corner radius
2018-06-07 11:57:30 +09:00
Dean Herbert
dc10277d50
Thicker bar lines and new design colour
2018-06-07 11:16:26 +09:00
smoogipoo
83ff47ec80
Rewrite difficulty mod combinations
2018-06-06 16:20:17 +09:00
Dean Herbert
3567823759
Reverse order of exposed objects in HitObjectContainer
...
Closes #2740 .
2018-06-06 15:03:47 +09:00
smoogipoo
8274623ad6
Cleanup multi mod constructions
2018-06-06 14:07:50 +09:00
smoogipoo
2ccffb9ac4
Add difficulty calculation mod types
2018-06-03 10:59:56 +09:00
Dean Herbert
2f21b9c4ea
Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits
2018-05-31 12:36:37 +09:00
smoogipoo
31cbec99a1
Fix mania hold notes displaying judgements
2018-05-28 18:12:49 +09:00
smoogipoo
d850e34003
Actually cast to int
2018-05-26 09:25:16 +09:00
smoogipoo
215cc9fba7
Change all performance calculators to use int hitwindows
...
Has a pretty large (>6) effect on pp for some maps.
2018-05-25 20:07:14 +09:00
smoogipoo
765a50d007
Remove 0.5 offsets
...
Checked up against DB values + server-side build versions, and these 0.5s don't seem to exist. Brings calculations more in-line with osu!stable.
2018-05-25 20:05:53 +09:00
AlFasGD
c7dfe88ad2
Complete PR's independence
2018-05-22 09:18:02 +03:00
AlFasGD
a178c44b60
Remove snap line dependencies
2018-05-22 09:12:51 +03:00
AlFasGD
8aac1f50ee
Remove more dependencies
2018-05-22 09:12:22 +03:00
AlFasGD
2769f6c47b
Fix issues
2018-05-22 09:09:25 +03:00
AlFasGD
bbe7765a95
Add files to not require dependencies from #2534
2018-05-22 09:03:47 +03:00
AlFasGD
61a18b952f
Remove useless things
2018-05-21 23:24:10 +03:00
AlFasGD
d504a44dfb
Implement mask layering (incomplete)
2018-05-21 23:08:04 +03:00
Dean Herbert
6c00046835
Merge branch 'master' into mania-performance-calculator
2018-05-18 12:34:49 +09:00
Dean Herbert
8e784d9104
Merge branch 'master' into fix-conversion-hitwindows
2018-05-18 11:59:16 +09:00
smoogipoo
43cdbec0a3
Fix hold note hitwindow lenience
2018-05-17 13:59:04 +09:00
smoogipoo
f67d263596
Move ruleset-specific hitwindows to post-converted hitobjects
2018-05-17 13:35:15 +09:00
Dean Herbert
97e179b390
Merge branch 'master' into mania-performance-improvements
2018-05-17 12:54:04 +09:00
smoogipoo
2fc1939d65
Fix hold notes never dying
2018-05-16 19:43:01 +09:00
smoogipoo
5aadc35a25
Stably-sort difficulty hitobjects to prevent future issues
2018-05-16 14:47:50 +09:00
smoogipoo
edbb3a5a57
Rename to use new hit result namings
2018-05-16 12:44:11 +09:00
smoogipoo
de63a1b578
Remove construction of new ruleset
2018-05-16 01:43:58 +09:00
smoogipoo
ed902d9325
Cleanup
2018-05-16 01:36:28 +09:00
smoogipoo
1fdc77d579
Update with the rebalance changes
2018-05-16 01:34:07 +09:00
smoogipoo
4019683f6c
Implement osu!mania performance calculation
2018-05-16 01:24:53 +09:00
Dean Herbert
0e0cc8bb69
Merge branch 'master' into namespace-cleanup
2018-05-15 18:10:48 +09:00
smoogipoo
803200ff6a
Apply similar changes to other rulesets
2018-05-15 17:40:19 +09:00
smoogipoo
995fda9b6f
Move base classes to osu.Game.Rulesets.Difficulty namespace
2018-05-15 17:38:08 +09:00
smoogipoo
6e1d651087
Merge remote-tracking branch 'origin/master' into convert-object-hitwindows
2018-05-14 11:17:39 +09:00
smoogipoo
0cdd39b8b8
Add todo because TailNote shouldn't hardcore lenience
2018-05-11 15:32:13 +09:00
smoogipoo
faa82f17cc
Pass original hitobject HitWindows during conversion
2018-05-11 15:30:50 +09:00
smoogipoo
7eb64ab590
Remove object counts from mania/taiko/catch
2018-05-07 15:51:08 +09:00
smoogipoo
b737644208
Add mania statistics
2018-05-07 15:51:08 +09:00
smoogipoo
e20323b5f6
Trim whitespace
2018-05-07 11:23:29 +09:00
smoogipoo
4ecdea8b2e
Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer
2018-05-07 10:17:54 +09:00
smoogipoo
f3aa9269ff
Fix mania-specific beatmap conversion
2018-05-07 09:17:12 +09:00
smoogipoo
03a5df84c6
Initial rework of beatmap conversion process
2018-04-19 22:04:12 +09:00
smoogipoo
66b3b295e7
Use IBeatmap wherever possible
2018-04-19 20:44:38 +09:00
tgi74000
9b36cf2066
Review changes
2018-04-16 14:14:40 +02:00
tgi74000
b23b0a445b
Add support for replay mods
2018-04-13 15:41:35 +02:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
Dean Herbert
acbdbcc3df
Update AssemblyInfo in line with framework changes
2018-04-06 13:17:26 +09:00
Joseph Madamba
ee14ca7cc5
Merge branch 'master' into score-multiplier-edits
2018-03-31 10:43:58 -07:00
smoogipoo
bb7618eb0c
FIx mania playfield playing the wrong/duplicated sounds
...
Fixes #2266 .
2018-03-29 16:13:31 +09:00
smoogipoo
187a025d36
Make hitobjects sorted by their start times
2018-03-29 16:07:31 +09:00
Joseph Madamba
af9e3a849f
Merge branch 'master' into score-multiplier-edits
2018-03-28 20:42:35 -07:00
Dean Herbert
9aae568bbe
Tidy up csproj further
2018-03-28 15:19:56 +09:00
Dean Herbert
9667d54ecb
Add missing licence headers
2018-03-28 14:48:08 +09:00
Dean Herbert
0026b94cd3
Consolidate and move ruleset test projects
2018-03-28 14:41:25 +09:00
Dean Herbert
1a8aa87469
Make everything better
2018-03-27 18:56:54 +09:00
Dean Herbert
b290d2d039
Move NUnit includes to individual projects
2018-03-27 15:07:09 +09:00
smoogipoo
dd5bbbbd9f
Define testable projects
2018-03-26 19:11:23 +09:00
smoogipoo
5159127bce
Fix SQLite failing to initialize on test projects
2018-03-26 18:07:09 +09:00
smoogipoo
35ef9d99c6
Only compile with net461 in visual studio
2018-03-26 15:44:55 +09:00
smoogipoo
96901b6498
Add msbuild/dotnet build + launch targets
2018-03-26 10:52:54 +09:00
Joseph Madamba
78a7564acd
Score multiplier edits
2018-03-24 16:00:18 -07:00
smoogipoo
31920f1866
Fix ruleset resources not getting included in build
2018-03-25 02:12:01 +09:00
smoogipoo
d28de89e50
Add net461 target to test projects for nunit discovery
...
Nunit "by design" will not run tests for NETStandard projects (see: https://github.com/nunit/dotnet-test-nunit/issues/122#issuecomment-329531632 ).
2018-03-25 01:35:50 +09:00
smoogipoo
c29f7a4333
Merge remote-tracking branch 'origin/master' into netstandard
2018-03-24 14:49:46 +09:00
Dean Herbert
cb3d0db555
Move combo colours completely out of HitObjects
2018-03-20 15:50:12 +09:00
Dean Herbert
7e7f8ed7a2
Merge branch 'master' into drawable-composite-hit-object
2018-03-16 15:53:16 +09:00
Dean Herbert
7ed84465fb
Merge branch 'master' into mod-fixes
2018-03-16 11:27:39 +09:00
Dean Herbert
a42035f494
Make DrawableHitObject a CompositeDrawable
...
No reason for it to be a container.
2018-03-15 13:41:06 +09:00
Joseph Madamba
1eeacb7bf7
Change descriptions and special section
2018-03-14 01:05:19 -07:00
Dean Herbert
908d38279b
Merge branch 'master' into fix-mania-conversion
2018-03-14 12:27:32 +09:00
Joseph Madamba
d122aa80e4
Edit mods description, multiplier, and code
2018-03-13 20:07:03 -07:00
smoogipoo
9e09d434dd
Fix argument null exception in ManiaBeatmapConverter
2018-03-14 11:27:14 +09:00
Dean Herbert
107ad8cfff
Merge remote-tracking branch 'FreezyLemon/master' into more-skinning
2018-03-12 22:01:59 +09:00
Dean Herbert
9f644571ea
Merge branch 'master' into mania-difficulty
2018-03-12 13:31:48 +09:00
smoogipoo
fbb80edde1
Minor cleanups
2018-03-12 13:01:29 +09:00
smoogipoo
46caab6310
Reorder arithmetic operation
2018-03-12 11:56:49 +09:00
Dean Herbert
eb643b690a
Merge branch 'master' into more-skinning
2018-03-12 11:55:50 +09:00
Dan Balasescu
dc85067b8c
Merge branch 'master' into mania_mirror
2018-03-12 11:52:38 +09:00
tgi74000
a4dfeff2d7
Renamed ManiaMirrorMod to ManiaModMirror
2018-03-10 08:44:46 +01:00
tgi74000
ed20e31bbe
Removed redundant parentheses
2018-03-10 08:39:11 +01:00
Dan Balasescu
ac9de336db
Merge branch 'master' into fix-mania-conversion
2018-03-09 16:09:14 +09:00
tgi74000
1f48cfb79a
Added Mirror Mod for Mania
2018-03-08 17:35:20 +01:00
Dean Herbert
fe3ab94afb
Fix mania judgement regression
2018-03-07 19:19:56 +09:00
Dean Herbert
b62ed004f2
Remove judgements when deciding a new judgement for a HitObject
...
Generally happens when rewinding.
2018-03-07 19:14:42 +09:00
Dean Herbert
e82cadc811
Make LegacyID nullable
...
The -1 default was getting stored to the database.
2018-03-06 17:40:14 +09:00
Poyo
e187c6453d
Added mania-difficulty mod support
2018-03-05 18:19:06 -08:00
smoogipoo
02265ad686
Enable mania's basic conversion testcase
2018-03-05 20:20:46 +09:00
smoogipoo
27a510aad8
The endtime-object pattern is never checked against
2018-03-05 20:20:42 +09:00
smoogipoo
4be478d38e
Fix LowProbability conversions happening during kiai time
2018-03-05 20:20:22 +09:00
smoogipoo
356d353cea
Fix ConversionDifficulty never actually being calculated
2018-03-05 20:20:18 +09:00
smoogipoo
675c7d0dfd
Invert Max/Mins
2018-03-05 20:20:14 +09:00
smoogipoo
dfeee79a24
Fix incorrect probability
2018-03-05 20:20:10 +09:00
smoogipoo
2bd58e5421
Re-order RNG call to match osu-stable
2018-03-05 20:20:06 +09:00
smoogipoo
4da30c6940
Fix missing conversion case
2018-03-05 20:20:00 +09:00
Dean Herbert
0e928429d4
Merge branch 'master' into ruleset-replayframes
2018-03-04 01:57:43 +09:00
smoogipoo
a2c239d5e3
Rename to IBeatmapConverter, move to separate file
2018-03-02 20:19:47 +09:00
smoogipoo
71755f5363
Prettyfy some JSON
2018-03-02 20:12:29 +09:00
smoogipoo
820a852caf
Remove unnecessary .osu properties
2018-03-02 18:37:38 +09:00
smoogipoo
cdca7371a3
Replace testcases with a basic test suite
2018-03-02 18:20:33 +09:00
smoogipoo
1f21ccffb0
Add lenience to start times
2018-03-02 18:20:12 +09:00
Dan Balasescu
4aff659272
Merge branch 'master' into beatmap-conversion-testcases
2018-03-02 16:04:32 +09:00
smoogipoo
3d5fefae8c
Add TestFixtureAttribute to all tests
2018-03-02 15:34:31 +09:00
smoogipoo
6fff6da751
Ignore broken testcases
2018-03-02 14:01:34 +09:00
smoogipoo
0145ef5277
Fix mania using the wrong validation data
2018-03-02 13:13:01 +09:00
smoogipoo
573d6d1b5f
Allow multiple mappings to be generated for a single hitobject
2018-03-02 13:13:01 +09:00
smoogipoo
9d035fc5d0
Add a mania beatmap conversion testcase
2018-03-02 13:13:01 +09:00
Dean Herbert
c54c1699bf
Merge branch 'master' into ruleset-replayframes
2018-03-01 22:26:16 +09:00
smoogipoo
8cfb119383
Fix FastRandom using uint instead of int for NextDouble()
2018-03-01 16:17:01 +09:00
smoogipoo
c783a19e41
Fix mania frame conversion not working at all
2018-03-01 02:28:15 +09:00
smoogipoo
195b6642e6
Reimplement important frames
2018-03-01 02:28:15 +09:00
smoogipoo
cf42d5bbd5
Remove mostly-unused Score parameter
2018-03-01 02:28:14 +09:00
smoogipoo
c9c65cab53
CreateReplayFrame -> CreateConvertibleReplayFrame
2018-03-01 02:28:14 +09:00
smoogipoo
a7e6c19e61
Remove todo (probably not a consideration going forward)
2018-03-01 02:28:14 +09:00
smoogipoo
222ae70062
Populate rulesets with their replay frames
2018-03-01 02:28:14 +09:00
smoogipoo
a02eaf0e94
Use StageDefinition to determine special column in ManiaReplayFrame
2018-03-01 02:28:14 +09:00
smoogipoo
b8b869e8b7
Remove now unused property
2018-03-01 02:28:14 +09:00
smoogipoo
a3c7755ade
Implement a conversion process for ReplayFrames
2018-03-01 02:28:14 +09:00
Poyo
96f416fef3
Update code style
...
Sorry, bot overlords.
2018-02-26 00:18:54 -08:00
Poyo
31cf00e3b8
Implement mania star difficulty calculation
2018-02-25 23:52:38 -08:00
smoogipoo
5faec5c2f1
Add a separate property to control playfield area
2018-02-21 20:54:33 +09:00
smoogipoo
cd2c9a9de6
Adjust xmldoc and rename to GetAspectAdjustedSize
2018-02-19 17:04:18 +09:00
Dan Balasescu
9f7736fab3
Merge branch 'master' into restore-ruleset-tests
2018-02-14 22:48:29 +09:00
smoogipoo
b500b76407
Merge branch 'master' into update-branch
2018-02-08 23:35:48 +09:00
smoogipoo
46284c61ae
Return HitResult.None instead of null
2018-02-08 14:25:59 +09:00
smoogipoo
802aaefe35
Give rulesets a way to disable/enable perfect/ok hit results
2018-02-08 13:54:08 +09:00
smoogipoo
beaecbafbd
Merge branch 'master' into unified-hitwindows
2018-02-08 13:22:44 +09:00
smoogipoo
6810948a6f
Fix mania testcase
2018-02-08 13:16:53 +09:00
smoogipoo
ccc948a0b9
Update framework (testing)
2018-02-08 12:45:51 +09:00
Dean Herbert
dfc344b47a
Update OpenTK version
2018-02-06 13:47:54 +09:00
Dean Herbert
6b35ef7063
Update OpenTK version
2018-02-05 16:13:30 +09:00
smoogipoo
15fe1a7966
Remove mania's custom storage of HitWindows
2018-02-02 18:53:18 +09:00
smoogipoo
acf20c079c
General improvements around usage of HitWindows for mania
2018-02-02 18:47:54 +09:00
smoogipoo
a0c1662fb7
Move mania's HitWindows to osu.Game
2018-02-02 17:52:55 +09:00
FreezyLemon
8f0ab2040f
Add Jetbrains.Annotations NuGet package
2018-01-26 12:46:28 +01:00
smoogipoo
5742e61e68
Merge remote-tracking branch 'origin/master' into ruleset-configs
2018-01-26 15:39:09 +09:00
Dean Herbert
03154dbc63
Fix incorrect initial migration
...
Also adds variant to settings
2018-01-25 23:41:03 +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
smoogipoo
b77f08941c
Make mania play the next note's sounds if no note is hit
...
Fixes #1911 .
This follows what osu!stable does, which is rather unfortunate, since it just plays _every_ sound for the note :|.
2018-01-24 20:05:37 +09:00
Dean Herbert
5a00ae36d1
Add database-based configuration for rulesets
2018-01-24 17:45:28 +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
d37844c068
Clean up off-by-one offsets from repeat-related properties
2018-01-23 13:37:25 +09:00
Dan Balasescu
9b471dea33
Back to max 10 special keys for now, change xmldoc to normal comment
2018-01-23 10:51:01 +09:00
Dan Balasescu
2bc67629b8
Improve xmldoc + remove explicit Special2 value
...
Special2 value is implicit at Special1 + 1 (2).
2018-01-23 10:03:34 +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
351be4308f
Oops, forgot to commit OnJudgement change
2018-01-22 16:12:35 +09:00
smoogipoo
90d8ee8d36
Fix stage background being too transparent
...
This is the original colour for the background. Not sure why this was changed.
2018-01-22 16:12:15 +09:00
smoogipoo
3d36fd3676
Update xmldoc to be more descriptive of single/dual stages
2018-01-22 16:11:26 +09:00
smoogipoo
0ef6384de0
Fix hitexplosions not working in the testcase
2018-01-22 16:11:06 +09:00
smoogipoo
c1331cef1b
Disallow DualStages for non-converted beatmaps
2018-01-22 15:52:54 +09:00
smoogipoo
ba58b25f01
Fix showing too many keybindings
2018-01-22 15:47:31 +09:00
smoogipoo
1350b68f15
DualStages always doubles the column count in lazer
2018-01-22 15:18:39 +09:00
smoogipoo
eede8333ba
getVariantType -> getPlayfieldType
2018-01-22 15:18:11 +09:00
smoogipoo
17d75b349d
Dual stages is not ranked ಠ_ಠ
2018-01-22 15:11:45 +09:00
smoogipoo
77c4da5f0f
KeyCoop -> DualStages
2018-01-22 15:11:15 +09:00
smoogipoo
583aa9922f
IKeyBindingMod -> IPlayfieldTypeMod
2018-01-22 15:07:14 +09:00
smoogipoo
65a2e09593
Privatise VariantMappingGenerator to ManiaRuleset
2018-01-22 15:03:05 +09:00
smoogipoo
2674859b54
ManiaKeyBindingVariantType -> PlayfieldType
2018-01-22 14:59:17 +09:00
smoogipoo
286b1bb81f
Solo -> Single, Coop -> Dual
2018-01-22 14:57:25 +09:00
smoogipoo
3b47c0fea0
Remove versus-mode variant
2018-01-22 14:54:47 +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
smoogipoo
89f4bfa7b5
Track mania scroll speed
2018-01-18 17:00:41 +09:00
smoogipoo
7910b47868
Move ConfigManager registration/dependency injection to RulesetContainer
2018-01-18 17:00:23 +09:00
ANDY840119-PC\andy840119
6c67f96fdb
fix ci error
2018-01-18 02:01:01 +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
d96234bf40
Enforce that there's only one configmanager per ruleset
2018-01-17 21:08:23 +09:00
smoogipoo
9f4ebad6e3
Add mania config manager
2018-01-17 20:21:25 +09:00
smoogipoo
c309cc9454
Privatise OnJudgements as much as possible
2018-01-16 15:37:32 +09:00
Dean Herbert
976f7cec39
Merge branch 'master' into playfield-judgements
2018-01-16 15:26:13 +09:00
TocoToucan
3c11978cfa
Use local functions
2018-01-15 21:42:17 +03: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
8a7892b66a
Make variant keybindings work
2018-01-15 19:29:51 +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
smoogipoo
dd67070b6f
ManiaAction.Special -> ManiaAction.Special1
2018-01-15 17:58:04 +09:00
smoogipoo
351afc350e
Implement co-op keybindings
2018-01-15 17:43:45 +09:00
smoogipoo
0d79d16692
Cleanup testcase
2018-01-15 15:52:07 +09:00
smoogipoo
dbcabfb6ac
Remove ManiaAction.Specia2
2018-01-15 15:50:57 +09:00
smoogipoo
1c74e56bab
Increase the point at which normal keys start in ManiaAction
2018-01-15 15:50:43 +09:00
smoogipoo
d2b1e27527
Cleanup implementation of coop key mod
...
This is how I intended the functionality to be implemented.
2018-01-15 15:49:03 +09:00
smoogipoo
9f98983550
Remove gravity mod
...
Not sure how this made it back in here.
2018-01-15 15:36:36 +09:00
smoogipoo
bfdfb52666
Fix a few usages of AllJudged possibly not being correct
2018-01-15 15:28:08 +09:00
ANDY840119-PC\andy840119
bbb741245e
fix CI error
2018-01-14 21:51:07 +09:00
ANDY840119-PC\andy840119
999386497a
implement co-op mod
2018-01-14 21:35:35 +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
Aergwyn
ae1adfd2f2
remove unnecessary empty lines
...
codefactor.io \(o.o)/
also one unnecessary semicolon
2018-01-12 19:30:34 +01:00
Dean Herbert
354d781002
Merge remote-tracking branch 'upstream/master' into fix-mod-implementation-check
2018-01-12 17:49:31 +09:00
smoogipoo
cae93a1d1f
Add comment to fade override of holdnote tail
2018-01-12 17:09:39 +09:00
smoogipoo
03824eccc8
Block fadeout on holdnote heads
2018-01-12 17:09:21 +09:00
Dean Herbert
057efa24c7
Move a few interfaces to base classes
2018-01-12 14:26:09 +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
9d00e5bb7d
Make ScrollingHitObjectContainer handle nested hitobjects
2018-01-11 15:08:30 +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
6255aaab68
Per-hitobject lifetime management
2018-01-10 19:17:43 +09:00
為什麼
fb857c5e37
Merge branch 'master' into master
2018-01-10 18:48:00 +09:00
smoogipoo
f71d086a41
Fix post-merge issues
2018-01-10 18:08:43 +09:00
smoogipoo
86b5591583
Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite
2018-01-10 18:02:49 +09:00
Dean Herbert
58626e3b30
Allow rulesets to create their own instantiation info
2018-01-10 17:04:07 +09:00
ANDY840119-PC\andy840119
4060583b10
Merge branch 'master' of https://github.com/ppy/osu
...
# Conflicts:
# osu.Game.Rulesets.Mania/Mods/ManiaModGravity.cs
2018-01-09 22:09:25 +09:00
Dean Herbert
b8bb0a52e3
Move mod implementations to individual files
2018-01-09 14:08:18 +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
smoogipoo
2d345b2f80
Fix mania hold note tick positioning
2018-01-07 11:43:31 +09:00
FreezyLemon
47f5b23dcf
fix child size == 0 exception
2018-01-07 00:53:44 +01:00
ANDY840119-PC\andy840119
ca7cd40fba
1. update from ppy master
...
2. update header
2018-01-06 11:21:10 +09:00
為什麼
98929952e3
Merge branch 'master' into master
2018-01-06 11:17:15 +09:00
ANDY840119-PC\andy840119
50aaf571fb
miss
2018-01-06 11:08:49 +09:00
ANDY840119-PC\andy840119
a55ac899a8
fix Empty argument list is redundant
2018-01-06 11:08:04 +09:00
ANDY840119-PC\andy840119
356c7ad528
Merge branch 'mania-rc-cleanup' of https://github.com/smoogipoo/osu into mania_fix
...
# Conflicts:
# osu-framework
2018-01-05 23:29:33 +09:00
Dean Herbert
37d393bca0
Update licence headers
2018-01-05 20:21:19 +09:00
smoogipoo
1276e2c71a
Merge branch 'master' into scrolling-hitobjects-rewrite
2018-01-05 14:58:57 +09:00
Dean Herbert
b2e723d288
Merge branch 'master' into mania-keymods
2018-01-05 13:55:20 +09:00
smoogipoo
36e9232472
Merge master into netstandard
2018-01-05 00:42:48 +09:00
smoogipoo
ce94c825d1
Fix length of hold notes
2018-01-04 22:05:38 +09:00
smoogipoo
e0e84ff370
Fix mania playfield scrolling hitobjects in the wrong direction
2018-01-04 22:05:20 +09:00
smoogipoo
f569d54958
Local circlesize/od variables
2018-01-04 19:52:29 +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
409664e4dc
White space needs to be trimmed
2018-01-03 23:50:52 +09:00
ANDY840119-PC\andy840119
aadafae8cb
1. fix TestCaseManiaHitObjects broken
...
2. add (4+4) (2+4+2) (1+8+1) column stages step in TestCaseManiaPlayfield
2018-01-03 23:47:05 +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
ANDY840119-PC\andy840119
ee13df94fc
Merge branch 'mania-rc-cleanup' of https://github.com/smoogipoo/osu
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-01-03 22:02:50 +09:00
smoogipoo
333e1867ab
Implement osu!mania keymods
...
ScoreMultiplier not currently working - that's a more involved change that requires the aforementioned "BeatmapAttributes" changes.
2018-01-03 21:27:32 +09:00
smoogipoo
a4d05e5102
Implement interface on ManiaKeyMod for now
2018-01-03 21:26:36 +09:00
smoogipoo
b68daaeb4b
Group -> Stage
2018-01-03 19:13:42 +09:00
smoogipoo
bd171926d6
Remove AvailableColumns from ManiaRulesetContainer
...
Also restructures with the addition of a ManiaBeatmap which holds definitions for "groups" of columns. At the moment these are empty save for a "Column" property, but can be expanded in the future, maybe.
2018-01-03 18:44:25 +09:00
Dean Herbert
c0dd812a4c
Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods
2018-01-02 15:33:08 +09:00
Aergwyn
ccb69d16d9
move HitResult in Scoring namespace to replace HitCount
2017-12-30 21:23:18 +01:00
Dean Herbert
28cd72a12b
Add note about mania xKey mods for future implementation
2017-12-31 04:27:35 +09:00
為什麼
3f318fde2f
Merge branch 'master' into master
2017-12-29 22:48:07 +09:00
Dean Herbert
2ca10b28c6
Use a non-broken opentk library
2017-12-29 15:42:51 +09:00
ANDY840119-PC\andy840119
7b94a710e3
Appveyor Chan, Please
2017-12-28 23:55:06 +09:00
ANDY840119-PC\andy840119
9faa5fb199
pray
2017-12-28 23:40:02 +09:00
ANDY840119-PC\andy840119
a322c15bbd
after resharper : (
...
.
裝上Resharper,從此VS的速度一片黑暗
2017-12-28 23:15:12 +09:00
ANDY840119-PC\andy840119
cfc4c39255
Fixed the alert from AppVeyor.
...
maybe.
2017-12-28 22:57:41 +09:00
ANDY840119-PC\andy840119
28da60cc38
https://github.com/ppy/osu/issues/716
...
1. split the playfield columns by ManiaModKeyCoop
2. can chaneg the key number by ManiaKeyMod
2017-12-28 22:40:23 +09:00
smoogipoo
7a793eaded
Merge master into netstandard
2017-12-27 20:48:53 +09:00
smoogipoo
5b529511ec
Update OpenTK nuget package
...
Fixes the recent AppVeyor errors
2017-12-27 13:18:34 +09:00
smoogipoo
d288d8a51f
Remove SampleInfoList
2017-12-25 15:40:01 +09:00
Dean Herbert
e7c85d38a8
Move list initialisation to pattern generation code
2017-12-23 19:17:05 +09:00
Dean Herbert
aeafa5645a
Make Samples null by default and prepopulate in mania
2017-12-23 18:06:46 +09:00
smoogipoo
6a29f6020a
Make HitObjects construct nested hit objects
2017-12-22 21:42:54 +09:00
smoogipoo
ac1d27e925
Fix possible nullref exceptions
2017-12-21 23:02:46 +09:00
smoogipoo
d80079a73a
Merge remote-tracking branch 'origin/master' into beatmap-serialization
2017-12-21 20:15:01 +09:00
smoogipoo
a3fcc0b60c
Back to using SortedLists
2017-12-21 19:40:41 +09:00
smoogipoo
cb7e192aff
Determine SampleInfo defaults in DrawableHitObject
2017-12-21 16:02:33 +09:00
smoogipoo
c99ea32574
Merge branch 'master' into beatmap-serialization
2017-12-21 13:39:39 +09:00
Dean Herbert
020d272636
Make all TestCases public
2017-12-20 21:51:00 +09:00
Dean Herbert
08727266e7
Merge branch 'master' into add-ruleset-shortname
2017-12-11 15:41:11 +09:00
FreezyLemon
4a723f7382
Added the "Service Include" tag that is used by Visual Studio's test explorer to the .csproj files
2017-12-08 11:05:00 +01:00
Dean Herbert
679134c030
Add ShortName to rulesets
2017-12-08 18:55:25 +09:00
smoogipoo
f9e34dfa3d
Assume that control points are already sequentially-ordered
...
Fixes up deserializing.
2017-12-06 16:24:09 +09:00
smoogipoo
b584178e85
Make Beatmap ISerializable and add more JsonIgnores
2017-12-06 00:37:37 +09:00
smoogipoo
a30270658d
Merge remote-tracking branch 'origin/master' into netstandard
2017-12-01 18:50:28 +09:00
smoogipoo
36be171c29
Fix up/clean up csprojs for C#7 support
2017-11-30 02:06:03 +09:00
smoogipoo
a0c3349935
Add LangVer.props and osu.Game.props for common csproj properties
2017-11-30 00:45:37 +09:00
smoogipoo
267bb75458
Merge remote-tracking branch 'Aergwyn/master' into netstandard
2017-11-29 23:45:29 +09:00
Dean Herbert
3e01a0dda5
Merge branch 'master' into mania-auto-generation-fixes
2017-11-29 19:11:36 +09:00
smoogipoo
d69fa0966f
Generate ManiaReplayFrame instead of ReplayFrame
2017-11-29 18:42:54 +09:00
smoogipoo
dfd035d07b
Merge remote-tracking branch 'origin/master' into mania-auto-generation-fixes
2017-11-29 18:42:17 +09:00
Dean Herbert
93d7cd5a6d
Merge branch 'master' into performance-calculator
2017-11-29 18:37:07 +09:00
Dan Balasescu
7cbca37e2d
Remove redundant cast
2017-11-29 18:18:36 +09:00
smoogipoo
6fd550dc91
Simplify/sanitize construction of ManiaReplayFrame
2017-11-29 15:47:10 +09:00
smoogipoo
1136db1556
Fix mania replays not defining important frames
...
Resolves https://github.com/ppy/osu/issues/1495 .
2017-11-29 14:20:15 +09:00
smoogipoo
7db7fb91dd
Ignore ruleset testcases from CI
2017-11-28 21:45:24 +09:00
smoogipoo
a9cc156d7a
Merge remote-tracking branch 'origin/master' into performance-calculator
2017-11-28 21:38:26 +09:00
smoogipoo
00f9f97850
Fix compile errors (rider didn't warn me about these)
2017-11-28 19:13:10 +09:00
smoogipoo
375f2710d4
Rename file
2017-11-28 19:09:17 +09:00
smoogipoo
cc9e06e161
Remove unused elements
2017-11-28 19:07:10 +09:00
smoogipoo
eaf2b1d94d
Remove line that shouldn't have been added yet
2017-11-28 19:06:46 +09:00
smoogipoo
567e378bbb
CI fixes
2017-11-28 19:02:39 +09:00
smoogipoo
f8c296877b
Add testcase for mania beatmap conversion (currently ignored)
2017-11-28 18:59:20 +09:00
smoogipoo
b97cab4f29
Make ManiaFramedReplayInputHandler properly account for special keys
...
These are interleaved into the playfield, so we have to use the playfield's columns' actions.
2017-11-28 15:27:20 +09:00
smoogipoo
84702211ec
Rewrite mania auto generator to properly account for overlapping objects
2017-11-28 15:17:02 +09:00
smoogipoo
2c53be7853
Fix possible invalid cast when generating mania patterns
2017-11-27 18:39:13 +09:00
Dean Herbert
288c21dfec
Move TestCase descriptions to attributes
...
Depends on https://github.com/ppy/osu-framework/pull/1186 .
2017-11-23 16:09:32 +09:00
smoogipoo
f9ad4b6acb
Make categoryDifficulties return doubles to improve decimal accuracy
2017-11-21 19:55:09 +09:00
smoogipoo
b3bf6e7bee
Merge master into netstandard
2017-11-21 16:39:21 +09:00
smoogipoo
756f6f2d16
Remove net461 targets
2017-11-20 10:10:28 +09:00
smoogipoo
067c018422
Cleanups
2017-11-19 17:31:35 +09:00
smoogipoo
d2ab0621f3
Make osu.Game + rulesets compile with netstandard
2017-11-19 13:46:51 +09:00
smoogipoo
bf44b3d0ef
Cleanups
2017-11-17 16:54:50 +09:00
smoogipoo
38fe95d94a
Add basic display for pp in TestCasePerformancePoints
2017-11-17 14:37:19 +09:00
smoogipoo
95fd323c6b
Fix ManiaDifficultyCalculator possibly failing due to nullref
2017-11-17 14:37:06 +09:00
smoogipoo
ac6213d1fa
CI fixes
2017-11-17 14:26:33 +09:00
smoogipoo
18f2e92a48
Rework mod applications to hitobject/rulesetcontainer for DifficultyCalculator
2017-11-17 12:36:13 +09:00
smoogipoo
62155e6dd5
Make DifficultyCalculator support mod applications
...
Fixes https://github.com/ppy/osu/issues/476 .
2017-11-17 12:36:07 +09:00
smoogipoo
f461f03b08
Make osu! compile with framework changes
2017-11-16 14:51:31 +09:00
smoogipoo
15f69dff81
Make mania hit explosions not stick around when rewinding
...
Fixes #1461 .
2017-11-04 00:57:17 +09:00
smoogipoo
fe00ac7e41
Make DrawableHitObject/ScoreProcessor support rewinding
2017-11-02 21:21:07 +09:00
Dean Herbert
bbc5c05055
Disable ruleset-level tests for now
2017-10-23 21:25:54 +09:00
Dean Herbert
36af0dc809
Update app config for rulesets
2017-10-19 14:59:11 +09:00
Dean Herbert
5d5ea5fb2e
Fix all remaining db structure issues
2017-10-19 14:05:11 +09:00
Dean Herbert
179542daf1
Standardise AssemblyInfos
2017-10-14 15:02:20 +09:00
Dean Herbert
c5046f6b3c
Add back osu.Desktop project
...
While it was nice having less projects to deal with, it meant hacks to get around circular dependencies between rulesets and osu.Game. For now, let's just restore the osu.Desktop project and call it a day.
This allows for the project to build again with default visual studio settings.
2017-10-14 14:33:05 +09:00
Dean Herbert
b306eaca6e
Move mania tests to correct namespace
2017-10-10 16:50:46 +09:00
Dean Herbert
e0911f014e
Fix ruleset target path for release builds
2017-09-19 22:50:36 +09:00
Dean Herbert
99b512cce5
Output ruleset assemblies to the game folder rather than adding special logic
2017-09-19 19:27:14 +09:00
Dean Herbert
1f20c5eb69
Optimise project references
2017-09-19 16:07:00 +09:00
Dean Herbert
8fa76557db
Avoid unnecessary dll copies
2017-09-19 16:06:59 +09:00
Dean Herbert
6db705a3a8
Update relative paths
2017-09-19 16:06:58 +09:00
Dean Herbert
6d3d485565
And then everything became one
2017-09-19 16:06:58 +09:00
Tom
a42fb4af2a
Add icon for random mod
2017-09-14 12:04:05 +02:00
smoogipooo
ae3e118584
Dummy commit to test CI
2017-09-14 09:32:10 +09:00
Tom
886ad7496d
Implement random mod for osu!mania
2017-09-13 17:35:05 +02:00
Dean Herbert
b78c516b74
Merge branch 'master' into scoring-revamp
2017-09-13 20:47:14 +09:00
Dean Herbert
fb7740a3ab
Update all dependencies in line with framework
2017-09-13 20:25:40 +09:00
smoogipooo
5e32d95ad2
Remove Ruleset's CreateScoreProcessor method
2017-09-13 16:37:05 +09:00
smoogipooo
093d82ac45
Set depths from playfield add methods instead of DrawableHitObject
2017-09-13 16:17:01 +09:00
smoogipooo
e146bcacf1
Make BasePortion and ComboPortion constants
2017-09-13 16:13:27 +09:00
smoogipooo
05ac23f99a
Remove AffectsAccuracy for now
2017-09-13 15:44:03 +09:00
smoogipooo
ba3e44cd71
Simplify standardized scoring to BasePortion (raw scoring) + ComboPortion (highest combo)
2017-09-13 15:17:32 +09:00
smoogipooo
12641edb4d
Fix incorrect mania hold note tick judgements
2017-09-12 23:36:59 +09:00
smoogipooo
756d7527da
Remove NumericAccuracyResult from ManiaJudgement
2017-09-12 22:33:39 +09:00
smoogipooo
b5f48c2368
Add storeResults as a parameter to Reset
...
Whether to store the current state of the ScoreProcessor for future use.
2017-09-12 22:27:27 +09:00
smoogipooo
d0774c7bc6
ComputeTargets -> SimulateAutoplay + improve xmldoc
2017-09-12 21:16:47 +09:00
smoogipooo
3e3618d724
More cleanups
2017-09-12 21:12:57 +09:00
smoogipooo
abab2a4878
Revamp score processing to once more unify scoring methods
2017-09-12 21:05:50 +09:00
smoogipooo
0b94939474
Make Accuracy = 1, Health = 1 the default for ScoreProcessor
2017-09-12 20:53:26 +09:00
smoogipooo
3af8345068
Add AffectsAccuracy to Judgement
2017-09-12 19:39:44 +09:00
Dan Balasescu
ee8ec31c6e
Merge branch 'master' into judgement-revamp
2017-09-12 18:57:37 +09:00
Dean Herbert
86de4fa2e2
Apply CI fixes
2017-09-12 18:36:19 +09:00
Dean Herbert
b21c080121
Make mania readable again
2017-09-12 18:22:02 +09:00
Dean Herbert
f32d444d68
Remove generics from Playfield (fixes catch)
2017-09-12 18:19:28 +09:00
Dean Herbert
1194e46ef1
Merge remote-tracking branch 'upstream/master' into judgement-revamp
2017-09-12 17:46:21 +09:00
Dean Herbert
160ad1924f
Remove unneeded reference
2017-09-12 17:01:40 +09:00
smoogipooo
6a815d343c
Remove unneeded class.
2017-09-12 16:58:06 +09:00
Dan Balasescu
3be9d3c747
Merge branch 'master' into mania-autoplay
2017-09-12 16:44:05 +09:00
smoogipooo
7ad982b540
Fix ordering of license header.
2017-09-12 16:21:32 +09:00
smoogipooo
a22dd80b23
Expire HitExplosions.
2017-09-12 16:20:15 +09:00
smoogipooo
af4cc7aada
Accuracy starts at 100% for mania.
2017-09-12 16:15:04 +09:00
smoogipooo
a7b93822d7
Add initial frame
2017-09-12 16:14:52 +09:00
smoogipooo
a1baefe20e
Add 20ms delay to release frames.
2017-09-12 16:09:53 +09:00
smoogipooo
8737a1b1a5
Implement osu!mania auto replay generation.
2017-09-12 15:52:32 +09:00
smoogipooo
78764082dc
Remove taiko project reference from mania project.
2017-09-12 15:52:02 +09:00
smoogipooo
585e2399bf
Add license headers.
2017-09-12 12:02:56 +09:00
smoogipooo
57ee97e27d
Add lane glows.
2017-09-12 11:39:34 +09:00
smoogipooo
0765027cb5
Move note glow to a separate class + make it match the design a bit more.
2017-09-12 11:14:16 +09:00
smoogipooo
3c98bc065f
Fix osu!mania note masking resulting in miss judgements not occurring.
2017-09-12 09:48:17 +09:00
Dean Herbert
d66fb307dc
Fix wrong licence header
2017-09-11 19:14:37 +09:00
Dean Herbert
cf8912b30d
Merge branch 'master' into mania-judgement-text
2017-09-11 19:04:22 +09:00
smoogipooo
df0a31bf2a
Add judgement text displays to osu!mania
2017-09-11 17:56:02 +09:00
Dean Herbert
7b92bbfa86
Merge branch 'master' into mania-hit-explosions
2017-09-11 17:34:14 +09:00
smoogipooo
54aff432fe
Fix CI error
2017-09-11 15:43:23 +09:00
Dan Balasescu
6ecd530d7b
Add missing license header
2017-09-11 15:24:28 +09:00
smoogipooo
f3c6f6f959
Merge branch 'blending-equations' into mania-holdnote-niceness
2017-09-11 15:09:01 +09:00
smoogipooo
de7d50d384
Better variable + comment naming
2017-09-11 15:08:51 +09:00
smoogipooo
4683319156
Merge remote-tracking branch 'origin/master' into mania-hit-explosions
2017-09-11 14:48:40 +09:00
Dean Herbert
b01233eddc
Fix CI issues
2017-09-11 14:48:01 +09:00
smoogipooo
e8efdcf188
Make tick explosions white and lower scale.
2017-09-11 14:37:34 +09:00
Dean Herbert
5ce76d8023
Merge remote-tracking branch 'upstream/master' into judgement-revamp
2017-09-11 14:36:51 +09:00
smoogipooo
2c3131d391
Remove green coloration when hit.
2017-09-11 13:56:10 +09:00
smoogipooo
3026675f35
Add explosions.
2017-09-11 13:44:39 +09:00
smoogipooo
10f0d1f20d
Pass down OnJudgement to columns.
2017-09-11 12:57:10 +09:00
Dean Herbert
7170fbd087
Target .NET 4.6.1
2017-09-11 12:39:00 +09:00
smoogipooo
42dc4d9b1c
Rework mania playfield to be more sane with masking/nesting.
2017-09-11 10:46:54 +09:00
smoogipooo
2f72dff779
Update with framework changes.
2017-09-11 08:59:56 +09:00
smoogipooo
2086ed209d
Fix hold note tick input.
2017-09-11 04:51:44 +09:00
smoogipooo
9cd3af11d5
Fix hold note tick position + lifetime.
2017-09-11 04:45:10 +09:00
smoogipooo
79a9612243
Remove now unnecessary comment.
2017-09-11 04:39:04 +09:00
smoogipooo
8bb8999820
More TestCaseManiaHitObjects fixes.
2017-09-11 04:34:30 +09:00
smoogipooo
3b5e847a31
Better updateGlow methods.
2017-09-11 04:29:32 +09:00
smoogipooo
590a34dc28
Add glow to DrawableHoldNote
2017-09-11 04:22:17 +09:00
smoogipooo
73d77637ef
Add glow to DrawableNote
2017-09-11 04:22:05 +09:00
smoogipooo
8797382700
Update body styling of hold notes
2017-09-11 04:21:43 +09:00
MrTheMake
a7f874e5b6
Merge branch 'master' into leaderboard-scores
2017-09-07 18:25:33 +02:00
smoogipooo
b085208d24
Remove unused code
2017-09-07 16:15:33 +09:00
smoogipooo
ef9b87e8c7
Make column lights not increase in brightness when successfully pressed
2017-09-07 16:15:25 +09:00
smoogipooo
0cc443e618
Remove all generic judgements.
2017-09-06 18:05:51 +09:00
smoogipooo
ac8ec31b61
Make judgements able to be "added" plus make everything compile and run.
2017-09-06 17:02:13 +09:00
Dean Herbert
84c22df3f5
Combine Judgement.HitResults into one.
2017-09-06 17:01:48 +09:00
smoogipooo
115e5c95af
Make ScrollingPlayfield.Reversed protected; make ManiaPlayfield 'invertible'.
2017-08-23 20:50:03 +09:00
Dean Herbert
bdd0a51c6e
Fix left keys setting defaults in incorrect order
2017-08-23 16:10:10 +09:00
smoogipooo
4395ea3850
Add applied suggestions.
2017-08-23 15:37:22 +09:00
smoogipooo
68e7cf854f
Add variant names.
2017-08-23 14:19:14 +09:00
smoogipooo
d8dfcc614a
Make mania work with key bindings
2017-08-23 13:42:16 +09:00
smoogipooo
0e41fc8842
Add mania bindings.
2017-08-23 12:49:50 +09:00
smoogipooo
2f2abf122b
Add exceptions galore.
2017-08-22 16:46:12 +09:00
smoogipooo
e337fbcf4f
Make availableColumns into a ctor argument.
2017-08-22 16:22:40 +09:00
smoogipooo
909cae5861
CI fixes.
2017-08-22 14:21:28 +09:00
smoogipooo
68c7226d12
Fix cherry pick issues.
2017-08-22 14:18:17 +09:00
smoogipooo
9a7c9e9af0
Disable reversing for now - this needs to be re-implemented in a later PR.
2017-08-22 14:17:57 +09:00
smoogipooo
cd3c825bd2
Fix mania playfield not working.
2017-08-22 14:07:46 +09:00
smoogipooo
88151eff3f
Fix dofficulty calculators not working and make mania set the correct key count for non-mania specific maps.
2017-08-22 14:07:39 +09:00
smoogipooo
4eec59f669
Only set the number of availableColumns once, at ManiaRulesetContainer level.
...
# Conflicts:
# osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
# osu.Game/Rulesets/UI/RulesetContainer.cs
2017-08-22 14:07:37 +09:00
Dean Herbert
ea450fecf5
Merge branch 'master' into action-key-counter
2017-08-21 16:25:44 +09:00
Dean Herbert
16e96888ab
Update KeyCounterCollection to support action-based buttons
2017-08-21 12:39:22 +09:00
smoogipooo
6a7b410bc3
Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147
2017-08-21 11:58:54 +09:00
MrTheMake
e54f659916
Suggested changes
2017-08-13 22:37:39 +02:00
MrTheMake
81289db33b
CI fix, fixed nullref and removed abstraction of GetAutoplayMod
2017-08-13 20:12:01 +02:00
MrTheMake
d9c26f98c7
Suggested changes
2017-08-13 19:54:07 +02:00
MrTheMake
4c2d7bf343
Parse the mods of a leaderboard's score
2017-08-13 17:41:13 +02:00
Dean Herbert
723e27353c
HitRenderer -> RulesetContainer
2017-08-09 13:28:29 +09:00
Dean Herbert
7c0e7ebcd0
Give HitRenderer a reference to Ruleset
...
Used to get correct bindings for a mode (ActionMappingInputManager).
2017-08-09 13:05:52 +09:00
Dean Herbert
da5f2fc6af
Merge remote-tracking branch 'origin/catch-catcher' into catch
2017-08-09 09:28:50 +09:00
Dan Balasescu
21d44b1e99
Remove correct duplicate code.
...
Already present on line 51.
2017-08-09 06:24:08 +09:00
John Neijzen
9e17549d7f
Update HitObjectPatternGenerator.cs
2017-08-08 22:56:27 +08:00
smoogipooo
c5ce86b9f3
Add reversing capability to ScrollingPlayfield.
2017-08-08 12:59:50 +09:00
smoogipooo
12f9793fec
Fix mania bar lines not working.
2017-08-07 17:46:22 +09:00
smoogipooo
f3c05fe232
CI fixes.
2017-08-07 17:34:57 +09:00
smoogipooo
933740664c
SpeedAdjustedHitRenderer -> ScrollingHitRenderer for consistent naming.
2017-08-07 16:43:54 +09:00
smoogipooo
a3efca9c35
Reduce implementation overhead in actually positioning hitobjects and making them scroll.
2017-08-07 16:02:38 +09:00
smoogipooo
c6447e40f9
Reduce implementation overhead for nested playfields (e.g. playfield + columns).
2017-08-07 14:56:26 +09:00
smoogipooo
b1d25ed388
Implement ScrollingPlayfield, now containing ScrollingHitObjectContainer (prev. SpeedAdjustmentCollection).
...
Also removing a lot of mania code relating to gravity mod for now.
2017-08-04 23:07:08 +09:00
smoogipooo
54503eef71
Rename *ScrollingDrawableTimingSection -> *ScrollingContainer, move LinearScrollingContainer to osu.Game, make SpeedAdjustmentContainer non-abstract.
2017-08-04 22:50:29 +09:30
smoogipooo
4a9f3aa70d
Merge remote-tracking branch 'origin/master' into timingchange-improvements
2017-08-04 20:11:24 +09:30
smoogipooo
0f901c99a0
Implement SpeedAdjustedPlayfield and a new HitRenderer derivation.
2017-08-04 20:11:18 +09:30
Huo Yaoyuan
62b3540fd6
Merge branch 'master' into fixes
2017-08-04 13:49:03 +08:00
Huo Yaoyuan
eb9972581e
Provide Autoplay mod in Ruleset.
2017-08-04 00:25:24 +08:00
Dean Herbert
0d9ea97828
Allow Rulesets to create a non-FontAwesome icon
...
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
Dean Herbert
fce580d717
Reshuffle namespaces
2017-07-26 13:22:46 +09:00
Dean Herbert
64f2e2dc32
Use Colour instead of ColourInfo
2017-07-23 13:06:16 +02:00
Thomas Müller
e68675f970
Rename EasingTypes to Easing
2017-07-22 20:53:53 +02:00
Thomas Müller
598b3f051e
Address CI concerns and update framework
2017-07-22 11:15:45 +02:00
Thomas Müller
c4619f614a
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-19 19:15:51 +02:00
Dean Herbert
21d07428fe
Fix some test regressions
2017-07-19 15:16:59 +09:00
Thomas Müller
6063219b72
Update framework
2017-07-16 13:59:26 +03:00
Thomas Müller
a5e610a7ba
Update framework and fix compilation
...
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
Thomas Müller
9d523ea012
Update framework
2017-07-12 11:06:13 +09:00
Thomas Müller
e8ce3e16b0
Address CI concern
2017-07-10 12:52:29 +03:00
Dean Herbert
0e2dc9388a
More changes in-line with framework changes.
2017-07-10 12:55:47 +09:00
Dean Herbert
89c8a34025
Merge branch 'master' into better-drawablehitobject-lifetimes
2017-06-21 20:13:57 +09:00
smoogipooo
fc0e44b214
Update framework.
2017-06-21 11:28:27 +09:00
paparony03
62dee59672
Shapes namespace
...
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
smoogipooo
34ac932fe2
Reduce pollution in DrawableHitObject in favor of a loosely-coupled IScrollingHitObject.
2017-06-19 10:54:23 +09:00
smoogipooo
28e48eab2b
CI fixes.
2017-06-16 19:30:30 +09:00
smoogipooo
4afe83e74e
Rework DrawableHitObject to provide default life times and proper DrawableTimingSection autosizing.
...
This exposes LifetimeOffset from DrawableHitObject which is used by the XSRG rulesets to adjust the life time range by the VisibleTimeRange.
2017-06-16 19:21:54 +09:00
smoogipooo
ea87aca032
We no longer need to pass in the control point.
2017-06-16 13:12:36 +09:00
smoogipooo
874db28478
CI fixes.
2017-06-16 13:09:06 +09:00
smoogipooo
5bac0919f0
Remove gross autoSizingAxes and life time.
2017-06-16 13:00:08 +09:00
smoogipooo
5d7336b235
A bit more cleanup.
2017-06-16 10:06:47 +09:00
smoogipooo
fda220acbc
Move speed adjustment code from ManiaHitRenderer to SpeedAdjustedHitRenderer.
2017-06-15 19:34:28 +09:00
Dan Balasescu
6fd37ebc32
Merge branch 'master' into timingchange-rework
2017-06-15 16:23:51 +09:00
Dean Herbert
41d4aee4f5
Update nuget packages
...
- [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820
2017-06-13 11:50:46 +09:00
smoogipooo
56244e0134
Add small test case to demonstrate usage.
2017-06-12 17:31:24 +09:00
smoogipooo
ba8014bbd9
Cleanups + xmldoc rewordings/improvements.
2017-06-12 15:20:34 +09:00
smoogipooo
419682b740
Merge remote-tracking branch 'origin/master' into timingchange-rework
...
# Conflicts:
# osu-framework
2017-06-12 13:09:02 +09:00
smoogipooo
ffbb46f668
Update in line with framework.
2017-06-12 12:48:47 +09:00
smoogipooo
de35ea22b1
Make bar lines work again.
2017-06-09 22:03:28 +09:00
smoogipooo
1f56848442
Rewrite the way speed adjustments are applied.
2017-06-09 19:57:03 +09:00
smoogipooo
921350128d
Rename SpeedAdjustment -> MultiplierControlPoint + reworking.
2017-06-09 16:57:17 +09:00
smoogipooo
4b2669e65d
Namespace movement.
2017-06-09 16:20:55 +09:00
smoogipooo
d11002e499
Use new naming structure + VisibleTimeRange bindable.
2017-06-09 16:11:49 +09:00
smoogipooo
cd435f7ec6
Merge remote-tracking branch 'origin/master' into timingchange-rework
...
# Conflicts:
# osu-framework
# osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs
2017-06-09 03:37:55 +09:00
smoogipooo
8de6bdf340
Rewrite mania to use the new timing section stuff.
2017-06-09 02:43:48 +09:00
smoogipooo
55f238f6a9
Remove IHasTimeSpan, add rename to TimingSection.
2017-06-08 23:40:24 +09:00
Dean Herbert
a454ca606f
Merge remote-tracking branch 'upstream/master' into johnneijzen-master
2017-06-08 20:33:39 +09:00
Tom94
5f7270ee4b
Use new invalidation rules
2017-06-08 09:53:45 +02:00
John Neijzen
2f7d9655fd
More Clean up
2017-06-08 15:27:35 +08:00
John Neijzen
431d225a60
Keyword Spacing and Brackets Fixing
2017-06-08 14:35:10 +08:00
John Neijzen
9b0e1c26a3
Clean Up Code
2017-06-07 19:53:37 +08:00
smoogipooo
8641379424
Not sure how these CI issues were missed.
2017-06-07 19:27:22 +09:00
smoogipooo
1932b58663
g -> gravity + one more xmldoc.
2017-06-07 19:21:31 +09:00
smoogipooo
1017cf54d9
CI fixes.
2017-06-07 19:17:45 +09:00
smoogipooo
6f191193a1
Rename timing changes, simplify + improve columns/dictionary usage.
2017-06-07 19:15:51 +09:00
smoogipooo
7aee8ee547
Make TimeSpan a double again.
2017-06-07 19:08:32 +09:00
Dean Herbert
5f537780cf
Bring framework up-to-date
2017-06-07 15:32:50 +09:00
smoogipooo
5104e65bcd
Make hold notes utilize RelativeChildOffset for tick positionings.
2017-06-06 15:57:30 +09:00
smoogipooo
e3d10fc4d3
Update with more framework changes.
2017-06-06 15:52:35 +09:00
smoogipooo
4307242bb6
Update with framework changes.
2017-06-05 20:06:46 +09:00
smoogipooo
a3299809fe
Merge remote-tracking branch 'origin/master' into timingchange-rework
...
# Conflicts:
# osu.Game/Graphics/Containers/ReverseDepthFillFlowContainer.cs
2017-06-05 10:19:53 +09:00
smoogipooo
d66f114b5b
Properly set starting lifetime for mania hit objects.
2017-06-03 18:18:25 +09:00
smoogipooo
7022c8d496
Move timing change stuff to osu.Game project.
2017-06-02 20:17:44 +09:00
smoogipooo
e5720b9477
CI fixes.
2017-06-02 19:53:30 +09:00
smoogipooo
d6e49b94ec
Add comment.
2017-06-02 19:36:47 +09:00
smoogipooo
c7dcb54d45
Simplify gravity.
2017-06-02 19:34:55 +09:00
smoogipooo
a4cd409835
Super huge abstraction changes to (hopefully) make this TimingChangeContainer usable for non-mania rulesets.
...
Also includes commenting improvements/fixes.
2017-06-02 19:27:22 +09:00
smoogipooo
186fecca82
Add missing license headers.
2017-06-02 18:20:14 +09:00
smoogipooo
1d3f5d8649
CI fixes.
2017-06-02 18:19:21 +09:00
smoogipooo
97dd80b874
Make life time set after children are updated (for now).
2017-06-02 18:11:36 +09:00
smoogipooo
5ebe08ed2a
Make default mania playfield timespan 1.5s for now.
2017-06-02 17:45:48 +09:00
smoogipooo
519f5f785b
Add gravity mod icon.
2017-06-02 17:43:24 +09:00
smoogipooo
b46a9dd0ef
Add gravity mod.
2017-06-02 17:33:58 +09:00
smoogipooo
8f6118ffb8
Set lifetime for timing change containers very naively for now.
2017-06-02 16:39:31 +09:00
smoogipooo
1eddc278a4
Cleanup + make travel time equal to the time span.
2017-06-02 16:04:14 +09:00
smoogipooo
563f746acf
Add gravity timing change.
2017-06-02 15:30:59 +09:00
smoogipooo
d75bbb2b88
Fix incorrect sorting.
2017-06-02 15:28:30 +09:00
smoogipooo
1da5d508fa
aaaaa
2017-06-02 11:35:51 +09:00
smoogipooo
d30706f640
Move drawable timing changes to Timing/Drawables.
2017-06-01 15:13:52 +09:00
smoogipooo
3e2aa26722
Add bar line timing changes.
2017-06-01 15:08:41 +09:00
smoogipooo
f612914e87
Initial rewrite of timing changes to allow them to be more extensible.
2017-06-01 14:26:21 +09:00
Shawdooow
cb5fcf2572
change mania multiplier
2017-05-30 13:27:10 -04:00
Shawdooow
ecc0d0b11c
Daycore mod
2017-05-30 12:49:06 -04:00
Dean Herbert
476526714d
Merge branch 'master' into mania-judgements
2017-05-29 21:31:48 +09:00
Dean Herbert
a0c542f461
Merge branch 'master' into mania-barlines
2017-05-29 20:36:50 +09:00
smoogipooo
e529ced131
Fix mania-specific beatmaps not setting samples correctly.
2017-05-29 16:18:01 +09:00
smoogipooo
586fc782cf
Fix line endings.
2017-05-29 16:00:14 +09:00
Dan Balasescu
0327adcba8
Update HoldNote.cs
2017-05-29 15:35:50 +09:00
smoogipooo
4b6f2efa76
Cleanups.
2017-05-29 15:32:58 +09:00
smoogipooo
32550bda4f
Make drawable bar line a bit more sane.
2017-05-29 15:18:06 +09:00
smoogipooo
4fce0c1189
Rename Barline -> BarLine.
2017-05-29 15:05:20 +09:00
smoogipooo
44f1d906ea
Store tick count locally, remove HoldNote TickCount.
2017-05-29 14:47:51 +09:00
smoogipooo
ee7158aa95
Implement bar lines.
2017-05-29 14:44:42 +09:00
smoogipooo
e63108bd75
Add base for bar lines.
2017-05-29 11:56:31 +09:00
smoogipooo
f17b8acd13
Remove erroneous tab.
2017-05-29 11:45:16 +09:00
smoogipooo
e5e73b31b6
Cleanup + slight xmldoc improvements.
2017-05-29 11:42:43 +09:00
smoogipooo
79cdba58c1
Merge branch 'mania-holdnote-input' into mania-judgements
2017-05-29 11:23:32 +09:00
smoogipooo
cdf4fcea02
Fix input being reversed.
2017-05-29 11:07:17 +09:00
smoogipooo
b28b7af887
Scale HP with drain rate a bit.
2017-05-26 20:42:03 +09:00
smoogipooo
3715171948
Ticks can't be missed.
2017-05-26 20:32:21 +09:00
smoogipooo
ca08011734
Add basic (new) hp calculations.
2017-05-26 20:26:26 +09:00
smoogipooo
95908af677
Fix resetting scoreprocessor.
2017-05-26 20:26:06 +09:00
smoogipooo
10f62eb8da
Fix incorrect combo score.
2017-05-26 20:25:24 +09:00
smoogipooo
ab5e1bfc89
Add basic score calculations.
2017-05-26 19:56:50 +09:00
smoogipooo
9ec6e0b692
Fix hold note ticks changing combo.
2017-05-26 19:56:35 +09:00
smoogipooo
02f582a3f8
Add hold note tick judgement.
2017-05-26 19:29:47 +09:00
smoogipooo
4c67c13410
Add hold note tail judgement.
2017-05-26 19:28:14 +09:00
smoogipooo
43a7923199
Implement base mania judgement score.
2017-05-26 19:22:17 +09:00
smoogipooo
f294fef29b
Remove holding property in favor of a nullable hold start time.
2017-05-26 18:56:21 +09:00
smoogipooo
e4b59314ea
Use new HitObjectStartTimeComparer.
2017-05-26 18:52:43 +09:00
smoogipooo
871d44d628
Renamings.
2017-05-26 16:39:43 +09:00
smoogipooo
3f4cbd02cd
Fix warnings.
2017-05-26 16:29:20 +09:00
smoogipooo
47e1b7b389
Fix tick construction loop.
2017-05-26 16:28:39 +09:00
smoogipooo
d3206396e7
Rewrite comments.
2017-05-26 16:10:04 +09:00
smoogipooo
c2d3b6c05a
Remove late initialization of head + tail, keep them updated with start time and end time.
2017-05-26 15:53:49 +09:00
smoogipooo
946cd4bfa3
General cleanup + more xmldocs.
2017-05-24 21:57:38 +09:00
smoogipooo
a5b79b2192
Fix notes not getting accent colours.
2017-05-24 21:56:49 +09:00
smoogipooo
ed65b3559a
CI fix.
2017-05-24 21:25:01 +09:00
smoogipooo
21cdee02f3
Get tickSpacing from beatmap.
2017-05-24 21:24:33 +09:00
smoogipooo
d6b104d794
Minor visual change for DrawableHoldNoteTick.
2017-05-24 21:24:18 +09:00
smoogipooo
78067e085c
Fix note input ordering.
2017-05-24 20:53:47 +09:00
smoogipooo
dcf879687d
Implement basic hold note + tick input.
2017-05-24 20:45:01 +09:00
Dean Herbert
0842e00f13
Merge branch 'master' into controlpoint-rework
2017-05-24 00:20:15 +09:00
Dean Herbert
836c33cfb0
Merge branch 'master' into mania-note-input
2017-05-23 16:50:01 +09:00
smoogipooo
a4823bca91
CI fixes.
2017-05-23 16:47:47 +09:00
smoogipooo
7e5bb61a44
Fix line endings.
2017-05-23 16:13:51 +09:00
smoogipooo
836bf930a0
More cleanups.
2017-05-23 15:29:38 +09:00
smoogipooo
002a0e99a2
Use SortedList + BinarySearch to find control points at time values.
2017-05-23 15:20:32 +09:00
smoogipooo
ea4a285329
Fix compile errors.
2017-05-23 14:08:15 +09:00
smoogipooo
3cdfd2eef5
Split ControlPoint into different types.
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
Dean Herbert
51728e48be
Merge branch 'master' into mania-hitobject-object-conversion
2017-05-22 21:12:00 +09:00
smoogipooo
4200e05fe7
Don't handle repeat keys.
2017-05-22 16:42:14 +09:00
smoogipooo
7314a9019c
Fix nullref.
2017-05-22 16:39:30 +09:00
smoogipooo
f9eb448f16
Implement DrawableNote hits.
2017-05-22 16:35:15 +09:00
Dan Balasescu
6f00f7f0d0
Update HitWindows.cs
2017-05-22 16:34:38 +09:00
smoogipooo
62c7e97a5f
Add helper method to easily compare time offset to hit windows.
2017-05-22 16:28:44 +09:00
smoogipooo
0f3cf18345
Forgot license header.
2017-05-22 16:15:52 +09:00
smoogipooo
9a578e036e
Add xmldoc.
2017-05-22 16:09:32 +09:00
smoogipooo
60e036b5f4
Fix missing reference.
2017-05-22 15:29:02 +09:00
smoogipooo
dcf3148d23
Fix osu!mania failing due to 0 hp.
2017-05-22 15:28:51 +09:00
smoogipooo
3dfe88c068
Make Key a bindable, pass down to drawable hit objects.
2017-05-22 15:28:30 +09:00
smoogipooo
c972335297
Add InputTarget to capture input from columns before hit objects.
2017-05-22 15:25:37 +09:00
smoogipooo
409464381c
Expose HitWindows so they're accessible from the drawable hit objects.
2017-05-22 14:11:14 +09:00
smoogipooo
d0ddd62f84
Add ManiaHitResult to ManiaJudgement.
2017-05-22 14:10:53 +09:00
smoogipooo
f70bfd5378
CI fixes.
2017-05-22 13:43:53 +09:00
Dan Balasescu
4556ead3b6
Merge branch 'master' into mania-hitobject-object-conversion
2017-05-22 12:54:06 +09:00
Dean Herbert
b50f9cad44
Merge branch 'master' into mania-endtime-object-conversion
2017-05-22 12:14:53 +09:00
Dean Herbert
fe70641980
Merge branch 'master' into mania-distance-object-conversion
2017-05-22 12:08:01 +09:00
Dan Balasescu
d02aaf0a28
Merge branch 'master' into mania-distance-object-conversion
2017-05-22 11:36:36 +09:00
Dean Herbert
7f08d60008
Merge branch 'master' into generic-interface
2017-05-22 11:35:50 +09:00
Dean Herbert
469cc5fa52
Merge branch 'master' into remove-siblings
2017-05-22 11:18:46 +09:00
smoogipooo
8077ddf944
Update with pattern changes.
2017-05-22 10:34:12 +09:00
smoogipooo
7d417e4219
Merge remote-tracking branch 'smoogipooo/mania-pattern-changes' into mania-hitobject-object-conversion
2017-05-22 10:32:32 +09:00
smoogipooo
dba9dd3509
Remove siblings.
2017-05-22 10:30:03 +09:00
smoogipooo
6c0d226459
Merge branch 'remove-siblings' into mania-hitobject-object-conversion
2017-05-22 10:25:59 +09:00
smoogipooo
e232968ea7
Fix line endings resulting in CI error.
2017-05-22 10:25:28 +09:00
smoogipooo
6714a244e8
Add check before possibly going into endless loop.
2017-05-22 10:23:08 +09:00
smoogipooo
2d11a8bdf0
Update with pattern changes.
2017-05-22 10:20:42 +09:00
Dan Balasescu
4ce3a78066
Update Pattern.cs
2017-05-22 10:18:42 +09:00
smoogipooo
e9f7be8dce
Merge branch 'mania-pattern-changes' into mania-endtime-object-conversion
2017-05-22 10:17:54 +09:00
smoogipooo
cd66e2af14
Update with pattern changes.
2017-05-22 10:17:08 +09:00
smoogipooo
9fd4ab2302
Merge branch 'mania-pattern-changes' into mania-distance-object-conversion
2017-05-22 10:14:32 +09:00
smoogipooo
0a0139aded
Remove the concept of beatmap events, rename BreakEvent -> BreakPeriod.
2017-05-22 10:12:33 +09:00
smoogipooo
8c260e3364
Renamings + refactorings to Pattern.
2017-05-22 10:04:25 +09:00
smoogipooo
9de18d45a5
Use bitshifted notation.
2017-05-22 10:00:11 +09:00
smoogipooo
9f2ca1acbf
Remove siblings.
2017-05-22 09:57:03 +09:00
Dean Herbert
93182e5da3
Merge branch 'master' into generic-interface
2017-05-22 09:52:40 +09:00
smoogipooo
f42cbd5f38
Merge branch 'remove-siblings' into mania-endtime-object-conversion
2017-05-22 09:51:36 +09:00
smoogipooo
3041b55aac
Remove siblings.
2017-05-22 09:50:36 +09:00
smoogipooo
384295bdca
Merge branch 'remove-siblings' into mania-distance-object-conversion
2017-05-22 09:49:00 +09:00
smoogipooo
e58ffbd87d
Remove Note Siblings.
2017-05-22 09:46:34 +09:00
smoogipooo
ecf81fa8d2
Cleanup.
2017-05-22 08:25:48 +09:00
smoogipooo
8d94c2ef8b
Fix CI errors (for now).
2017-05-19 21:17:14 +09:00
smoogipooo
f8270f31a9
Fix build errors.
2017-05-19 21:15:29 +09:00
smoogipooo
6ab7a91415
Add generator to generate patterns from HitObjects.
2017-05-19 20:57:20 +09:00
smoogipooo
e76cb4cc31
Update to match base branch.
2017-05-19 17:51:59 +09:00
smoogipooo
0a596ef1e4
Merge branch 'mania-beatmap-conversion' into mania-endtime-object-conversion
...
# Conflicts:
# osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs
2017-05-19 17:50:19 +09:00
smoogipooo
90270ac586
Update to match base branch.
2017-05-19 17:48:23 +09:00
smoogipooo
5d8f0a4707
Merge branch 'mania-beatmap-conversion' into mania-distance-object-conversion
...
# Conflicts:
# osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs
2017-05-19 17:42:24 +09:00
smoogipooo
7b05930fc2
Revert "Fix converters possibly not converting from new-style beatmaps that hold mode-specific objects."
...
This reverts commit 6821197a6a
.
2017-05-19 17:38:06 +09:00
smoogipooo
860b607f45
A bit more cleanup.
2017-05-19 16:49:05 +09:00
smoogipooo
1cb3fc7262
Oops fix unused using.
2017-05-19 16:45:06 +09:00
smoogipooo
6821197a6a
Fix converters possibly not converting from new-style beatmaps that hold mode-specific objects.
2017-05-19 16:40:01 +09:00
smoogipooo
2cea5f0fa3
Add comments.
2017-05-19 16:39:02 +09:00
smoogipooo
9191c4f3e3
Remove LegacyBeatmapConverter.
2017-05-19 16:31:56 +09:00
smoogipooo
67cf64062a
Add flag to determine whether the beatmap requested for conversion is for the current ruleset.
2017-05-19 16:02:40 +09:00
Huo Yaoyuan
ff5854d6bf
Merge branch 'master' into generic-interface
2017-05-18 19:19:40 +08:00
Dan Balasescu
e52b87bc58
Fix incorrect comment.
2017-05-18 19:47:16 +09:00
Dan Balasescu
b5674c8f30
Update DistanceObjectPatternGenerator.cs
2017-05-18 19:33:02 +09:00
smoogipooo
1f6939f57b
Add IHasEndTime object pattern generation.
2017-05-18 19:31:56 +09:00
smoogipooo
a239411808
Fix warnings/errors.
2017-05-18 19:10:32 +09:00
smoogipooo
78453c7ce3
Merge branch 'mania-beatmap-conversion' into mania-distance-object-conversion
...
# Conflicts:
# osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs
2017-05-18 19:06:27 +09:00
smoogipooo
4e8ead9cf4
Fix possible nullref.
2017-05-18 19:05:03 +09:00
smoogipooo
c80e2e8f0a
Attempt to solve warnings...
2017-05-18 18:46:50 +09:00
smoogipooo
35bd608a4a
Simplify method parameters, make conversion work again.
2017-05-18 18:41:44 +09:00
smoogipooo
a30e49d21b
Add hold end samples.
2017-05-18 18:19:29 +09:00
smoogipooo
53a2f34f8b
Set siblings, removing warning.
2017-05-18 18:15:09 +09:00
smoogipooo
2c97313a20
Merge branch 'mania-beatmap-conversion' into mania-distance-object-conversion
2017-05-18 18:14:11 +09:00
smoogipooo
af129b3eab
Add siblings, will be used in generator branches.
2017-05-18 18:13:08 +09:00
smoogipooo
eae4f8b412
Fix compilation due to previously-removed function.
2017-05-18 18:11:09 +09:00
smoogipooo
2af025e630
Add IHasDistance object pattern generation.
2017-05-18 18:09:13 +09:00
smoogipooo
afd3eb4b8d
Implement things a bit more to remove warnings.
2017-05-18 18:04:32 +09:00
smoogipooo
873ff34487
This function can't be used for all pattern generations. So let's not use it.
2017-05-18 17:43:59 +09:00
smoogipooo
af34777f44
Trim whitespace.
2017-05-18 17:00:11 +09:00
smoogipooo
164a1bb743
Remove distance object pattern generator for now (next PR).
2017-05-18 15:38:15 +09:00
smoogipooo
1fa1897d71
Define the concept of patterns + additional comments.
2017-05-18 15:05:45 +09:00
smoogipooo
618c162535
Move more functions to ObjectConversion + resharper cleanup.
2017-05-18 14:17:23 +09:00
smoogipooo
de8271ad6b
Fix out of range exceptions due to out-of-order hitobjects.
2017-05-18 14:08:48 +09:00
smoogipooo
6dae5cbacf
Fix distance object conversion not calculating end time.
2017-05-18 14:08:32 +09:00
smoogipooo
6010243736
Fix incorrect uint_to_real factor.
2017-05-18 14:07:57 +09:00
smoogipooo
7c48fb2b92
General fixes.
2017-05-18 13:37:22 +09:00
smoogipooo
c1a44ea6b4
Renaming + commenting.
2017-05-18 13:25:55 +09:00
smoogipooo
16eda2467f
Make compile.
2017-05-18 12:50:12 +09:00
smoogipooo
f6dc85c2f8
Fix incorrect note count probabilities.
2017-05-18 12:39:51 +09:00
smoogipooo
e9275138e1
Finish up DistanceObjectConversion.
2017-05-18 12:39:37 +09:00
smoogipooo
22128f158c
Fix a few errors.
2017-05-18 12:10:01 +09:00
Huo Yaoyuan
88f8619e9a
More missed exceptions.
2017-05-18 02:46:12 +08:00
smoogipooo
b52ec11260
Add (almost finished) basis of slider hit object conversion...
2017-05-17 20:47:02 +09:00
smoogipooo
2f8556a44a
Fix hold notes + make it compile again.
2017-05-17 13:20:33 +09:00
smoogipooo
4d9aea6aec
Remove while statement (came from fastrandom...).
2017-05-17 13:14:42 +09:00
smoogipooo
c5d823d7d9
Remove redundant parentheses.
2017-05-17 13:11:17 +09:00
smoogipooo
9565bb9572
Fix hold notes - remove glow for now.
...
# Conflicts:
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
2017-05-17 13:09:49 +09:00
smoogipooo
17466a662c
Add hold note conversion.
2017-05-17 13:09:07 +09:00
smoogipooo
fdd98e23bd
Fix generation.
2017-05-17 13:08:59 +09:00
smoogipooo
1ded043778
Add basic mania-specific beatmap conversion.
...
# Conflicts:
# osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
2017-05-17 13:07:56 +09:00
smoogipooo
51f7904c13
Remove redundant parentheses.
2017-05-17 13:04:57 +09:00
smoogipooo
93e2b21084
Add FastRandom class for use in beatmap conversion.
2017-05-17 12:52:07 +09:00
smoogipooo
0eba553138
Comments?
2017-05-16 19:33:56 +09:00
smoogipooo
bc629d193d
InternalChildren -> Children.
2017-05-16 19:26:46 +09:00
smoogipooo
9b0aed7c48
Add tween to time span changing.
2017-05-16 19:14:27 +09:00
smoogipooo
3c8d75effb
Fix unused directive.
2017-05-16 18:36:38 +09:00
smoogipooo
6231a19b8c
Merge remote-tracking branch 'origin/master' into mania-timing-sections
2017-05-16 18:35:32 +09:00
smoogipooo
be4ff5c038
Fix possible no-children-in-sequence exception.
2017-05-16 18:26:49 +09:00
smoogipooo
620b4bf863
Cleanup.
2017-05-16 18:17:34 +09:00
smoogipooo
60666dc824
Rename.
2017-05-16 18:05:09 +09:00
smoogipooo
f4a03ec1cf
Fix usings.
2017-05-16 18:03:30 +09:00
smoogipooo
8ed97a8335
Let's invert the playfield by default for now.
2017-05-16 18:02:54 +09:00
smoogipooo
ac02d1ab10
TimeRelativeContainer -> ControlPointContainer, optimize AutoTimeRelativeContainer a little bit (only recompute on invalidation).
2017-05-16 17:50:09 +09:00
smoogipooo
7039205363
Invert the playfield by default to make calculations a bit simpler and clean up a lot of code.
2017-05-16 17:34:41 +09:00
smoogipooo
62139015fb
Clamp TimeSpan.
2017-05-16 17:06:54 +09:00
smoogipooo
8d19bafc19
Add ability to hold down speed-changing keys.
2017-05-16 17:04:05 +09:00
smoogipooo
da932276e8
Make timing sections scroll again.
2017-05-16 17:03:43 +09:00
Dean Herbert
efab186384
Update namespaces in line with framework
2017-05-16 12:50:30 +09:00
smoogipooo
a25f11e809
Initial removal of TimingSection.
2017-05-12 22:23:32 +09:00
smoogipooo
0597a95db0
Resharper is too smart.
2017-05-11 22:17:10 +09:00
smoogipooo
d57bb7e5fd
General cleanups.
2017-05-11 22:01:37 +09:00
smoogipooo
7b49ed1419
Fix up todo.
2017-05-11 21:57:28 +09:00
smoogipooo
f764ed8903
Remove unused class.
2017-05-11 20:05:11 +09:00
smoogipooo
0739a76497
Make the playfield work in TestCaseGamefield.
2017-05-11 20:04:45 +09:00
smoogipooo
ee219c18db
Make the playfield mask for now.
2017-05-11 20:04:28 +09:00
smoogipooo
6a79c8b66c
Make notes scroll with beat length.
2017-05-11 19:57:24 +09:00
smoogipooo
5dd83067ee
Fix line endings.
2017-05-11 17:41:00 +09:00
smoogipooo
5f30a89f76
General refactoring + renaming of TimingSectionContainer.
2017-05-11 16:09:48 +09:00
smoogipooo
da4be2f9d6
Move notes above judgement area but below keys.
2017-05-11 14:32:31 +09:00
smoogipooo
623912b40a
Fix playfield position.
2017-05-11 14:32:13 +09:00
smoogipooo
f6677125af
Merge branch 'mania-notes' into mania-timing-sections
2017-05-11 14:11:58 +09:00
smoogipooo
a6b71f8ccb
Resharper fixes.
2017-05-11 14:11:52 +09:00
smoogipooo
cdf827df8e
CI fixes.
2017-05-11 13:55:52 +09:00
smoogipooo
7fcbf2d8d4
Add t=0 display to notes.
2017-05-11 12:57:07 +09:00
smoogipooo
8160f36a48
Fix notes scrolling from end of map -> start of map.
2017-05-11 12:56:51 +09:00
smoogipooo
b10df74079
Full rewrite of timing section code, partially working for now.
2017-05-11 12:33:19 +09:00
smoogipooo
185e98aa14
Add basic column conversion to ManiaBeatmapConverter.
2017-05-11 12:32:30 +09:00
smoogipooo
2867606913
Whoops wrong project.
2017-05-10 17:35:00 +09:00
smoogipooo
3b533de8ac
Add xmldoc to HitWindows.cs.
2017-05-10 17:29:54 +09:00
smoogipooo
bcc8a94e36
Construct mania playfield with proper column count.
2017-05-10 16:32:11 +09:00
smoogipooo
2edc39ae16
Add timing sections.
2017-05-10 15:09:29 +09:00
smoogipooo
5b323ad483
Cleanups.
2017-05-09 20:55:20 +09:00
smoogipooo
d852567d1d
Rewrite notes to have time-relative position and length.
2017-05-09 20:33:59 +09:00
smoogipooo
e3b01e7b8c
Merge branch 'master' into mania-notes
...
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
2017-05-08 12:12:40 +09:00
EVAST9919
66c858030a
Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor
2017-05-04 17:35:41 +03:00
smoogipooo
4ad3e3d64e
Basic implementation of hold notes (not finalized yet).
2017-05-04 18:02:43 +09:00
smoogipooo
f945c636c2
Make note accent colour work again.
2017-05-04 15:36:37 +09:00
smoogipooo
72b2467e74
Throw exception if SpecialColumnPosition is set after IsLoaded.
2017-05-04 15:18:20 +09:00
smoogipooo
e307b6d563
Make SpecialColumnPosition only have an effect during load().
2017-05-04 15:12:32 +09:00
smoogipooo
a2bdd020e5
ColumnStyle -> ColumnPosition.
2017-05-04 14:54:31 +09:00
smoogipooo
956a7288fb
Add basic DrawableNote.
2017-05-03 20:12:27 +09:00
Dan Balasescu
5024a74192
Update ManiaPlayfield.cs
2017-05-03 20:11:24 +09:00
smoogipooo
8aa6bb636c
Reset column key when it can't be set.
2017-05-03 19:43:20 +09:00
smoogipooo
14e4714f08
Rewrite a lot of ManiaPlayfield/Column to support left/right special styles and arbitrary number of columns.
2017-05-03 19:38:15 +09:00
smoogipooo
d11e5d0060
Add hit windows to Note/HoldNote.
2017-05-03 13:51:44 +09:00
Dan Balasescu
d21c3358b9
Less array explicivity.
2017-05-03 13:03:46 +09:00
smoogipooo
7de36b7aa2
CI cleanups.
2017-05-03 12:58:46 +09:00
smoogipooo
5328793693
ManiaBaseHit -> ManiaHitObject.
2017-05-03 12:44:19 +09:00
smoogipooo
64c677a29d
Add IHasColumn.
2017-05-03 12:42:37 +09:00
smoogipooo
71acf1c57d
Move classes out of test case.
2017-05-03 12:37:47 +09:00
EVAST9919
00a8dbbacf
Added ModType for each mode
2017-05-02 21:36:55 +03:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset.
2017-04-18 16:05:58 +09:00