HoLLy
|
75a5691c5f
|
Set license header year to 2018, remove old TODO comment
|
2019-01-09 00:51:49 +01:00 |
|
HoLLy
|
41d0bff243
|
Assume katu is part of HitResult.Miss
|
2019-01-09 00:20:15 +01:00 |
|
HoLLy
|
f83163e78e
|
Attempt to implement Catch performance calculator
|
2019-01-08 22:28:48 +01:00 |
|
Dean Herbert
|
4cee21f356
|
Make skinning better
|
2019-01-07 20:12:39 +09:00 |
|
Dean Herbert
|
aec3753863
|
Fix imported replays having excess statistics
|
2019-01-03 14:01:20 +09:00 |
|
Shane Woolcock
|
32ffcb9865
|
Merge branch 'master' into samah-ios
# Conflicts:
# osu.Game/osu.Game.csproj
|
2018-12-29 20:09:00 +10:30 |
|
Shane Woolcock
|
a83bee9461
|
Add ruleset visual tests
|
2018-12-29 20:05:37 +10:30 |
|
smoogipoo
|
b64932f6db
|
Implement hit windows
|
2018-12-27 22:39:15 +09:00 |
|
Ivan Pavluk
|
94f01b6678
|
Remove unused using directives
|
2018-12-06 20:05:03 +07:00 |
|
Ivan Pavluk
|
394c038c33
|
Removed unnecessary JudgementResult casts
|
2018-12-06 19:52:16 +07:00 |
|
Ivan Pavluk
|
407f9d2e78
|
Comment cleanup
|
2018-12-06 19:33:42 +07:00 |
|
Ivan Pavluk
|
aa79758db5
|
Remove unnecessary float literal
|
2018-12-06 19:15:41 +07:00 |
|
Ivan Pavluk
|
1b6658f4ee
|
Move HealthIncreaseFor to Judgement
|
2018-12-06 15:09:42 +07:00 |
|
smoogipoo
|
8eff49bccd
|
Remove User from Replay
|
2018-11-30 18:25:14 +09:00 |
|
smoogipoo
|
b8e60afa69
|
Move replays to an wrapping Score class
|
2018-11-28 18:45:17 +09:00 |
|
smoogipoo
|
219929eb47
|
Score -> ScoreInfo
|
2018-11-28 18:33:01 +09:00 |
|
smoogipoo
|
2ee181daf7
|
Re-namespace replay-related classes
|
2018-11-28 17:20:37 +09:00 |
|
smoogipoo
|
09b79d736b
|
Remove unused usings
|
2018-11-28 16:33:42 +09:00 |
|
smoogipoo
|
5fd6e6ca77
|
Re-namespacing
|
2018-11-28 16:12:57 +09:00 |
|
Dan Balasescu
|
b5fdbe8d87
|
Merge branch 'master' into master
|
2018-11-25 01:38:19 +09:00 |
|
123tris
|
b2d21e4ee0
|
* Corrected misspelling of function in DrawableFruit.cs and refactored all of its use cases
|
2018-11-24 16:50:23 +01:00 |
|
smoogipoo
|
f27bd3ef3e
|
OpenTK -> osuTK
|
2018-11-20 17:14:59 +09:00 |
|
jorolf
|
80bd98bb9d
|
apply suggestions
|
2018-11-15 17:38:38 +01:00 |
|
jorolf
|
41a0f9896e
|
Merge branch 'master' into flashlight-mod
|
2018-11-15 00:35:42 +01:00 |
|
jorolf
|
7d2958b7b0
|
split shader, remove unnecessary clutter and fix some bugs
|
2018-11-15 00:33:13 +01:00 |
|
Dean Herbert
|
8b190edde0
|
Merge branch 'master' into more-global-scrollalgo
|
2018-11-14 13:32:14 +09:00 |
|
Dean Herbert
|
3caf0cb0d9
|
Merge branch 'master' into no-drawable-speedchangevis
|
2018-11-13 19:42:04 +09:00 |
|
smoogipoo
|
d8e7ad8241
|
Fix post-rebase issues
|
2018-11-12 17:36:19 +09:00 |
|
smoogipoo
|
10543cf1b6
|
Move rest of ScrollingPlayfield into ScrollingRulesetContainer
|
2018-11-12 17:34:35 +09:00 |
|
smoogipoo
|
ad45bc7666
|
Move scroll direction to scrollinginfo
|
2018-11-12 17:34:35 +09:00 |
|
smoogipoo
|
7f0f143a1b
|
Move IScrollAlgorithm to ScrollingRulesetContainer + use DI
|
2018-11-12 17:34:35 +09:00 |
|
smoogipoo
|
aee7a80e71
|
ScrollAlgorithm -> ScrollVisualisationMethod
|
2018-11-12 17:26:37 +09:00 |
|
smoogipoo
|
3aba462e52
|
Make Path.Distance a property again
|
2018-11-12 14:07:48 +09:00 |
|
smoogipoo
|
54ab256c8e
|
Instantiate a new path rather than setting properties on it
# Conflicts:
# osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
# osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
# osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
# osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/SliderPath.cs
|
2018-11-12 13:50:19 +09:00 |
|
jorolf
|
023924396d
|
Move flashlight code from OsuModFlashlight to ModFlashlight and implement other modes and break time
|
2018-11-11 18:38:12 +01:00 |
|
smoogipoo
|
f66a9f4f1e
|
Rename IScrollChangeVisualiser -> IScrollAlgorithm
|
2018-11-08 14:04:21 +09:00 |
|
smoogipoo
|
a4caaf56ef
|
Merge remote-tracking branch 'origin/master' into fix-slider-samples
# Conflicts:
# osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
# osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
|
2018-11-05 16:38:28 +09:00 |
|
Dean Herbert
|
bb2f8deb18
|
ControlPoint -> PathControlPoint
Also Curve -> Path.
|
2018-11-01 03:56:51 +09:00 |
|
smoogipoo
|
f674fcf2c8
|
Merge branch 'mask-separation' into editor-mask-placement
# Conflicts:
# osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
# osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
# osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
|
2018-10-26 14:05:30 +09:00 |
|
smoogipoo
|
70f1d17b7e
|
Merge remote-tracking branch 'origin/master' into editor-mask-placement
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
# osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
# osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
# osu.Game/Rulesets/UI/RulesetContainer.cs
|
2018-10-16 17:28:16 +09:00 |
|
smoogipoo
|
47be95ce0b
|
Fix slider nodes using the wrong samples
|
2018-10-16 17:10:24 +09:00 |
|
smoogipoo
|
5095fbcdf7
|
Merge remote-tracking branch 'origin/master' into optimise-diffcalc
|
2018-10-16 10:27:18 +09:00 |
|
Dean Herbert
|
ffbc88c1bf
|
Merge branch 'master' into fix-catch-scale
|
2018-10-12 20:56:37 +09:00 |
|
smoogipoo
|
83fd251c7b
|
Pass sub-controlpoints as span slices
|
2018-10-11 17:44:25 +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 |
|
smoogipoo
|
d0007c047a
|
PlayfieldLayer -> PlayfieldAdjustmentContainer
|
2018-10-05 10:39:18 +09:00 |
|
smoogipoo
|
540a010fbb
|
Implement an intermediary EditRulesetContainer
|
2018-10-03 15:36:24 +09:00 |
|
Hanamuke
|
08f58047c2
|
Remade measurements, turns out the correction was not needed
|
2018-09-30 16:08:17 +02:00 |
|
Hanamuke
|
b983e20067
|
Merge branch 'master' into AR_Catch
|
2018-09-30 16:01:55 +02:00 |
|
smoogipoo
|
cdeb4913c4
|
Adjust catcher size to match stable
|
2018-09-21 15:53:15 +09:00 |
|
smoogipoo
|
c3fa7f167f
|
Move aspect adjustments out of CatchPlayfield
|
2018-09-21 15:53:06 +09:00 |
|
smoogipoo
|
0bc2bcaf14
|
Remove GetAspectAdjustedSize() and PlayfieldArea
|
2018-09-21 15:14:49 +09:00 |
|
smoogipoo
|
26094ea325
|
Simplify + rename playfield layers in Osu/Catch
|
2018-09-21 15:01:58 +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 |
|
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 |
|
Hanamuke
|
e3cc25a96a
|
Implement ConstantScrollingSpeedVisualiser
|
2018-09-18 20:21:10 +02:00 |
|
Dan Balasescu
|
29e023b252
|
Merge branch 'master' into fix_combo
|
2018-09-18 12:54:51 +09:00 |
|
Dean Herbert
|
2d74c088ce
|
Add newline
|
2018-09-15 17:03:51 +09:00 |
|
Hanamuke
|
dd7f667fe3
|
Disable scrolling speed control for osu!catch
|
2018-09-15 00:18:42 +02:00 |
|
Hanamuke
|
a17200a66a
|
Merge branch 'master' into fix_combo
|
2018-09-14 18:48:13 +02:00 |
|
Hanamuke
|
1c2cc3837a
|
Compute combo for nested Objects. Display fruit depending on Combo for
osu!catch
|
2018-09-13 21:52:15 +02:00 |
|
Hanamuke
|
9b6f5c9097
|
Fix redundant paranthesis
|
2018-09-13 17:29:10 +02:00 |
|
Hanamuke
|
7e07a07c01
|
Fix HitObjects being out of order because of nested objects
|
2018-09-13 17:15:46 +02:00 |
|
Hanamuke
|
7d3380db66
|
Fixed comment. Created static CatchArea.GetCatcheWidth method
|
2018-09-13 17:01:33 +02:00 |
|
Hanamuke
|
a3c3bfb1a8
|
Fixes hyperdash computation (for nested objects)
|
2018-09-12 19:48:35 +02:00 |
|
Dean Herbert
|
65018705f4
|
Restore IsLoaded check
|
2018-09-06 13:09:57 +09:00 |
|
Dean Herbert
|
c03d1d9566
|
Attempt to fix CI failures on CatcherArea.Explode
|
2018-09-06 10:14:23 +09:00 |
|
Dean Herbert
|
03084aa04b
|
Revert async changes
|
2018-08-31 07:07:10 +09:00 |
|
smoogipoo
|
1b279d383f
|
Use GetAsync on all textures
|
2018-08-27 17:26:44 +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 |
|
Dan Balasescu
|
c1517e1521
|
Merge branch 'master' into judgement-rework
|
2018-08-06 12:30:46 +09:00 |
|
smoogipoo
|
35b5aeb99a
|
Fix missed rename
|
2018-08-06 12:23:08 +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 |
|
smoogipoo
|
2a4994e5ce
|
Make hitobjects only have one judgement + result
|
2018-08-03 15:38:48 +09:00 |
|
smoogipoo
|
9dff5cea07
|
Make Rulesets.Catch use the new judgement result structure
|
2018-08-02 20:37:07 +09:00 |
|
smoogipoo
|
e825edb6d7
|
Migrate Rulesets.Catch to the new judgement system
|
2018-08-02 15:44:48 +09:00 |
|
Dean Herbert
|
3c06655672
|
Split out Special mods into Automation and Conversion
|
2018-07-31 18:00:42 +09:00 |
|
smoogipoo
|
71c49de031
|
Fix possible nullref if no fruits are ever caught
|
2018-07-26 21:00:18 +09:00 |
|
Dean Herbert
|
0f37758314
|
Update framework
|
2018-07-21 16:21:53 +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
|
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
|
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 |
|
Dean Herbert
|
812929fa05
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess
|
2018-07-02 13:10:42 +09:00 |
|
Dean Herbert
|
c0b65a6a73
|
Change default IsBonus definition and remove unnecessary overrides
|
2018-06-29 17:07:08 +09:00 |
|
Dean Herbert
|
cacabeb67e
|
Remove unused field
|
2018-06-29 17:00:41 +09:00 |
|
Dean Herbert
|
f1a35f77d2
|
Make bananas explode even on miss
|
2018-06-29 16:49:01 +09:00 |
|
Dean Herbert
|
f7fbf61306
|
Centralise judgement logic
|
2018-06-29 15:27:02 +09:00 |
|
Dean Herbert
|
3b262e0d16
|
Use better casting
|
2018-06-29 15:01:33 +09:00 |
|
Dean Herbert
|
0940715631
|
Merge branch 'master' into catch-scoring
|
2018-06-29 14:59:15 +09:00 |
|
smoogipoo
|
4fb276bab7
|
Move hyperdash init to PostProcess
|
2018-06-29 13:52:13 +09:00 |
|
smoogipoo
|
756cabd5d0
|
Add a preprocess method to BeatmapProcessor
|
2018-06-29 12:45:48 +09:00 |
|
smoogipoo
|
80501de4b9
|
Add legacy slider offsets
|
2018-06-27 12:09:21 +09:00 |
|
Dean Herbert
|
1a8aa6eab1
|
Fix regression causing new combos to once again not be respected
|
2018-06-26 20:13:55 +09:00 |
|
Dean Herbert
|
f7f17bab78
|
Merge branch 'master' into catch-droplet-fix
|
2018-06-26 19:29:15 +09:00 |
|
Dean Herbert
|
cc746c0dde
|
Merge remote-tracking branch 'upstream/master' into ekrctb-catch-stable-hyper
|
2018-06-26 13:02:39 +09:00 |
|
Dean Herbert
|
96191fc3ce
|
Move transition variable back to being local to function
|
2018-06-26 13:02:29 +09:00 |
|
ekrctb
|
d6084c0b30
|
Adapt to new input handling changes
|
2018-06-22 18:10:27 +09:00 |
|
Dean Herbert
|
34498f7f86
|
Use var where possible
|
2018-06-21 17:49:04 +09:00 |
|
Dean Herbert
|
c64f64814f
|
Remove unnecessary AimRating
|
2018-06-21 17:32:10 +09:00 |
|
Dean Herbert
|
a9cb214aa9
|
Replace usage of GetEnumerator
|
2018-06-21 16:31:33 +09:00 |
|
smoogipoo
|
afcf91a4c5
|
What the...
|
2018-06-21 13:12:22 +09:00 |
|
smoogipoo
|
9314f49bc3
|
Expose the catch width from the Catcher
|
2018-06-21 12:57:59 +09:00 |
|
smoogipoo
|
5d0c847835
|
Fix post-merge errors
|
2018-06-21 12:26:21 +09:00 |
|
smoogipoo
|
c9581a2d56
|
Merge remote-tracking branch 'origin/master' into catch_star_rating
# Conflicts:
# osu-framework
# osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
# osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
|
2018-06-21 12:15:25 +09:00 |
|
ekrctb
|
9194fd8dfe
|
don't expose HyperDashModifier directly
|
2018-06-20 20:08:27 +09:00 |
|
ekrctb
|
79c5596b27
|
Merge remote-tracking branch 'origin/master' into catch-stable-hyper
|
2018-06-20 19:06:54 +09:00 |
|
ekrctb
|
516b1c5495
|
Fix droplet position clamping
|
2018-06-20 18:29:23 +09:00 |
|
ekrctb
|
9d7e5b4920
|
Clamp juice stream position
|
2018-06-20 17:23:55 +09:00 |
|
Dean Herbert
|
a6437c005c
|
Merge branch 'master' into diffcalc-rework
|
2018-06-15 18:02:18 +09:00 |
|
Dan Balasescu
|
0ba80fad60
|
Merge branch 'master' into droplets-should-bounce
|
2018-06-15 17:34:54 +09:00 |
|
Dean Herbert
|
149d94116b
|
Fix droplets not bouncing off catcher's plate immediately
|
2018-06-15 15:44:47 +09:00 |
|
Dean Herbert
|
2ff7b4cdcf
|
Merge branch 'master' into catch-droplet-fix
|
2018-06-15 14:34:01 +09:00 |
|
smoogipoo
|
e840083ab4
|
Oops fix incorrectly changed file
|
2018-06-14 21:38:08 +09:00 |
|
smoogipoo
|
31bd59442f
|
Remove banana positioning comment
|
2018-06-14 21:38:08 +09:00 |
|
smoogipoo
|
6867a398ca
|
Add one more test case
|
2018-06-14 21:38:08 +09:00 |
|
smoogipoo
|
ced4e61b54
|
Adjust expected output with spinner changes
|
2018-06-14 21:38:08 +09:00 |
|
smoogipoo
|
e1f5498924
|
Discarding 3 times is correct
|
2018-06-14 21:38:08 +09:00 |
|
smoogipoo
|
250e8645e1
|
finalisePosition -> applyPositionOffsets
|
2018-06-14 21:38:08 +09:00 |
|
smoogipoo
|
9b403b0053
|
Fix non-catch beatmaps not getting properly converted
Because Osu.ConvertSpinner implements IHasXPosition.
|
2018-06-14 21:38:08 +09:00 |
|
smoogipoo
|
a97a7e13bd
|
Rework RNG discarding comment
|
2018-06-14 21:38:08 +09:00 |
|
smoogipoo
|
cafdbc2d25
|
Fix discarding too many RNG values, and add test
|
2018-06-14 21:38:08 +09:00 |
|
Dean Herbert
|
c41a50bf24
|
Fix combos ending with JuiceStreams never leaving the catcher's plate
Closes #2634.
|
2018-06-14 16:39:31 +09:00 |
|
smoogipoo
|
6ff06d4757
|
Adjust CatchDifficultyCalculator in-line with changes
|
2018-06-14 15:48:56 +09:00 |
|
Dan Balasescu
|
cbb883614a
|
Merge branch 'master' into catch-droplet-fix
|
2018-06-13 15:18:52 +09:00 |
|
clayton
|
785c24b11b
|
Check for null CatchJudgement
|
2018-06-11 13:30:30 -07:00 |
|
clayton
|
d3ada7914c
|
Fix condition for dropping health on miss
|
2018-06-11 13:29:36 -07:00 |
|
clayton
|
e44e08201b
|
Remove unnecessary usings and move Banana out of BananaShower
|
2018-06-11 12:43:01 -07:00 |
|
clayton
|
3e6e2ac09a
|
Add CatchBananaShowerJudgements in simulated autoplays
|
2018-06-09 18:23:05 -07:00 |
|
Crusensis
|
fbc0cd6f5f
|
Split AffectsCombo into IsBonus
|
2018-06-09 18:14:33 -07:00 |
|
clayton
|
808118e4d4
|
Add health drain to catch
|
2018-06-09 17:39:17 -07:00 |
|
clayton
|
f486bcfee1
|
Add judgements to catch
|
2018-06-09 17:38:17 -07:00 |
|
smoogipoo
|
83ff47ec80
|
Rewrite difficulty mod combinations
|
2018-06-06 16:20:17 +09:00 |
|
smoogipoo
|
8274623ad6
|
Cleanup multi mod constructions
|
2018-06-06 14:07:50 +09:00 |
|
ekrctb
|
25d3f0ead1
|
Revert TestCaseCatcherArea
|
2018-06-03 15:31:51 +09:00 |
|
ekrctb
|
9f27dd848a
|
HyperDashModifier >= 1
|
2018-06-03 15:29:56 +09:00 |
|
ekrctb
|
dd7d54bcc7
|
Merge remote-tracking branch 'origin/master' into catch-stable-hyper
|
2018-06-02 18:42:40 +09:00 |
|
Dean Herbert
|
b7511251d9
|
Remove pointless FillMode specification
|
2018-05-31 12:50:01 +09:00 |
|
Dan Balasescu
|
9924ec9606
|
Merge branch 'master' into catch-sizing-fixes
|
2018-05-31 12:31:52 +09:00 |
|
ekrctb
|
0b7fdd4e8d
|
Merge branch 'master' into catch-stable-hyper
|
2018-05-29 18:52:09 +09:00 |
|
Dean Herbert
|
8b2a6b8cce
|
Fix formatting
|
2018-05-26 12:38:33 +09:00 |
|
ekrctb
|
456dc81f2f
|
Fix InspectCode issues
|
2018-05-25 19:18:11 +09:00 |
|
ekrctb
|
26c6313dec
|
catch: the fruit positions are finalized on the post process
|
2018-05-25 19:11:29 +09:00 |
|
ekrctb
|
8c8e87ed7a
|
Make FastRandom public
|
2018-05-25 18:57:59 +09:00 |
|