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
