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 |
|