smoogipoo
|
1125075b37
|
Use list with post-sort for nested hitobjects
|
2018-10-10 13:02:27 +09:00 |
|
Dean Herbert
|
06ea174f34
|
Merge branch 'master' into fix-sv
|
2018-10-09 18:00:34 +09:00 |
|
smoogipoo
|
ff559a3a1b
|
Merge remote-tracking branch 'origin/master' into playfield-scaling-rework
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
# osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
|
2018-10-05 10:40:16 +09:00 |
|
ekrctb
|
b9d0fc927b
|
Remove duplicated code
|
2018-10-04 18:03:34 +09:00 |
|
smoogipoo
|
e931aa3d9e
|
Move positional modifications to HitCirclePlacementMask
|
2018-10-04 13:43:50 +09:00 |
|
Dean Herbert
|
593dee202c
|
Fix gameplay mouse button disable setting no longer having any effect
Regressed at 50091252e2 (diff-20562da8cde558aacafa9540b97b7975)
|
2018-10-04 03:07:00 +09:00 |
|
smoogipoo
|
7809ce9361
|
Fix 1-frame position discrepancy
|
2018-10-03 17:05:22 +09:00 |
|
smoogipoo
|
934b687965
|
Fix selection masks not being added for new objects
|
2018-10-03 16:49:59 +09:00 |
|
smoogipoo
|
34ed60830c
|
Keep the placement hitobject time up-to-date
|
2018-10-03 16:44:37 +09:00 |
|
smoogipoo
|
3420e0c7eb
|
Re-implement composition tools + implement placement masks
|
2018-10-03 16:27:26 +09:00 |
|
smoogipoo
|
540a010fbb
|
Implement an intermediary EditRulesetContainer
|
2018-10-03 15:36:24 +09:00 |
|
smoogipoo
|
4cdb6dcea5
|
Rename HitObjectMask -> SelectionMask
|
2018-10-03 13:28:00 +09:00 |
|
ekrctb
|
b7a2ad1aa5
|
Use UIEvent level getters for modifier keys.
|
2018-10-02 13:26:36 +09:00 |
|
ekrctb
|
50091252e2
|
Adapt signature change of event handlers
|
2018-10-02 12:02:55 +09:00 |
|
ekrctb
|
99fc04c8af
|
Change signature to new event handler
|
2018-10-02 12:02:47 +09:00 |
|
Dan Balasescu
|
0f51007867
|
Merge branch 'master' into judgement-cleanup
|
2018-10-02 09:37:04 +09:00 |
|
Dan Balasescu
|
87d8945af9
|
Give the body a size
|
2018-10-02 09:33:31 +09:00 |
|
smoogipoo
|
b68eeae777
|
Fix scrolling rulesets not accounting for slider multiplier
|
2018-10-01 18:12:30 +09:00 |
|
Hanamuke
|
6c1b3cf1a5
|
Merge remote-tracking branch 'origin/AR_Catch' into AR_Catch
|
2018-09-30 16:09:27 +02:00 |
|
Hanamuke
|
b983e20067
|
Merge branch 'master' into AR_Catch
|
2018-09-30 16:01:55 +02:00 |
|
Kyle Chang
|
88b0c234cc
|
Move judgement text to internal container
|
2018-09-30 04:01:33 -04:00 |
|
Dean Herbert
|
d3eb24e70a
|
Fix score retrieval no longer working
|
2018-09-28 18:29:49 +09:00 |
|
Dean Herbert
|
2ed7785cfc
|
Merge remote-tracking branch 'upstream/master' into update-framework
|
2018-09-26 19:50:48 +09:00 |
|
Dean Herbert
|
a77a55d71d
|
Merge remote-tracking branch 'smoogipoo/update-framework' into update-framework
|
2018-09-26 19:49:41 +09:00 |
|
Dan Balasescu
|
3a5e380e46
|
Merge branch 'master' into judgement-size-fix
|
2018-09-26 18:36:12 +09:00 |
|
smoogipoo
|
a8f156584b
|
Update framework with positional/non-positional changes
|
2018-09-26 14:01:15 +09:00 |
|
Paul Teng
|
319ed1bf0f
|
Reorder if statement
|
2018-09-24 21:35:13 -04:00 |
|
Paul Teng
|
dd36b6a381
|
Remove unused field storage
|
2018-09-24 21:08:58 -04:00 |
|
Paul Teng
|
b95cc798b2
|
Remove unused fallback
|
2018-09-24 20:56:18 -04:00 |
|
Paul Teng
|
62df0ec7d4
|
Handle external files with File instead
|
2018-09-24 07:16:19 -04:00 |
|
Kyle Chang
|
7a43677849
|
Make judgements scale with cs
|
2018-09-22 22:54:38 -04:00 |
|
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 |
|
smoogipoo
|
826dc6ceb7
|
Make Playfield not a ScalableContainer
|
2018-09-21 14:02:32 +09:00 |
|
Dan Balasescu
|
4b907336c5
|
Move readonly field above ctor
|
2018-09-20 13:17:17 +09:00 |
|
Hanamuke
|
309d8c8cb4
|
CI
|
2018-09-19 18:43:39 +02:00 |
|
Hanamuke
|
e7d78b94ae
|
Remove ScrollingVisualisation from settings
|
2018-09-19 18:30:25 +02:00 |
|
ekrctb
|
a3e6973b41
|
Replace usage of now removed TriggerKeyPress and similar methods.
|
2018-09-19 11:36:55 +09:00 |
|
ekrctb
|
c8e9d9375f
|
Use new InputStateChangeEvent for RulesetInputManager
|
2018-09-19 11:36:55 +09:00 |
|
Hanamuke
|
6d229716e7
|
Remove unused using directives
|
2018-09-18 20:42:55 +02:00 |
|
Hanamuke
|
2afcdb1451
|
Add the file
|
2018-09-18 20:23:25 +02:00 |
|
Hanamuke
|
e3cc25a96a
|
Implement ConstantScrollingSpeedVisualiser
|
2018-09-18 20:21:10 +02:00 |
|
Joehu
|
f99eff1192
|
Use consistent terminology format
|
2018-09-15 07:30:11 -07:00 |
|
smoogipoo
|
356a60b561
|
Fix hitobjects in scrolling rulesets getting masked away
|
2018-09-12 15:14:51 +09:00 |
|
Dean Herbert
|
68a79f895a
|
Fix mania throwing an exception on start of map
|
2018-08-30 14:58:00 +09:00 |
|
smoogipoo
|
551581e5cd
|
Skip invalid hitobject types, log error instead
|
2018-08-22 15:59:58 +09:00 |
|
smoogipoo
|
fcf98390f5
|
Cleanup
|
2018-08-21 12:10:00 +09:00 |
|
Dean Herbert
|
6a4ff19c90
|
Merge branch 'master' into relax
|
2018-08-17 23:17:07 +09:00 |
|
smoogipoo
|
16d30f6756
|
Add explanatory comments
|
2018-08-17 13:31:12 +09:00 |
|
smoogipoo
|
eb6f1ae72c
|
Fix spinners providing one extra combo
|
2018-08-17 09:16:28 +09:00 |
|
Dean Herbert
|
ff0dfa7acf
|
Merge branch 'master' into relax
|
2018-08-16 17:36:24 +09:00 |
|
smoogipoo
|
4c3e551295
|
Fix first object not receiving new combo
Note: If a normal catch fruit is the first object, it does not receive a new combo...
|
2018-08-15 11:48:28 +09:00 |
|
smoogipoo
|
31f324945e
|
Implement combo offsets
|
2018-08-15 11:47:31 +09:00 |
|
smoogipoo
|
da3e2cfee2
|
Catch/osu! spinners should have combo
|
2018-08-15 11:13:23 +09:00 |
|
smoogipoo
|
4f0305ffeb
|
Taiko convert hitobjects should not have combo
|
2018-08-15 10:58:59 +09:00 |
|
smoogipoo
|
83f75ac896
|
Mania convert hitobjects should not have combo
|
2018-08-15 10:57:11 +09:00 |
|
smoogipoo
|
8faf12579a
|
Fix field not being set correctly
|
2018-08-15 10:53:25 +09:00 |
|
smoogipoo
|
d2709613bc
|
Add combo offset to ConvertHitObjectParser
|
2018-08-15 10:49:45 +09:00 |
|
smoogipoo
|
ce77473910
|
Simplify usage of ConvertHitObjectParser
|
2018-08-15 10:24:56 +09:00 |
|
smoogipoo
|
e04b2f4fa9
|
Fix hitobject results not rewinding
|
2018-08-14 18:31:32 +09:00 |
|
smoogipoo
|
60c94a8ea3
|
Fix ScoreProcessor.ApplyBeatmap never being called
|
2018-08-06 12:42:54 +09:00 |
|
Dan Balasescu
|
c1517e1521
|
Merge branch 'master' into judgement-rework
|
2018-08-06 12:30:46 +09:00 |
|
smoogipoo
|
2a54b5b78d
|
ResetResult -> RevertResult
|
2018-08-06 12:29:22 +09:00 |
|
smoogipoo
|
c48a4d9993
|
Add exception
|
2018-08-06 12:29:12 +09:00 |
|
smoogipoo
|
3a7488767c
|
Make HitObject not store the judgement
|
2018-08-06 11:50:18 +09:00 |
|
smoogipoo
|
0d6a8a2bf5
|
More xmldocs
|
2018-08-06 11:31:54 +09:00 |
|
smoogipoo
|
741ec0021e
|
Rename more judgement-related methods to "result"
|
2018-08-06 11:31:46 +09:00 |
|
smoogipoo
|
ab642b563f
|
CreateJudgementResult -> CreateResult
|
2018-08-06 11:07:41 +09:00 |
|
smoogipoo
|
754f3c8621
|
Move result creation to load(), add exceptions
|
2018-08-06 11:07:05 +09:00 |
|
smoogipoo
|
b35817c877
|
More xmldocs to hitobject/drawablehitobject
|
2018-08-06 10:55:38 +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 |
|
tgi74000
|
b1d1a2400b
|
Remove IUpdatableByHitObject completely
|
2018-08-05 09:52:19 +02:00 |
|
tgi74000
|
07d6a75e23
|
Rename variables to be human readable
|
2018-08-04 00:18:09 +02:00 |
|
tgi74000
|
7310c38df9
|
Add relax mod
|
2018-08-03 14:03:11 +02:00 |
|
smoogipoo
|
482526135f
|
Make IsHit not consider nested hitobjects
|
2018-08-03 16:07:20 +09:00 |
|
smoogipoo
|
2a4994e5ce
|
Make hitobjects only have one judgement + result
|
2018-08-03 15:38:48 +09:00 |
|
smoogipoo
|
35b4ab5456
|
Introduce the concept of a "MainResult"
|
2018-08-02 21:07:40 +09:00 |
|
smoogipoo
|
8d81e66f88
|
Fix osu score processor crashing
|
2018-08-02 21:07:11 +09:00 |
|
Dean Herbert
|
6ee06602b8
|
Merge branch 'master' into mania-mask-container
|
2018-08-02 20:41:27 +09:00 |
|
smoogipoo
|
3619290c34
|
Split out judgement definition from judgement result
|
2018-08-02 20:35:54 +09:00 |
|
smoogipoo
|
d51d0e8547
|
Initial structure for new hitobject judgement system
|
2018-08-01 21:45:59 +09:00 |
|
smoogipoo
|
41512667a8
|
Require all judgements to be present for map completion
|
2018-08-01 19:51:24 +09:00 |
|
Dean Herbert
|
3c06655672
|
Split out Special mods into Automation and Conversion
|
2018-07-31 18:00:42 +09:00 |
|
Dean Herbert
|
b7de922896
|
Merge branch 'master' into open-downloaded-beatmas
|
2018-07-28 12:44:34 +09:00 |
|
Dean Herbert
|
95cca046fb
|
Merge branch 'master' into open-downloaded-beatmas
|
2018-07-25 12:38:49 +02:00 |
|
Dean Herbert
|
da8fc0ee5d
|
ToLower -> ToLowerInvariant
|
2018-07-25 07:37:05 +02:00 |
|
Dean Herbert
|
5364a6148a
|
Use ToUpperInvariant
|
2018-07-24 14:42:06 +02:00 |
|
Dean Herbert
|
ab9340f4be
|
Fix usage of culture local ToUpper causing incorrect display on Turkish machines
Closes #3098.
|
2018-07-24 11:37:43 +02: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
|
6fa70ed696
|
Merge branch 'master' into centralise-judgement-display
|
2018-07-23 05:23:52 +09:00 |
|
Dean Herbert
|
d561f54282
|
Merge branch 'master' into per-object-css
|
2018-07-23 03:01:17 +09: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 |
|
Dean Herbert
|
a2f744b05e
|
Merge remote-tracking branch 'upstream/master' into open-downloaded-beatmas
|
2018-07-21 00:03:17 +09:00 |
|
Dean Herbert
|
3fc7f33e90
|
Merge branch 'master' into centralise-judgement-display
|
2018-07-20 17:29:15 +09:00 |
|
Dean Herbert
|
7cc999027d
|
Merge branch 'master' into pause-input-fixes
|
2018-07-20 17:20:19 +09:00 |
|
smoogipoo
|
1139f0dbf2
|
Centralise method of disabling playfield judgements
|
2018-07-20 17:04:33 +09:00 |
|
smoogipoo
|
c087a73f40
|
Implement per-hitobject custom sample banks
|
2018-07-20 15:12:44 +09:00 |
|
David V
|
9eb69a1e76
|
Restructure + corrects converting to support all systems
|
2018-07-19 17:47:55 +02:00 |
|
David V
|
4e72794101
|
Converts float to int.
|
2018-07-19 15:55:38 +02:00 |
|
Dan Balasescu
|
5dba048c46
|
Merge branch 'master' into mania-mask-container
|
2018-07-19 19:38:43 +09:00 |
|
Dean Herbert
|
693ba8e994
|
Add more ToString output
|
2018-07-19 18:43:11 +09:00 |
|
smoogipoo
|
b7721edc80
|
Remove more unnecessary changes
|
2018-07-19 18:25:28 +09:00 |
|
Dean Herbert
|
c2cdf12986
|
Better pause logic
|
2018-07-18 19:59:04 +09:00 |
|
smoogipoo
|
9b7d01397b
|
Add ruleset config to HitObjectComposer
|
2018-07-17 16:53:32 +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 |
|
Dean Herbert
|
9f933187e9
|
Apply review feedback
|
2018-07-17 16:33:08 +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
|
3905a9105c
|
Add a playfield method to retrieve all hitobjects
|
2018-07-17 15:51:10 +09:00 |
|
smoogipoo
|
48190e3b5a
|
Make NestedPlayfields non-null
|
2018-07-17 15:48:51 +09:00 |
|
Dean Herbert
|
569d0f7993
|
Merge branch 'master' into scrolldirection-cleanup
|
2018-07-17 15:39:13 +09:00 |
|
smoogipoo
|
0b66f63f7d
|
Invert flow order of hitobjects between composer and mask layers
|
2018-07-17 15:35:32 +09:00 |
|
Dean Herbert
|
e681bd3244
|
Merge branch 'master' into fix-incorrect-mods
|
2018-07-17 15:23:21 +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 |
|
Dean Herbert
|
b967fe714b
|
Fix lead-in time now being long enough in many cases
|
2018-07-17 14:29:22 +09:00 |
|
Dan Balasescu
|
745d596343
|
Merge branch 'master' into fix-incorrect-mods
|
2018-07-17 13:41:02 +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
|
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
|
ac078153ae
|
Merge remote-tracking branch 'upstream/master' into peppy-fix-incorrect-mods
|
2018-07-13 14:20:56 +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 |
|
Dean Herbert
|
96ef526474
|
Merge remote-tracking branch 'upstream/master' into ekrctb-fix-disable-mouse
|
2018-07-11 17:02:01 +09:00 |
|
Dean Herbert
|
4f894969df
|
Merge branch 'master' into hitobject-samples
|
2018-07-05 19:43:19 +09:00 |
|
Dean Herbert
|
d11ba2df0e
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-legacy-custom-banks
|
2018-07-05 14:53:31 +09:00 |
|
Dean Herbert
|
e28a610757
|
Fix mods not correctly resetting when changing ruleset at song select
|
2018-07-05 13:22:52 +09:00 |
|
ekrctb
|
d71b61c122
|
Rewrite disable mouse buttons logic
|
2018-07-03 20:04:15 +09:00 |
|
Dean Herbert
|
1e1ff8339e
|
Merge branch 'master' into non-null-nestedobjects
|
2018-07-03 19:43:46 +09:00 |
|
smoogipoo
|
f0ec117bcb
|
Merge remote-tracking branch 'origin/master' into add-scroll-speed-keybinds
# Conflicts:
# osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
|
2018-07-02 17:21:18 +09:00 |
|
smoogipoo
|
45a4187923
|
Tidy up lookups to NestedHitObjects
|
2018-07-02 16:10:56 +09:00 |
|
smoogipoo
|
7f832e34c0
|
Reorder sample bank property setters
|
2018-07-02 14:29:18 +09:00 |
|
smoogipoo
|
73fac2115a
|
Implement hitobject sample files
|
2018-07-02 14:20:35 +09:00 |
|
Dean Herbert
|
812929fa05
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess
|
2018-07-02 13:10:42 +09:00 |
|
smoogipoo
|
9f85c55915
|
Merge remote-tracking branch 'origin/master' into legacy-custom-banks
|
2018-07-02 12:34:51 +09:00 |
|
Dean Herbert
|
98fb2e03c0
|
Fix rulesets not loading in debug builds after running a release build
|
2018-07-01 18:03:15 +09:00 |
|
Dean Herbert
|
e12ce3c2a8
|
Adjust xmldoc
|
2018-06-29 17:21:55 +09:00 |
|
Dean Herbert
|
098aeabc9e
|
Merge branch 'master' into catch-scoring
|
2018-06-29 17:16:14 +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 |
|
smoogipoo
|
99068debc4
|
Split out into separate interface + add xmldocs
|
2018-06-29 13:24:33 +09:00 |
|
Dean Herbert
|
70a119dde7
|
Remove unused/duplicate interface
|
2018-06-29 12:20:53 +09:00 |
|
smoogipoo
|
781095b96b
|
Encapsulate the method to apply SampleControlPoints to SampleInfos
|
2018-06-28 18:29:07 +09:00 |
|
Dean Herbert
|
b1a3f01212
|
Fix mania maps not being treated as mania maps in release builds
|
2018-06-28 17:10:30 +09:00 |
|
smoogipoo
|
80501de4b9
|
Add legacy slider offsets
|
2018-06-27 12:09:21 +09:00 |
|
Dean Herbert
|
594cc0d21d
|
Merge branch 'master' into mania-playfield-inversions
|
2018-06-25 18:36:23 +09:00 |
|
ekrctb
|
d6084c0b30
|
Adapt to new input handling changes
|
2018-06-22 18:10:27 +09:00 |
|
Tom Arrow
|
ad883e087a
|
RulesetContainer<TObject> cannot be derived
|
2018-06-19 14:31:24 +02:00 |
|
Dean Herbert
|
57011ff13b
|
Merge branch 'master' into mania-playfield-inversions
|
2018-06-15 18:33:40 +09:00 |
|
smoogipoo
|
8f7334874c
|
Fix up performance calculators
|
2018-06-14 16:04:48 +09:00 |
|
smoogipoo
|
b7a06b9594
|
Restructure of DifficultyCalculator to cleanup mod + attribute handling
|
2018-06-14 15:32:07 +09:00 |
|
smoogipoo
|
1431ee1867
|
Remove unused method
|
2018-06-14 14:46:25 +09:00 |
|
Dan Balasescu
|
0e0e64895a
|
Merge branch 'master' into mania-step-interval
|
2018-06-13 13:55:27 +09:00 |
|
Dean Herbert
|
bcfb092e53
|
Change step to 200
|
2018-06-12 18:03:45 +09:00 |
|
Dean Herbert
|
ae136e89a4
|
Merge branch 'master' into ruleset-configs
|
2018-06-12 13:13:18 +09:00 |
|
Dan Balasescu
|
3981f56157
|
Merge branch 'master' into exponential-scoring-toggle
|
2018-06-11 18:34:55 +09:00 |
|
Dan Balasescu
|
78daf1c7ad
|
Merge branch 'master' into exponential-scoring-toggle
|
2018-06-11 18:19:33 +09:00 |
|
Dan Balasescu
|
9994c69d58
|
Merge branch 'master' into fix-object-ordering
|
2018-06-11 17:53:33 +09:00 |
|
smoogipoo
|
b51e714ae5
|
Fix xmldoc
|
2018-06-11 15:44:59 +09:00 |
|
smoogipoo
|
563a2667d3
|
Merge branch 'ruleset-configs' into mania-playfield-inversions
|
2018-06-11 15:08:48 +09:00 |
|
smoogipoo
|
14b7530994
|
Use a global ruleset config cache
|
2018-06-11 15:07:42 +09:00 |
|
smoogipoo
|
be01dbae3a
|
Move ruleset dependency caching to CreateLocalDependencies
In some cases we may want to refer to the cached configmanager dependency from subclasses. This prevents injection errors when doing so.
|
2018-06-11 15:07:29 +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
|
f4fbf27d42
|
Give ruleset settings a ruleset-specific config manager
|
2018-06-11 13:28:50 +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 |
|
smoogipoo
|
63ec36b3be
|
Explicitly handle null settings case + add annotations
|
2018-06-11 12:57:56 +09:00 |
|
smoogipoo
|
b219c17115
|
Move dependency creation under ctor
|
2018-06-11 12:57:26 +09:00 |
|
Crusensis
|
fbc0cd6f5f
|
Split AffectsCombo into IsBonus
|
2018-06-09 18:14:33 -07:00 |
|
Dean Herbert
|
86fb9666b2
|
Rename "Exponential" to "Classic"
|
2018-06-10 01:45:05 +09:00 |
|
Dean Herbert
|
cc37a355d2
|
Add comment about matching stable scoring
Also updated equation to be close to what is expected
|
2018-06-10 01:44:46 +09:00 |
|
Dean Herbert
|
aaa65c428f
|
Merge branch 'master' into diffcalc-modtypes
|
2018-06-09 23:35:17 +09:00 |
|
Dean Herbert
|
9bdb3113ce
|
Revert "Always update children when ruleset input manager is updated"
This reverts commit 4eb7a34944.
|
2018-06-08 21:05:28 +09:00 |
|
smoogipoo
|
2a48e0e44a
|
Fix sequential speed change visualiser not working with 0 control points
|
2018-06-08 15:11:43 +09:00 |
|
Dean Herbert
|
0b4f5af52e
|
Add setting to toggle standardised or exponential scoring display
Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.
|
2018-06-08 03:17:12 +09:00 |
|
Dean Herbert
|
2c25e5e8da
|
Merge branch 'master' into mania-step-interval
|
2018-06-07 20:26:33 +09:00 |
|
smoogipoo
|
55a5dfa9b6
|
Add column testcase
|
2018-06-07 20:24:33 +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
|
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 |
|
Dean Herbert
|
5e9a1961cb
|
Greatly increase the playfield scroll speed adjust step
It was so small previously that I believe many people didn't even realise it was working.
|
2018-06-07 14:35:33 +09:00 |
|
smoogipoo
|
72cc53aded
|
Rename GameBeatmap -> BindableBeatmap
|
2018-06-06 20:16:20 +09:00 |
|
smoogipoo
|
4086ff7313
|
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
# osu.Game/Screens/Menu/Intro.cs
# osu.Game/Screens/Menu/MenuSideFlashes.cs
|
2018-06-06 18:26:51 +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 |
|
Dean Herbert
|
d3cd267036
|
Formatting fixes
|
2018-06-06 14:20:51 +09:00 |
|
smoogipoo
|
e19ca0c120
|
Add nomod mod type
|
2018-06-06 14:08:02 +09:00 |
|
smoogipoo
|
8274623ad6
|
Cleanup multi mod constructions
|
2018-06-06 14:07:50 +09:00 |
|
Dean Herbert
|
a5679f7bf5
|
Improve readability of code
|
2018-06-06 14:04:20 +09:00 |
|
Dean Herbert
|
ee92986494
|
Merge branch 'master' into osu-hd-setting
|
2018-06-06 12:09:12 +09:00 |
|
Dean Herbert
|
26569b434c
|
Merge branch 'master' into fix-replay-updates
|
2018-06-06 09:40:46 +09:00 |
|
Dean Herbert
|
4b604bf055
|
Merge branch 'master' into disallow-beatmap-change
|
2018-06-04 10:53:04 +09:00 |
|
smoogipoo
|
2ccffb9ac4
|
Add difficulty calculation mod types
|
2018-06-03 10:59:56 +09:00 |
|
Dean Herbert
|
88628812c6
|
Logexceptions when loading ruleset DLLs
|
2018-06-03 00:28:29 +09:00 |
|
smoogipoo
|
4eb7a34944
|
Always update children when ruleset input manager is updated
|
2018-05-31 18:02:10 +09:00 |
|
Dean Herbert
|
2f21b9c4ea
|
Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits
|
2018-05-31 12:36:37 +09:00 |
|
Dean Herbert
|
7f0cb0bbf6
|
Add key bindings for scroll speed
Closes #2689.
- [ ] Depends on ppy/osu-framework#1569 being fixed.
|
2018-05-31 12:10:53 +09:00 |
|
smoogipoo
|
8004b8af4d
|
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
|
2018-05-23 17:38:02 +09:00 |
|