Vperus
ac8fe6045f
Fixed typo
...
Changed CreateReourceStore() to CreateResourceStore()
2019-09-20 19:58:39 +03:00
Andrei Zavatski
0cf4db899f
Few cleanups
2019-09-19 17:03:52 +03:00
Andrei Zavatski
529a1c3b91
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-09-19 16:46:58 +03:00
Dean Herbert
0640b2eb35
Fix judgement sizes not matching legacy skins ( #6145 )
...
Fix judgement sizes not matching legacy skins
2019-09-19 18:49:35 +09:00
Dean Herbert
3abcd898a6
Add hit lighting ( #6144 )
...
Add hit lighting
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-19 18:49:22 +09:00
Dan Balasescu
027d6194f2
Merge branch 'master' into add-hit-lighting
2019-09-19 18:07:29 +09:00
smoogipoo
bc9941a990
Newline required when xmldocs are involved
2019-09-19 18:00:11 +09:00
smoogipoo
65276cd235
Remove whitespace
2019-09-19 17:58:10 +09:00
smoogipoo
db24cfbead
Merge remote-tracking branch 'origin/master' into auto-restart-mod-perfect
...
# Conflicts:
# osu.Game/Screens/Play/Player.cs
2019-09-19 17:57:04 +09:00
smoogipoo
da15b900f7
Remove virtual member from ModBlockFail
2019-09-19 17:44:24 +09:00
Dean Herbert
e6c36a8bc7
Fix scaling mode being applied to judgements
2019-09-19 17:36:32 +09:00
Dean Herbert
2cd7c769e1
Merge remote-tracking branch 'upstream/master' into fix-judgement-size
2019-09-19 16:32:37 +09:00
smoogipoo
762adb783a
Fix duplicate invocation of updateState on load complete
2019-09-19 14:15:06 +09:00
Dean Herbert
2296ea75d7
Add reference to xmldoc
...
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
2019-09-19 02:03:30 +09:00
Dean Herbert
1150e9fdfb
Bring other mods up-to-date
2019-09-19 01:45:42 +09:00
Dean Herbert
ff3a7c1d13
Merge remote-tracking branch 'upstream/master' into auto-restart-mod-perfect
2019-09-19 01:36:29 +09:00
Dean Herbert
5901a915e7
Always update drawable hitobject state on skin change
2019-09-18 20:19:57 +09:00
Dean Herbert
26eca5b1f4
Fix judgement sizes not matching skins stable
2019-09-18 02:56:03 +09:00
Dean Herbert
ba76f09c99
Add initial implementation of hit lighting
...
Requires a supporting skin, like osu!classic for now.
2019-09-18 02:49:54 +09:00
Dean Herbert
38d85e44be
Merge branch 'master' into key-counter-fixes
2019-09-17 22:33:15 +09:00
Dean Herbert
624e5644a4
Change osu!catch key trigger to occur on frame before positional change
2019-09-13 23:06:35 +09:00
Dan Balasescu
b10ce0b12d
Merge branch 'master' into key-counter-fixes
2019-09-13 19:43:33 +09:00
Dan Balasescu
125b3fda6c
Merge branch 'master' into improve-catch-replay-frames
2019-09-13 19:23:15 +09:00
Dean Herbert
b81b162ee1
Update InitialLifetimeOffset comment
2019-09-12 19:30:27 +09:00
Dean Herbert
9fc60aeefc
Merge branch 'master' into reset-dho-lifetimes
2019-09-12 19:29:14 +09:00
Dean Herbert
f21e47d6d2
Move expire to DrawableHitObject
2019-09-12 19:29:08 +09:00
Dean Herbert
1dfd104690
Merge branch 'improve-catch-replay-frames' into key-counter-fixes
2019-09-12 18:34:00 +09:00
Dean Herbert
acdfeef1dc
Improve how osu!catch stores and replays key actions
2019-09-12 18:33:46 +09:00
Dean Herbert
0cdf125c1e
Handle key counter rewinding in a better way
...
Use ElapsedFrameTime rather than storing state data
2019-09-12 15:42:14 +09:00
Dean Herbert
af3bb5a2cd
Centralise and share bar line generation code between rulesets
2019-09-10 13:30:54 +09:00
Dean Herbert
07fce8397b
Move reset call to ctor
2019-09-09 14:24:17 +09:00
iiSaLMaN
be803fa921
Reset score processor before starting the simulation
2019-09-07 18:15:49 +03:00
iiSaLMaN
55b2bc1ed5
Set Health default value to 1
2019-09-07 18:03:04 +03:00
Dean Herbert
7f2d14416a
Reset DrawableHitObject lifetimes on state change
2019-09-07 14:44:44 +09:00
Dean Herbert
b89fb5cdf7
Fix failing test
2019-09-06 16:51:30 +09:00
Dean Herbert
6ce36bd39e
Merge branch 'master' into stop-counting-to-score-after-fail
2019-09-06 16:12:53 +09:00
Dean Herbert
a50284a5eb
Merge pull request #6019 from peppy/hit-window-refactor
...
Refactor HitWindows for legibility
2019-09-06 16:10:04 +09:00
Dean Herbert
985375d1c6
Remove private field xmldoc
2019-09-06 15:47:01 +09:00
Dean Herbert
4031f51745
More permissive IsHitResultAllow by default
2019-09-06 15:37:30 +09:00
Dean Herbert
c379480e7b
Merge branch 'master' into remove-judgement-occurred
2019-09-06 15:32:34 +09:00
Dean Herbert
f925e781a9
Refactor HitWindows for legibility
2019-09-06 15:24:14 +09:00
Dean Herbert
bf6f803e69
Nest temporary class
2019-09-06 12:12:27 +09:00
Dean Herbert
7d1f5310d2
Don't implement anything
2019-09-06 12:03:29 +09:00
Dan Balasescu
5dbdce17a7
Merge branch 'master' into fix-sample-fallback
2019-09-06 11:27:39 +09:00
Dean Herbert
50985d1b1d
Fix disposal logic
2019-09-06 10:43:19 +09:00
Dean Herbert
d6cdde552d
Add comment explaining dispose logic
2019-09-06 01:14:37 +09:00
Dean Herbert
dafe9da851
Dispose config managers ahead of time to avoid database errors
2019-09-06 00:22:35 +09:00
Dean Herbert
60c2d113b8
Fix typo
2019-09-05 23:07:03 +09:00
Dean Herbert
0a6c42972c
Add back missing sample fallback to default skin
2019-09-05 23:01:35 +09:00
Dean Herbert
c0bcbfd892
Merge branch 'master'
...
Conflicts:
osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
2019-09-05 14:40:30 +09:00
Dean Herbert
2c871c52f1
Add automatic resource mapping for rulesets to their own dll ( #5988 )
...
Add automatic resource mapping for rulesets to their own dll
2019-09-05 14:18:12 +09:00
Dean Herbert
8e8f33ec7b
Remove null hinting for now
2019-09-04 21:35:59 +09:00
Dean Herbert
6197c7fd31
Add automatic resource mapping for rulesets to their own dll
2019-09-04 20:29:28 +09:00
Dean Herbert
b80a8296cd
Fix unavailable rulesets crashing at song select
2019-09-04 20:28:52 +09:00
smoogipoo
07f662071d
Remove judgementOccurred
2019-09-04 18:14:55 +09:00
Andrei Zavatski
04111cc3b7
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-09-04 02:46:23 +03:00
Dean Herbert
bebc3309ce
Refactor skin configuration to be infinitely extensible
2019-09-03 17:57:34 +09:00
Dean Herbert
05ed9d3802
Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements
2019-09-03 13:07:58 +09:00
Dean Herbert
4cad55cee6
Move hit windows lookup to DrawableRuleset
2019-09-03 13:05:03 +09:00
Dean Herbert
0261456d5a
Merge branch 'master' into play-to-gameplay
2019-09-03 11:42:15 +09:00
Dean Herbert
09097f7680
Merge branch 'master' into iskincomponent
2019-09-02 22:38:57 +09:00
Dean Herbert
91e3eeb1c0
Merge branch 'master' into beatmap-mod-selector
2019-09-02 21:35:42 +09:00
Dean Herbert
1e7528c2b3
Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements
2019-09-02 19:13:00 +09:00
smoogipoo
f20e07136a
Add attribute to catch potential future nullrefs
2019-09-02 17:48:41 +09:00
smoogipoo
f6102b4d92
Adjust xmldoc
2019-09-02 17:15:36 +09:00
smoogipoo
0c73c5acf3
Expose full hitobject rather than hit windows
2019-09-02 17:14:40 +09:00
smoogipoo
f2bdf94a1d
Add HitWindows to JudgementResult to indicate timing errors
2019-09-02 16:28:14 +09:00
Dean Herbert
e1e4c00a15
Merge branch 'master' into improve-scrolling-ruleset-performance
2019-09-02 15:09:48 +09:00
smoogipoo
d74e1b9b64
Remove from dictionary on Remove()
2019-09-02 15:06:43 +09:00
smoogipoo
8f8d35bd15
Delay initial hitobject state computation
2019-09-02 15:06:34 +09:00
Dean Herbert
f9fcf1562f
Merge remote-tracking branch 'upstream/master' into iskincomponent
2019-09-02 14:21:02 +09:00
smoogipoo
2945fef62d
Expose HasCompleted from ScoreProcessor
2019-09-02 13:04:30 +09:00
Dean Herbert
7ca51d3866
Fix resume overlay being drawn below cursor
...
Closes #5905 .
2019-09-02 11:20:55 +09:00
Dean Herbert
8f5dc06d55
Merge remote-tracking branch 'upstream/master' into accuracy-bar
2019-08-30 20:18:25 +09:00
Dean Herbert
741bd0a5cf
Fix incorrect colour sizes and simplify alignment specification
2019-08-30 18:35:17 +09:00
Dean Herbert
70e417533f
Update naming
2019-08-30 15:13:29 +09:00
Dean Herbert
a15828ab25
Introduce the concept of SkinComponents
...
Removes reliance on string lookups and better defines elements for introduction into database
2019-08-30 14:55:52 +09:00
Dean Herbert
dc1046bf0c
Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin
2019-08-30 12:53:05 +09:00
smoogipoo
6ab2b20c70
Add an interface for working beatmaps
2019-08-29 19:38:44 +09:00
Dan Balasescu
d8a48a37d1
Merge branch 'master' into editor-refactor
2019-08-29 18:22:42 +09:00
smoogipoo
714ee312da
Rename DrawableEditRuleset -> DrawableEditRulesetWrapper
2019-08-29 18:20:43 +09:00
Dean Herbert
98626018fd
Encapsulate editor hitobject additions/removals ( #5878 )
...
Encapsulate editor hitobject additions/removals
2019-08-29 18:20:24 +09:00
smoogipoo
87e28ab1f9
Remove non-generic DrawableEditRuleset
2019-08-29 18:12:29 +09:00
smoogipoo
59296d12f3
Refactor HitObjectComposer
2019-08-29 18:02:50 +09:00
smoogipoo
0fbdcabb6f
Re-use a single beatmap processor
2019-08-29 17:21:52 +09:00
smoogipoo
b40143cb73
Remove unnecessary comment
2019-08-29 17:18:34 +09:00
smoogipoo
dad0fa2dca
Bind disposal
2019-08-29 16:31:40 +09:00
smoogipoo
5db813b7a4
Add secondary interface for further abstraction
2019-08-29 16:26:39 +09:00
smoogipoo
7927b684d3
Hook up + use editor beatmap
2019-08-29 16:06:40 +09:00
smoogipoo
6949c96aaa
Add initial EditorBeatmap structure
2019-08-29 15:17:27 +09:00
Dean Herbert
1597cf874e
Merge branch 'master' into relative-beat-lengths
2019-08-28 20:26:20 +09:00
Dean Herbert
f6ad95018a
Centralise default beat length specification
2019-08-28 20:22:16 +09:00
Dean Herbert
ecfcbe3723
Merge remote-tracking branch 'upstream/master' into relative-beat-lengths
2019-08-28 20:21:56 +09:00
Dean Herbert
9a98f39f06
Share logic with other rulesets (and make default)
2019-08-28 18:12:47 +09:00
Dean Herbert
7ea55a5cdd
Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin
2019-08-28 16:36:20 +09:00
Dean Herbert
7ccc409df7
Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin
2019-08-27 18:27:26 +09:00
smoogipoo
9e926d44c0
Obsolete legacy UpdateState() method
2019-08-27 16:09:47 +09:00
Dean Herbert
6aab7168d4
Merge branch 'master' into relative-beat-lengths
2019-08-27 10:59:52 +09:00
Dean Herbert
07380af877
Merge branch 'master' into scrolling-lifetime-safety
2019-08-26 19:07:05 +09:00
Dean Herbert
0422c19c2f
Group lifetime setters together
2019-08-26 19:06:23 +09:00
Dean Herbert
dffb2d6474
Merge branch 'master' into relative-beat-lengths
2019-08-26 18:59:50 +09:00
Dean Herbert
28dc51279a
Allow RulesetConfigCache to return null configs ( #5835 )
...
Allow RulesetConfigCache to return null configs
2019-08-26 18:59:26 +09:00
Dean Herbert
b41bed8ba0
Add nullref safety to FrameStablePlayback boolean ( #5834 )
...
Add nullref safety to FrameStablePlayback boolean
2019-08-26 18:58:27 +09:00
smoogipoo
fd4c6e08ca
Merge remote-tracking branch 'origin/master'
2019-08-26 17:37:06 +09:00
smoogipoo
fb1cd9e5e7
Add a sane default lifetime end for scrolling hitobjects
2019-08-26 16:47:23 +09:00
smoogipoo
6dfe95db74
Allow RulesetConfigCache to return null configs
2019-08-26 16:34:12 +09:00
smoogipoo
6596d7fc46
Add nullref safety to FrameStablePlayback boolean
2019-08-26 16:33:24 +09:00
smoogipoo
1cfe2b7de8
Fix timing points beyond the end time potentially becoming dominant
2019-08-26 16:31:34 +09:00
smoogipoo
d99c60adc7
Provide a way to scale beat lengths relative to each other
2019-08-26 12:51:13 +09:00
Dean Herbert
5e362d10b1
Add ruleset-specific legacy skin providers
...
This moves implementation of osu! skinnables to OsuLegacySkin.
2019-08-26 12:21:49 +09:00
Dean Herbert
acc07c1d65
Remove mod icon offset
2019-08-21 22:18:29 +09:00
iiSaLMaN
439d825dd1
Disallow adding bonus judgements' result to statistics
2019-08-20 18:39:29 +03:00
Desconocidosmh
b3556403aa
Make GetNextObject() a virtual method
2019-08-19 16:18:25 +02:00
Dean Herbert
152df9f3d5
Remove accidental blank line
2019-08-16 20:23:09 +09:00
Dean Herbert
d11b896148
Move FrameStablePlayback handling to early return
2019-08-16 20:21:00 +09:00
Dean Herbert
58d2268b9e
Combine conditionals that provide the same behaviour
2019-08-16 19:52:35 +09:00
smoogipoo
8c67f58e2d
Disable frame-stable playback in the editor
2019-08-15 18:25:31 +09:00
Dean Herbert
bd61642ac6
Merge branch 'master' into beatmap-mod-selector
2019-08-13 00:54:21 +09:00
iiSaLMaN
883102ee5d
Move score multiplier logic inside score calculation
2019-08-12 16:40:52 +03:00
Andrei Zavatski
b71c776e65
Add web-like hover behavior
2019-08-12 16:20:36 +03:00
Andrei Zavatski
62a91e4aaa
Add the ability to override Highlighted action to the ModIcon
2019-08-12 15:20:21 +03:00
Andrei Zavatski
16b6ed846f
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-08-12 14:46:24 +03:00
Dean Herbert
90b1fe81f3
Update cached usage in line with framework changes
2019-08-09 19:12:29 +09:00
Dean Herbert
29870c773c
Merge branch 'master' into stop-counting-to-score-after-fail
2019-08-09 14:16:34 +09:00
smoogipoo
a9c4b5ac4e
Add tests
2019-08-09 14:04:56 +09:00
smoogipoo
33f4b628a5
Make HasFailed private set
2019-08-09 13:42:02 +09:00
smoogipoo
88fa06efba
Refactor as proposed
2019-08-09 13:38:04 +09:00
Dean Herbert
dbb3b583cf
Log error for invalid beatmap/storyboard events instead of thro… ( #5611 )
...
Log error for invalid beatmap/storyboard events instead of throwing
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-08-09 12:56:47 +09:00
Dean Herbert
7e9c100c9b
Apply new resharper refactors
2019-08-09 12:29:33 +09:00
iiSaLMaN
566d874641
Prevent failing when reverting to a hasFailedAtJudgement
2019-08-08 15:25:07 +03:00
smoogipoo
de4ad1f625
Fix bad log message
2019-08-08 14:44:49 +09:00
smoogipoo
ac2060f1cf
Throw exceptions and let LegacyDecoder handle them
2019-08-08 14:44:04 +09:00
Dean Herbert
a345955f45
Add mentions linking ScoreProcessor apply/revert methods together
2019-08-08 13:57:04 +09:00
iiSaLMaN
c77e6074f6
Disallow adding to score after the player has failed
2019-08-07 19:58:26 +03:00
Andrei Zavatski
d9fd054102
Merge master with conflicts resolved
2019-08-07 16:05:28 +03:00
Dan Balasescu
df784e1d8e
Merge branch 'master' into mod-icon-improvements
2019-08-07 19:43:52 +09:00
Dean Herbert
b0e0659715
Dispose instead
2019-08-07 17:33:30 +09:00
Dean Herbert
c6d481238d
Move QuadBatch to a local variable to stop resharper complaining
2019-08-07 16:56:22 +09:00
Andrei Zavatski
1d42f0959a
ModIcon improvements
2019-08-07 08:46:27 +03:00
Andrei Zavatski
87974850dd
Initial implementation
2019-08-07 08:42:43 +03:00
smoogipoo
0ff1c6184b
Add generation comment
2019-08-01 17:36:20 +09:00
smoogipoo
a2468e599b
Fix ticks in repeat spans being returned in reverse order
2019-08-01 17:31:37 +09:00
smoogipoo
bc80fa11bb
Mode IApplicableToBeatmap application to WorkingBeatmap
2019-08-01 12:41:46 +09:00
smoogipoo
8a64ab0384
Remove generics from IApplicableToBeatmap
2019-08-01 12:39:32 +09:00
smoogipoo
e57663b39c
Apply mod score multipliers
2019-07-31 17:55:22 +09:00
smoogipoo
6bfac9f8e4
Remove protected ctor
2019-07-31 17:50:13 +09:00
Dean Herbert
894d573fbc
Cache DrawableHitObject for skinnables to access ( #5463 )
...
Cache DrawableHitObject for skinnables to access
2019-07-29 18:49:37 +09:00
Dan Balasescu
7779302e82
Merge branch 'master' into skin-scaling-modes
2019-07-29 17:47:07 +09:00
iiSaLMaN
ba4045a761
Fix transforming mods not working properly
...
Hidden, Grow, Deflate, etc..
2019-07-27 00:22:40 +03:00
Dean Herbert
eb6bda3f08
Cache DrawableHitObject for skinnables to access
2019-07-25 16:03:07 +09:00
Dean Herbert
efad9b3150
Merge branch 'master' into skin-scaling-modes
2019-07-24 18:37:31 +09:00
smoogipoo
4e7e2d1d52
Adjust comments
2019-07-23 21:16:09 +09:00
smoogipoo
74b09c72fa
Refactor state updates to convert State into an IBindable
2019-07-23 21:16:09 +09:00
Dan Balasescu
9b526ef61e
Merge branch 'master' into move-state-logic
2019-07-23 20:37:57 +09:00
Dean Herbert
91e21688d8
Make AccentColour a bindable ( #5420 )
...
Make AccentColour a bindable
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-07-23 20:37:47 +09:00
smoogipoo
776757545d
Fix FTB causing flashlight to block vision correctly
2019-07-23 15:17:02 +09:00
Dean Herbert
d5ee4cbc9c
Move TouchDevice mod to new "system" category
2019-07-23 13:14:28 +09:00
Dean Herbert
d4d286c988
Add full documentation
2019-07-22 16:08:38 +09:00
Dean Herbert
c3b81bef4a
Flip default to the preferred method going forward
2019-07-22 15:55:38 +09:00
Dean Herbert
be170b4124
Naming and documentation improvements
2019-07-22 15:50:02 +09:00
Dean Herbert
91f86adb66
Move DrawableHitObject state management to base class
2019-07-22 15:07:12 +09:00
Dean Herbert
8327452fe1
Make AccentColour a bindable
2019-07-22 14:48:59 +09:00
Dean Herbert
74c961bcff
Add more flexible skin element confine modes
2019-07-22 14:42:56 +09:00
Dean Herbert
f1423b8cb5
Add more brackets
2019-07-18 00:03:04 +09:00
Dean Herbert
3e57fcf5c5
Merge remote-tracking branch 'upstream/master' into cleanup-slider-bodies
2019-07-17 22:11:01 +09:00
Dean Herbert
1a19cf0739
Fix 0-length sliders not getting correct lengths ( #5033 )
...
Fix 0-length sliders not getting correct lengths
2019-07-17 18:01:57 +09:00
smoogipoo
a9286fee07
Recycle slider paths when the parenting slider dies
2019-07-17 16:20:27 +09:00
smoogipoo
ed203cb0ff
Delay intial hitobject updates
2019-07-16 13:45:59 +09:00
Dean Herbert
d0c8aaba4e
Override basic equality function too
2019-07-15 15:50:50 +09:00
Dean Herbert
9c1badd2e3
Fix rulesets not matching in dictionary lookups due to missing GetHashCode implementation
2019-07-15 15:42:54 +09:00
Dean Herbert
80ddfc3b1e
Disable frame accurate replay playback
...
I want to prioritise better playback performance over accuracy for now. Also, in my testing this is still 100% accurate due to the addition of the FrameStabilityContainer, which is pretty cool.
2019-07-10 10:27:51 +09:00
Dean Herbert
84919d70bb
Health bar -> Health display
...
Also inverts logic
2019-07-07 05:30:30 +09:00
Salman Ahmed
1f13b94c72
Fix build error
2019-07-06 18:44:55 +03:00
Salman Ahmed
a42c79895d
Remove unnecessary private field
2019-07-06 18:38:41 +03:00
Salman Ahmed
dfabed3d85
Merge branch 'master' into applicable-to-hud
2019-07-06 16:30:02 +03:00
iiSaLMaN
530e07110f
Use a descriptive name for the setting
2019-07-06 06:32:25 +03:00
smoogipoo
5862eb172a
Merge remote-tracking branch 'origin/master' into fix-zero-length-sliders
...
# Conflicts:
# 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
2019-07-05 15:48:04 +09:30
Dean Herbert
8120bb36bc
More methods
2019-07-03 18:42:10 +09:00
Dean Herbert
06ef8f71e9
Fix typo
2019-07-03 18:41:01 +09:00
Dean Herbert
62dd89197c
Refactor comment slightly
2019-07-03 18:36:04 +09:00
miterosan
5ecb764cdc
Remove whitespaces and lowercase the comments
2019-07-03 10:57:09 +02:00
miterosan
43d7f66c5b
Add comment about the android ruleset situation.
2019-07-03 10:54:10 +02:00
miterosan
ab244d1b7f
Only log that the rulesets could not be loaded from a directory.
2019-07-03 10:21:18 +02:00
miterosan
d9e646d9ef
Use addRuleset inside loadRulesetFromFile
2019-07-03 09:51:09 +02:00
Salman Ahmed
98daaf634a
Simplify changes
2019-07-03 06:44:17 +03:00
Salman Ahmed
3f39541cc2
Fade health bar on value change
2019-07-03 05:11:11 +03:00
miterosan
f1ceea8361
style fixes
2019-07-02 17:25:12 +02:00
miterosan
778c36c7d7
Allow discover of rulesets that are already loaded.
2019-07-02 17:05:04 +02:00
Salman Ahmed
744e651a37
Merge branch 'master' into applicable-to-hud
2019-07-02 05:24:56 +03:00
Salman Ahmed
a8e8650ddd
Move blocking fail logic into a base class
2019-07-02 01:47:39 +03:00
Dean Herbert
60ea3d4e1a
Fix skinning support for combobreak
2019-06-30 21:58:30 +09:00
iiSaLMaN
41597efdf7
Hide health bar in no fail
2019-06-29 04:25:52 +03:00
iiSaLMaN
d37cefbad8
Implement IApplicableToHUD
2019-06-29 04:23:59 +03:00
smoogipoo
a6ee83eac2
Merge remote-tracking branch 'origin/master' into fix-zero-length-sliders
2019-06-27 19:57:21 +09:00
Dean Herbert
ba48331fcb
Remove no longer necessary HandleInput overrides
2019-06-27 18:34:59 +09:00
smoogipoo
6ce86e6083
General refactoring
2019-06-26 17:52:25 +09:00
Andrei Zavatski
4a05c560cf
Remove unwanted class and move the bind logic outside the RulesetSelector
2019-06-24 23:13:28 +03:00
Andrei Zavatski
35db20a337
Remove useless bindable check
2019-06-24 02:01:00 +03:00
Andrei Zavatski
60ff497add
Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor
2019-06-24 01:06:54 +03:00
David Zhao
de59e038ac
Prevent non-combo affecting judgements from triggering sudden death
2019-06-21 14:29:16 +09:00
Andrei Zavatski
413c2158e2
Simplify bindables usage
2019-06-18 01:11:05 +03:00
Andrei Zavatski
c95e3da3ec
Implement a BindableRulesetSelector
2019-06-18 00:23:00 +03:00
Andrei Zavatski
cecbcd21b2
Merge remote-tracking branch 'upstream/master' into toolbar-rulesets-refactor
2019-06-17 23:12:55 +03:00
smoogipoo
2e7922c3f9
Fix 0-length sliders not getting correct lengths
2019-06-15 23:53:28 +09:00
Dean Herbert
cf713fbacc
Merge branch 'master' into fix-stacking-shaking
2019-06-14 22:16:35 +09:00
smoogipoo
4818187d8f
Reset result timeoffset to 0 when rewound
2019-06-13 14:55:52 +09:00
smoogipoo
27fdda8b91
Don't update hitobject results when rewinding
2019-06-13 12:21:49 +09:00
EVAST9919
e5a6d920cd
Implement an abstract RulesetSelector class
2019-06-12 23:23:01 +03:00
Dean Herbert
00ee45fe46
Merge remote-tracking branch 'origin/update-visibility-container' into update-framework
2019-06-11 19:36:13 +09:00
Dean Herbert
5c2c4f0ada
Merge pull request #4878 from HoLLy-HaCKeR/expose-skills
...
Expose skills in DifficultyAttributes
2019-06-11 18:47:56 +09:00
Arphox
07e17518e9
Fix all "Maintainability" CodeFactor issues
2019-06-11 10:28:16 +02:00
Dean Herbert
609a82bc94
Update VisibilityContainer usage in line with framework
2019-06-11 15:13:58 +09:00
Dan Balasescu
346c4310c3
Merge branch 'master' into fail-animation
2019-06-07 20:48:36 +09:00
smoogipoo
c7d0fcd42a
Update drawnodes
2019-06-06 16:49:35 +09:00
Dean Herbert
9c214c3f0e
Add animation on failing
2019-06-04 16:13:16 +09:00
HoLLy
2a295545a7
Don't mutate strainPeaks
2019-05-29 11:25:25 +02:00
HoLLy
7e9f5a0939
Add Skills to DifficultyAttributes
2019-05-29 11:22:51 +02:00
Paul Teng
1c3b768266
Use Precision.AlmostBigger
2019-05-12 09:02:22 -04:00
Paul Teng
1a6c8e91a5
Compare Health with small value
2019-05-12 08:44:20 -04:00
smoogipoo
3fe61c4a7e
Trim whitespace
2019-05-10 18:48:39 +09:00
Dan Balasescu
425154c264
Merge branch 'master' into progress-bar-show-seek
2019-05-10 18:24:15 +09:00
smoogipoo
ad4b4f3422
Use nullable cancellation tokens
2019-05-10 17:42:45 +09:00
Dean Herbert
a44296a6db
Merge branch 'master' into progress-bar-show-seek
2019-05-10 17:27:49 +09:00
Dean Herbert
21ab628f41
Merge branch 'master' into player-load-cancellations
2019-05-10 16:58:36 +09:00
smoogipoo
d25d39b315
Add cancellation to storyboard/hitobject loading
2019-05-10 16:31:09 +09:00
Dan Balasescu
32808a8a59
Merge branch 'master' into fix-long-skip-performance
2019-05-10 16:10:50 +09:00
David Zhao
5c096cbc91
Revert mirroring condition too
2019-05-09 18:59:00 +09:00
David Zhao
9e0af723cc
Split out affectscombo change
2019-05-09 18:56:19 +09:00
Dean Herbert
9248e6290c
Use FrameStabilityClock to denote current position on song progress
2019-05-09 18:09:26 +09:00
Dean Herbert
3bcfc86b9c
Allow custom MaxCatchUpFrames to be specified
...
Also adjusts the default to allow for smoother seeking.
2019-05-09 16:39:03 +09:00
Dean Herbert
66594b7a1b
Pass GameplayStartTime to FrameStabilityContainer to allow bypassing prior to start
2019-05-09 16:39:03 +09:00
David Zhao
b0e34d86d5
Subtract a result from count if its been reverted
2019-05-09 16:16:20 +09:00
David Zhao
39fb5712f1
Only combo-incrementing results add to result count
2019-05-09 15:31:37 +09:00
smoogipoo
39efa2d173
Fix possible cross-thread config cache access
2019-05-08 19:05:00 +09:00
smoogipoo
117f8bdd01
Merge remote-tracking branch 'Joehuu/master' into flashlight-dim
2019-05-08 13:25:01 +09:00
smoogipoo
13b9b04bb8
Apply more cases/fix some existing ones
2019-05-07 13:23:09 +09:00
smoogipoo
d7c09e7dbd
Merge remote-tracking branch 'origin/master' into fix-new-inspections
...
# Conflicts:
# osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
# osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
# osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
# osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
# osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Graphics/OsuFont.cs
# osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
David Zhao
abc163fa36
Fix merge
2019-05-07 12:07:45 +09:00
David Zhao
732b0b22a3
Merge remote-tracking branch 'upstream/master' into flashlight-dim
2019-05-07 12:04:58 +09:00
Dean Herbert
6bdaca1e3b
Fix mod equality checks not working as intended
2019-05-03 10:09:47 +09:00
Dean Herbert
6a4dc5e25c
Improve xmldoc slightly
2019-05-02 14:03:58 +09:00
iiSaLMaN
ddd9262384
fix xmldoc
2019-04-30 19:08:31 +03:00
iiSaLMaN
3b03ca802a
Merge branch 'master' into sh-xh-grading-2
2019-04-30 18:55:35 +03:00
iiSaLMaN
148f4c4ce0
Pass Rank.Value instead
...
Passing Rank.Value along each iteration instead of calculating.
2019-04-30 18:49:31 +03:00
iiSaLMaN
e0abd0b2c1
fix comment
2019-04-30 18:44:31 +03:00
iiSaLMaN
665558c297
Remove unnecessary comment
2019-04-30 18:44:06 +03:00
iiSaLMaN
5d50316ae7
Add xmldoc
2019-04-30 18:12:27 +03:00
Dean Herbert
d40177f97c
Merge branch 'master' into drawnode-composability
2019-04-27 18:41:19 +09:00
iiSaLMaN
b08fb5136e
Merge branch 'master' into sh-xh-grading-2
2019-04-26 10:38:10 +03:00
David Zhao
9da13cb463
Merge branch 'master' into flashlight-dim
2019-04-25 23:15:15 +09:00
KingLuigi4932
619071b7ee
Unnecessary 'using' directive
2019-04-25 14:23:00 +03:00
KingLuigi4932
4e0f21102b
Merge branch 'sh-xh-grading-2' of https://github.com/iiSaLMaN/osu into sh-xh-grading-2
2019-04-25 14:04:12 +03:00
KingLuigi4932
c6b3197dd0
Add AdjustRank and use it in Hidden Mod
2019-04-25 13:56:57 +03:00
smoogipoo
0bd35ab7bb
Turn on warnings, resolve issues
2019-04-25 17:36:17 +09:00
iiSaLMaN
d3bc443810
Merge branch 'master' into sh-xh-grading-2
2019-04-25 06:11:07 +03:00
Dean Herbert
4f31eee5ad
Merge branch 'master' into flashlight-dim
2019-04-24 17:01:11 +09:00
Dean Herbert
60328cf1fb
Ensure FrameStabilityContainer's ElapsedTime is zero on initial seek
2019-04-24 15:25:53 +09:00
Dean Herbert
80e1568e97
Fix FrameStabilityContainer performing frame-stable seeks
2019-04-24 15:25:52 +09:00
iiSaLMaN
a29c7d81ee
Merge branch 'master' into sh-xh-grading-2
2019-04-23 10:31:17 +03:00
David Zhao
9890884726
Remove fade in, update comment
2019-04-23 14:23:09 +09:00
smoogipoo
6c568d228f
Add comment
2019-04-23 13:45:51 +09:00
smoogipoo
6add395288
Fix gameplay cursor being hidden in tests/replays
2019-04-23 13:32:44 +09:00
iiSaLMaN
a6b60a2fc2
Merge branch 'master' into sh-xh-grading-2
2019-04-22 19:39:20 +03:00
Dean Herbert
5313ba2938
Merge branch 'master' into hp-rewind
2019-04-22 19:02:41 +09:00
Dean Herbert
908eee9942
Fix pause tests
2019-04-22 18:29:51 +09:00
smoogipoo
aeae759fcd
Rename method + add xmldoc
2019-04-22 18:08:15 +09:00
smoogipoo
4edb17a88a
Make hp work + cleanup
2019-04-22 18:02:49 +09:00
smoogipoo
fbb4e9df04
Implement hp at base ScoreProcessor
2019-04-22 16:51:38 +09:00
David Zhao
3fbbb7dcf9
Move intiial fade outside of absolute sequence
2019-04-22 16:39:28 +09:00
iiSaLMaN
cfb3c38c3a
Fix.
2019-04-22 10:14:19 +03:00
iiSaLMaN
9030935030
Fix AppVeyor Errors
2019-04-22 10:07:45 +03:00
iiSaLMaN
64429aa968
Fix AppVeyor Errors
2019-04-22 09:59:51 +03:00
iiSaLMaN
7a385e56ec
Fix AppVeyor Errors
2019-04-22 09:58:29 +03:00
iiSaLMaN
c784bc4418
Remove whitespaces
2019-04-22 06:15:37 +03:00
iiSaLMaN
de542ca202
Remove bindable and use property
2019-04-22 06:14:14 +03:00
iiSaLMaN
26f0b2a4fe
Remove bindable
...
Bad usage
2019-04-22 06:12:41 +03:00
iiSaLMaN
cff319e0d8
Fix issue
2019-04-21 18:12:50 +03:00
iiSaLMaN
c5bf01cc5c
Fix issue
2019-04-21 18:05:52 +03:00
iiSaLMaN
b200142afb
Make AdjustRank Bindable and fix issue
2019-04-21 17:55:01 +03:00
iiSaLMaN
77614189c9
Make AdjustRank Bindable
2019-04-21 17:48:50 +03:00
iiSaLMaN
4e07975e7c
Ranks must be adjusted in Hidden Mod
2019-04-21 15:58:40 +03:00
iiSaLMaN
73da423639
Adjust rank
2019-04-21 15:58:19 +03:00
David Zhao
037e23247f
Remove unused using
2019-04-18 14:31:47 +09:00
David Zhao
dfa5beea89
Use the actual scale of Flashlight for FlashlightSize
2019-04-18 14:24:19 +09:00
Dean Herbert
879f6152b0
Merge remote-tracking branch 'upstream/master' into flashlight-dim
2019-04-17 22:17:10 +08:00
smoogipoo
ac2eabc9bf
Fix replay rewinding not respecting 60fps playback
2019-04-16 17:47:00 +09:00
David Zhao
e25c7fdb9b
Use absolute sequence for flashlight breaks
2019-04-12 17:39:25 +09:00
David Zhao
846a4835ca
Invert flashlight dim
2019-04-12 11:23:40 +09:00
David Zhao
664a4ba540
Implement flashlight dimming on slider slide
2019-04-12 10:47:22 +09:00
smoogipoo
0222424aef
Make mods IReadOnlyList<Mod> gamewide
...
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
smoogipoo
7845d542e3
Cache mods as array in DrawableRuleset
2019-04-10 17:20:36 +09:00
smoogipoo
4310f07a5c
Rename SelectedMods -> Mods
2019-04-10 12:03:57 +09:00
smoogipoo
c584967eb1
Remove mods from workingbeatmap
2019-04-09 12:59:32 +09:00
smoogipoo
772bef91fa
Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
...
# Conflicts:
# osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
2019-04-08 23:01:12 +09:00
RORIdev
ca6a73cb9d
Fixed Code Inspection Fails.
2019-04-04 18:04:49 -03:00
RORIdev
c195481223
Trimmed Whitespace
2019-04-04 13:28:43 -03:00
RORIdev
5a3e5036ed
All suggestions were applied.
2019-04-04 13:21:53 -03:00
RORIdev
27fe6f610a
Removed deprecated code. Thanks peppy.
2019-04-03 22:55:09 -03:00
RORIdev
ff1815e714
Fixed lives being not reseting between maps.
...
E.G. quitting a map with only 1 revive and getting 2 lives on another map.
2019-04-03 20:22:48 -03:00
RORIdev
28bf3156ba
Fixed the mod being not resetting.
2019-04-03 19:32:29 -03:00
RORIdev
5aa284781e
Reverted back Player.cs changes.
2019-04-03 19:20:20 -03:00
RORIdev
ebaaaef4d6
Fixed Inconsistent Naming
2019-04-03 18:17:21 -03:00
RORIdev
621f8fd78d
Trimmed whitespaces.
2019-04-03 18:05:47 -03:00
RORIdev
f6e1cb07a1
Changed the logic to ModEasy.
2019-04-03 17:58:17 -03:00
Dean Herbert
f1952c0816
Update font awesome usage
2019-04-02 19:55:24 +09:00
smoogipoo
d8af5e1c5a
Update in-line with drawnode changes
2019-04-02 11:56:22 +09:00
Dean Herbert
184403c7e1
Merge branch 'master' into resume-cursor-2
2019-04-01 14:24:00 +09:00
Dean Herbert
c39c37a18d
Apply more missed cases
2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38
Apply newline additions
2019-04-01 12:16:32 +09:00
Dean Herbert
79b5c2482b
Merge pull request #4562 from peppy/fix-editor-blueprints
...
Fix editor blueprints being misplaced
2019-04-01 11:17:17 +09:00
Dean Herbert
6896ec7731
Remove unnecessary method
2019-04-01 10:39:55 +09:00
Dean Herbert
d1a175675d
Use variable
2019-04-01 10:37:02 +09:00
Dean Herbert
5d91c3bcfc
Fix replay handler nullref crashes
2019-03-31 01:33:56 +09:00
Dean Herbert
42eaabe24c
Fix editor blueprints being misplaced
...
Regressed with PlayfieldAdjustmentContainer changes.
2019-03-31 01:29:37 +09:00
Dean Herbert
6949c233bf
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
2019-03-29 15:02:12 +09:00
Dean Herbert
3e8952b087
Merge pull request #4521 from peppy/hitobject-drawable-representation
...
Fix DrawableRuleset drawable creation method's name
2019-03-29 14:08:23 +09:00
Dean Herbert
c72705217a
Merge branch 'master' into framed-replay-handler-fixes
2019-03-29 12:59:51 +09:00
Dean Herbert
14cef94a53
Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation
2019-03-29 12:59:26 +09:00
Dean Herbert
e7b38cdc75
Remove unnecessary set
2019-03-29 12:38:47 +09:00
Dean Herbert
5b0aa7bf8d
Split out current/next frame conditionals for readability
2019-03-29 12:38:40 +09:00
Dean Herbert
fed58fba3a
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
2019-03-29 12:14:28 +09:00
Dean Herbert
ed0bf59e73
Merge branch 'master' into universal-playfield-adjust
2019-03-29 11:51:44 +09:00
Dan Balasescu
bab7d78130
Remove redundant cast
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-03-29 11:36:40 +09:00
Dean Herbert
785433bb74
Merge branch 'master' into universal-playfield-adjust
2019-03-29 11:25:54 +09:00
Dan Balasescu
d410054ec8
Merge branch 'master' into key-counter-display
2019-03-29 11:22:59 +09:00
Dean Herbert
7715606188
Merge branch 'master' into sprite-icon-compatibility
2019-03-29 11:15:34 +09:00
Dan Balasescu
772f0cac8a
Merge branch 'master' into gameplay-cursor-last-state
2019-03-29 11:01:13 +09:00
Dan Balasescu
7ab24e35f9
Merge branch 'master' into gameplay-paused-no-update
2019-03-29 10:53:32 +09:00
Dean Herbert
8642886ffa
Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust
2019-03-29 00:39:51 +09:00
Dean Herbert
70f99400ad
Fix many behavioural issues and add tests
2019-03-28 19:28:13 +09:00
Dean Herbert
148e26a6d4
Fix FramedReplayInputHandler starting at frame 0 when it shouldn't
2019-03-28 12:42:57 +09:00
Dean Herbert
de80fc0eac
Update icon usage to match framework changes
2019-03-27 19:29:27 +09:00
Dean Herbert
3fcbc2eab3
Fix key counter getting overridden
2019-03-27 10:31:21 +09:00
Dean Herbert
15821c7511
Fix cursor adding
2019-03-26 17:04:14 +09:00
Dean Herbert
dde7788c44
Merge branch 'universal-playfield-adjust' into resume-cursor-2
2019-03-26 13:58:48 +09:00
Dean Herbert
fb302e7ad8
Remove using
2019-03-26 13:58:07 +09:00
Dean Herbert
8658de5108
Rename KeyCounterCollection -> KeyCounterDisplay
...
Also fix not working
2019-03-26 13:52:48 +09:00
Dean Herbert
27cb4ce0d1
Remove poop
2019-03-26 13:48:35 +09:00
Dean Herbert
fbc97edc55
Add base cursor class to retrieve true visibility state
2019-03-26 13:41:30 +09:00
Dean Herbert
b4d785c76c
Don't update gameplay loop while paused
2019-03-26 13:36:17 +09:00
Dean Herbert
ed3746e166
Make PlayfieldAdjustmentContainer universal
2019-03-26 13:32:44 +09:00
Dean Herbert
b75ea295db
Rename KeyCounterCollection -> KeyCounterDisplay
...
Also fix not working
2019-03-26 11:28:43 +09:00
Dean Herbert
82140c38fc
Apply CI fixes
2019-03-25 22:00:33 +09:00
Dean Herbert
a642f10131
Remove redundant cast
2019-03-25 21:52:01 +09:00
Dean Herbert
245f463e3f
Don't update gameplay loop while paused
2019-03-25 20:31:55 +09:00
Dean Herbert
a23dfb58ad
Add base cursor class to retrieve true visibility state
2019-03-25 20:31:55 +09:00
Dean Herbert
06d4856e17
Remove unnecessary CursorTargetContainer
2019-03-25 20:31:55 +09:00
Dean Herbert
c79d187a89
Add final osu! resume screen implementation
2019-03-25 20:31:55 +09:00
Dean Herbert
38e481686f
Make PlayfieldAdjustmentContainer universal
2019-03-25 20:31:55 +09:00
Dean Herbert
57b3b7b54b
Add back resume overlay
2019-03-25 20:31:55 +09:00
Dean Herbert
a694626cc6
Add proper resume request logic
2019-03-25 20:31:55 +09:00
Dean Herbert
c97116c91a
Add safety against DrawableHitObject implementations clearing children
2019-03-25 13:34:22 +09:00
Dean Herbert
9bf48863b0
Fix DrawableRuleset drawable creation method's name
2019-03-25 00:00:29 +09:00
Dean Herbert
15f9a6b9df
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
2019-03-21 16:04:18 +09:00
Dean Herbert
fe255c54d0
Merge pull request #4496 from smoogipoo/reinstantiate-mods
...
Fix mods being reused for difficulty calculation
2019-03-20 19:10:52 +09:00
smoogipoo
c510385aa8
Remove unnecessary allocations
2019-03-20 16:46:16 +09:00
smoogipoo
6df275c83a
Use fresh mods for each difficulty calculation iteration
2019-03-20 16:37:25 +09:00
Dean Herbert
13e2d6a340
Merge branch 'master' into fix-spinner-conversion
2019-03-20 16:32:44 +09:00
Dean Herbert
f43e7a880c
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
2019-03-20 15:27:06 +09:00
Dean Herbert
c186629b8a
Reorder class
2019-03-20 14:55:38 +09:00
Dean Herbert
5f288650bf
Fix misses/typos
2019-03-20 14:49:33 +09:00
smoogipoo
6511234804
Fix catch spinners not being allowed for conversion
2019-03-20 13:53:22 +09:00
Dean Herbert
936c3e1ed9
Add safety type check to DrawableScrollingRuleset
2019-03-20 11:34:06 +09:00
Dean Herbert
45b8bfcfd3
Better protect not-generic DrawableRuleset
2019-03-20 11:31:03 +09:00
Dean Herbert
7b6d882ce6
Remove double-generic type
2019-03-20 11:29:16 +09:00
Dean Herbert
3b7a76aa4e
Fix typo
2019-03-20 11:22:34 +09:00
Dean Herbert
e0ab40b082
Rename missed files
2019-03-19 23:56:12 +09:00
Dean Herbert
baea7230bc
Rename RulesetContainer to DrawableRuleset
2019-03-19 23:47:31 +09:00
Dean Herbert
68f28326a2
Refactor RulesetContainer for readability
2019-03-19 20:21:31 +09:00
Dean Herbert
9433a97747
Add resume requesting support and fix exit scenarios
2019-03-18 20:33:43 +09:00
Dean Herbert
9ca4d9d4d1
Remove regions
2019-03-18 10:48:44 +09:00
Dean Herbert
771d676ba1
Split RulesetInputManager out to FrameStabilityContainer
2019-03-17 13:30:52 +09:00
Dean Herbert
14af957599
Merge pull request #4468 from smoogipoo/fix-min-tick-distance
...
Fix ticks not being generated at the minimum tick distance
2019-03-15 12:12:48 +09:00
Dan Balasescu
2c80f73a88
Merge branch 'master' into increase-osu-file-validation
2019-03-14 18:47:32 +09:00
smoogipoo
71d79f0a39
Fix ticks not being generated at the minimum tick distance
2019-03-14 15:20:12 +09:00
smoogipoo
2815c3b07c
Remove unused variable
2019-03-14 15:12:26 +09:00
Dean Herbert
0042cc5337
Merge branch 'master' into mod-ramp-hotfix
2019-03-14 13:02:29 +09:00
Dean Herbert
85c518f146
Change logic to better handle external adjustments
2019-03-14 12:29:16 +09:00
Dean Herbert
c40e24739b
Fix weird application logic
2019-03-13 21:37:33 +09:00
Dan Balasescu
5d23a966d7
Fix incorrect application logic for rate fallback
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-03-13 20:55:33 +09:00
Dean Herbert
3d4a80957f
Improve comment
2019-03-13 18:27:54 +09:00
Dean Herbert
1617e2a729
Merge branch 'master' into mania-judgemetns
2019-03-13 18:17:42 +09:00
Dean Herbert
8f00f2290a
Log issues
2019-03-13 14:56:41 +09:00
Dean Herbert
f8b5cf8c8e
Add extra clamping of endTime to startTime
2019-03-13 13:46:41 +09:00
Dan Balasescu
a35d9ccc09
Apply clamping suggestion
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-03-13 12:35:05 +09:00
Dean Herbert
93b774104a
Fix NaN handling
2019-03-13 11:30:33 +09:00
Dean Herbert
cc09ecbfcf
Increase validation performed on .osu files to avoid hard crashes
2019-03-12 20:31:15 +09:00
David Zhao
7eb253b687
Fix incorrect scale duration
2019-03-12 19:44:53 +09:00
David Zhao
3b3b1e51ee
Move hit animation logic into virtual method
2019-03-12 19:41:33 +09:00
David Zhao
9850122245
Fix incorrect delay
2019-03-12 19:24:46 +09:00
David Zhao
12f334035f
Create properties for use in DrawableManiaJudgement
2019-03-12 19:23:24 +09:00
Dean Herbert
a10cd2288d
Improve ModRamp's handling of external rate changes
2019-03-12 18:15:18 +09:00
Dean Herbert
6832e384a9
Simplify DT/HT/NC/DC
2019-03-12 18:14:41 +09:00
Dean Herbert
63fea65c0c
Clarify repeat index
2019-03-11 14:53:21 +09:00
Dean Herbert
489153579a
Add xmldoc and clarify struct variables
2019-03-11 14:36:29 +09:00
Dean Herbert
2029cf93fd
Rename and reuse variables
2019-03-11 14:33:21 +09:00
Dean Herbert
c6194d5487
Merge branch 'master' into extract-slider-tick-creation
2019-03-08 20:40:03 +09:00
Dean Herbert
48e54c84c1
Merge branch 'master' into mod-wind
2019-03-08 20:23:02 +09:00
Dean Herbert
28a1baa07e
Merge branch 'extract-slider-tick-creation' of https://github.com/peppy/osu into extract-slider-tick-creation
2019-03-08 20:13:58 +09:00
Dean Herbert
93a999396e
LegacyFinalTick -> LegacyLastTick to match existing variable
2019-03-08 20:13:11 +09:00
Dean Herbert
f59b9e933e
Merge branch 'master' into extract-slider-tick-creation
2019-03-08 20:00:12 +09:00
Dean Herbert
355705f0a5
Fix legacy tick handling
2019-03-08 19:57:30 +09:00
Dean Herbert
973f29b765
Apply review
2019-03-08 15:14:57 +09:00
Dean Herbert
a73e3d9700
Move cursor construction to BDL
2019-03-08 15:01:45 +09:00
Dean Herbert
2c98ba1c0c
Split out consumption and creation into two separate code paths
2019-03-08 14:59:45 +09:00
Dean Herbert
3ccc76e18f
Merge remote-tracking branch 'upstream/master' into cursor-in-playfield
2019-03-08 14:50:46 +09:00
Dan Balasescu
d1c18c52ab
Merge branch 'master' into fix-cursor-in-scale-container
2019-03-08 12:43:57 +09:00
Dan Balasescu
101009c92e
Merge branch 'master' into fix-autoplay-tests
2019-03-08 12:14:40 +09:00
Dean Herbert
1f44dde96b
Fix autoplay tests not working
2019-03-07 18:34:56 +09:00
smoogipoo
04d756524d
Adjust with shader changes
2019-03-07 18:30:18 +09:00
Dean Herbert
62716851a1
Revert some unnecessary changes
2019-03-06 17:41:54 +09:00
Dean Herbert
7aa30ca3f6
Change method of cursor creation
2019-03-06 17:41:54 +09:00
Dean Herbert
acf518c208
Move cursor inside playfield
2019-03-06 17:41:54 +09:00
Dean Herbert
5411c63093
Fix menu cursor not displaying outside of gameplay scaling area
2019-03-06 17:14:08 +09:00
Dean Herbert
2300e59e91
Formatting and simplification
2019-03-06 14:19:00 +09:00
Dean Herbert
d70b373af9
Merge branch 'master' into mod-wind
2019-03-06 14:04:04 +09:00
Dean Herbert
6b042eae94
Merge branch 'master' into fix-cursor-in-scale-container
2019-03-05 22:22:56 +09:00
Dean Herbert
8a6fa0915e
Merge branch 'master' into simplify-gameplay-clock
2019-03-05 20:22:46 +09:00
Dean Herbert
558dbafb71
Use a safer method of setting the clock
2019-03-05 20:14:04 +09:00
Dean Herbert
d5943330b1
Fix potential infinite loop
2019-03-05 20:06:04 +09:00
smoogipoo
a08086cc8a
Fix volume not being considered for file samples
2019-03-05 18:21:29 +09:00
Dean Herbert
fc0b297232
Fix menu cursor not displaying outside of gameplay scaling area
2019-03-05 18:06:24 +09:00
Dean Herbert
9a9b4efb8d
Fix excess line
2019-03-05 16:41:11 +09:00
Dean Herbert
ec063a13db
Update RulesetInputManager to support new clock structure more accurately
2019-03-05 16:34:50 +09:00
Dean Herbert
01f1018d02
Tidy up clock logic using DI and a GameplayClock
2019-03-05 13:37:51 +09:00
LeNitrous
74a23edaf7
no longer adjust the clock rate
2019-03-04 17:48:51 +08:00
LeNitrous
86e861ddeb
update mod descriptions
2019-03-04 17:39:13 +08:00
LeNitrous
b83d44c316
use ternary operator instead
2019-03-03 16:50:31 +08:00
LeNitrous
a1a8246c05
trim whitespace
2019-03-03 16:30:08 +08:00
LeNitrous
ecc2c28a62
mod rule changes
2019-03-03 16:22:00 +08:00
Dean Herbert
2dbf7d122c
Merge branch 'master' into use-pattern-matching
2019-02-28 14:53:07 +09:00
Dean Herbert
e2c6a8bc07
Use pattern matching wherever possible
2019-02-28 14:35:00 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections
2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1
Use expression body for property get/set where possible
2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9
Fix remaining issues
2019-02-28 13:31:40 +09:00
Dean Herbert
c8793911a8
Enable more stringent inspectcode style inspections
2019-02-27 21:25:40 +09:00
smoogipoo
f66fefb818
Adjust comment + accessibility
2019-02-27 16:30:10 +09:00
smoogipoo
a07d797d75
Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization
2019-02-27 12:08:43 +09:00
smoogipoo
8a943a6e65
Fix scores being stored as ints
2019-02-26 13:10:59 +09:00
Dean Herbert
90cae0a69c
Simplify RulesetInputManager further
2019-02-23 15:48:34 +09:00
Dean Herbert
6d3c0e3191
Holy sheet
2019-02-23 14:39:55 +09:00
Dean Herbert
0c218eb0d5
Apply new RulesetInputManager logic
...
Run UpdateSubTree twice to ensure correctness
2019-02-23 14:14:41 +09:00
smoogipoo
d61dfe888e
Fix venera fonts not being correctly specified
2019-02-22 19:42:09 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage
2019-02-22 18:09:23 +09:00
Dean Herbert
3fe4b8fd1c
Update variable names
...
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
Dean Herbert
2c9e6adfd4
Merge branch 'master' into bindable-valuechanged
2019-02-22 17:14:05 +09:00
Dean Herbert
f919f2252f
Add ToString for Judgements to ease debugging
2019-02-22 12:02:54 +09:00
smoogipoo
d8c55bc729
Adjust namespaces
2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f
Update with framework bindable changes
2019-02-21 18:56:34 +09:00
smoogipoo
7e41fbc29b
Remove LegacyDifficultyCalculator
2019-02-21 13:12:37 +09:00
smoogipoo
0693ab8e7d
Merge remote-tracking branch 'origin/master' into osu-fontusage
...
# Conflicts:
# osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb
Adjust sprite texts in-line with framework changes
2019-02-20 15:03:20 +09:00
smoogipoo
b7b1f0ef0c
Merge branch 'remove-populateattributes' into new-diffcalc-mania
2019-02-19 17:55:56 +09:00
smoogipoo
4dcf39846d
Pass beatmap to CreateSkills()
2019-02-19 17:52:59 +09:00
smoogipoo
1efc5179aa
Merge branch 'remove-populateattributes' into new-diffcalc-mania
2019-02-19 17:46:52 +09:00
smoogipoo
ca8b7f24b4
Remove PopulateAttributes()
2019-02-19 17:36:33 +09:00
smoogipoo
8104c45c25
Merge remote-tracking branch 'origin/master' into new-diffcalc-mania
...
# Conflicts:
# osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyDifficultyCalculator.cs
2019-02-19 16:30:05 +09:00
Dean Herbert
151388dfad
Merge branch 'master' into diffcalc-merging-2
2019-02-19 15:42:15 +09:00
smoogipoo
7ed461aa8c
XMLDoc DifficultyHitObject
2019-02-19 14:30:59 +09:00
smoogipoo
93b7b51d0a
timeRate -> clockRate
2019-02-19 14:29:23 +09:00
smoogipoo
3784b673ae
History -> LimitedCapacityStack + re-xmldoc
2019-02-19 13:51:19 +09:00
smoogipoo
af0bb4d5e8
Remove mods from constructor
2019-02-19 13:40:39 +09:00
Dean Herbert
133c002d02
Fix test dlls being loaded as actual rulesets (and failing)
2019-02-19 12:13:55 +09:00
Dan Balasescu
c9c8cccd68
Merge branch 'master' into use-lifetime-optimization
2019-02-18 15:22:34 +09:00
smoogipoo
9cce9ce97c
Consider aggregate peaks
2019-02-18 15:00:32 +09:00
smoogipoo
a8faa942a6
Implement new difficulty calculator structure
2019-02-18 14:49:43 +09:00
Dean Herbert
e2e615cc5c
Merge branch 'master' into leased-bindables-dont-work
2019-02-11 16:30:12 +09:00
Dean Herbert
2d7c23dd9f
Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics
2019-02-04 12:15:53 +09:00
Dean Herbert
ca5c8d37d1
Use leased bindables
2019-02-01 16:44:06 +09:00
ekrctb
8955d5de04
Update hit object result when lifetime is end
2019-01-29 15:25:27 +09:00
ekrctb
504e79b968
Merge branch 'master' into use-lifetime-optimization
2019-01-29 12:15:02 +09:00
LeNitrous
03e57d0423
fix codefactor warnings and derive ModWindUp and ModWindDown to ModTimeRamp
2019-01-26 20:15:19 +08:00
LeNitrous
d920ee67ee
forgot last whitespace
2019-01-26 13:47:33 +08:00
LeNitrous
73dbf5712d
add license headers
2019-01-26 13:43:27 +08:00
LeNitrous
39072376dd
revert WorkingBeatmap back to protected
2019-01-26 13:40:41 +08:00
LeNitrous
d76681aa82
use IApplicableToBeatmap instead of IApplicableToRulesetContainer
2019-01-26 13:39:23 +08:00
LeNitrous
c6e26a92ec
add wind up and wind down mods
2019-01-26 12:15:45 +08:00
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
Dean Herbert
c18ce2c23a
Formatting fixes
2019-01-23 14:51:25 +09:00
Dean Herbert
49633b3394
Fix key counter receptor getting overwritten by async load drawables
2019-01-23 14:51:25 +09:00
Dean Herbert
8160162cde
Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics
2019-01-21 20:58:17 +09:00
Unknown
6eff79913b
remove blank lines
2019-01-11 10:34:56 +01:00
Dean Herbert
e73845172c
Merge branch 'master' into fix-replay-import-statistics
2019-01-07 13:44:01 +09:00
Dean Herbert
b6dc6c4a74
Merge branch 'master' into do_not_use_local_user_for_autoplay_score
2019-01-04 13:11:17 +09:00
Dean Herbert
aec3753863
Fix imported replays having excess statistics
2019-01-03 14:01:20 +09:00
smoogipoo
be86281c72
Fix score results not populated
2018-12-28 00:24:02 +09:00
smoogipoo
338b95dd63
Fix none result getting included
2018-12-27 22:48:24 +09:00
Dean Herbert
99ed009838
Fix extra hit result types showing on ranking screen
2018-12-27 22:31:40 +09:00
Dean Herbert
fb10d15870
Populate statistics for all rulesets' scores
2018-12-27 21:52:09 +09:00
smoogipoo
50b51a168e
Always submit standardised scores
2018-12-27 21:12:32 +09:00
smoogipoo
5d59a1ffca
Merge remote-tracking branch 'origin/master' into timeshift-wip
...
# Conflicts:
# osu.Game.Tests/Visual/TestCasePollingComponent.cs
# osu.Game/Online/API/APIRequest.cs
# osu.Game/osu.Game.csproj
2018-12-21 12:51:31 +09:00
Dean Herbert
ef9d93ff6b
Remove mod multipliers
...
We decided that mods shouldn't be interacting with other mods. This can be added once we have the ability to have per-mod settings, as a difficulty setting local to blinds.
2018-12-20 19:46:39 +09:00
Dean Herbert
d3368df94d
Simplify changes to RulesetContainer
2018-12-20 19:35:32 +09:00
Dean Herbert
9177a45587
Merge branch 'master' into mod-fl2
2018-12-20 15:50:18 +09:00
smoogipoo
2e767a5292
Fix incorrect acronym
2018-12-14 13:38:13 +09:00
ekrctb
6f8a2e6ff2
Use LifetimeManagementContainer
...
This is a significant performance boost for gameplay,
especially for long or stroyboard-heavy maps.
2018-12-13 15:23:06 +09:00
Ivan Pavluk
28b033bd99
Autodetect LowestSuccessfulHitResult
2018-12-12 17:15:59 +07:00
smoogipoo
9af2b49c01
Merge remote-tracking branch 'peppy/polling-component' into timeshift-api-integration
...
# Conflicts:
# osu.Game/osu.Game.csproj
2018-12-12 16:22:14 +09:00
smoogipoo
439d741dee
Implement basic api structure for rooms
2018-12-12 16:06:56 +09:00
Ivan Pavluk
e49e2fda9e
Rename SuccessfulHitResult->LowestSuccessfulHitResult
2018-12-12 13:24:58 +07:00
Dean Herbert
ffb91b4afc
Update docstring
...
Co-Authored-By: pavlukivan <pavlukivan@outlook.com>
2018-12-12 13:11:03 +07:00
Dean Herbert
d86cbf66a9
Update docstring
...
Co-Authored-By: pavlukivan <pavlukivan@outlook.com>
2018-12-12 13:10:47 +07:00
Ivan Pavluk
a62b105fb5
Fix formatting
2018-12-10 05:06:18 +00:00
Ivan Pavluk
8457324044
SuccessfulHitWindow->SuccessfulHitResult
2018-12-10 09:04:12 +07:00
Dan Balasescu
77a544e475
formatting fix
...
Co-Authored-By: pavlukivan <pavlukivan@outlook.com>
2018-12-09 23:38:29 +07:00
Dan Balasescu
784a114eae
formatting fix
...
Co-Authored-By: pavlukivan <pavlukivan@outlook.com>
2018-12-09 23:38:19 +07:00
Dean Herbert
7d9cdf6f81
Remove unnecessary private field
2018-12-07 20:13:03 +09:00
Dean Herbert
d379d02761
Remove unnecessary base class
2018-12-07 20:12:56 +09:00
Ivan Pavluk
cb2444e01c
Remove Meh from TaikoHitWindows
2018-12-06 19:04:54 +07:00
WebFreak001
3cb91979bd
Merge branch 'master' of https://github.com/ppy/osu into mod-fl2
2018-12-06 12:14:48 +01:00
Ivan Pavluk
1b6658f4ee
Move HealthIncreaseFor to Judgement
2018-12-06 15:09:42 +07:00
smoogipoo
9fdd48ded2
Add 1ms offset to controlpoint lookup times
2018-12-04 12:08:46 +09:00
Roman Kapustin
c6c255718b
Handle ModAutoplay during score construction in the Player
2018-12-03 22:37:26 +03:00
smoogipoo
eb88768bd0
Fix incorrect controlpoint being applied to samples
2018-12-03 17:21:27 +09:00
Dean Herbert
f9fb6dc39b
Remove health from ScoreInfo
2018-12-01 00:17:05 +09:00
Dean Herbert
af3ef9a089
Fix some data types on ScoreInfo
2018-11-30 20:43:38 +09:00
Dean Herbert
9718e476c7
Add license header
2018-11-30 18:07:15 +09:00
Dean Herbert
be37f3c328
Rename NoModMod
2018-11-30 17:35:13 +09:00
Dean Herbert
d97a15a504
Add IMod and change ShortenedName to Acronym
2018-11-30 17:16:00 +09:00
Dean Herbert
e82ad3539b
Move JsonIgnore specification to interface
2018-11-30 16:39:25 +09:00
Dean Herbert
831cd3ed59
ScoreInfo scoreInfo -> ScoreInfo score
2018-11-30 15:18:52 +09:00
Dean Herbert
271dcded3c
Merge branch 'master' into scoredatabase
2018-11-30 14:59:58 +09:00
smoogipoo
69370c53ca
Fix rank not being read
2018-11-30 14:48:25 +09:00
Dean Herbert
5254b07680
Merge remote-tracking branch 'upstream/master' into inter-column-movements
2018-11-30 11:57:53 +09:00
Dean Herbert
7ffc597a8e
Fix one-frame issues
2018-11-29 14:55:20 +09:00
Dean Herbert
3d46ac7d35
Remove unnecessary high frequency input
2018-11-29 13:21:11 +09:00
Dean Herbert
86a0f8d2a9
Merge branch 'master' into note-placement
2018-11-29 13:06:11 +09:00
smoogipoo
aea84f737b
Fix taiko hitobjects potentially disappearing before being judged
2018-11-29 12:12:29 +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
smoogipoo
ea52d2d527
Make Mod IJsonSerializable
2018-11-28 13:12:29 +09:00
smoogipoo
f9f300b215
Fix drag breaking if scrolling while dragging
2018-11-26 16:08:56 +09:00
Dean Herbert
4cfeb1b9a1
Merge branch 'master' into note-placement
2018-11-26 14:35:31 +09:00
Dean Herbert
c944e8bb29
Merge branch 'master' into fix-deletion-crash
2018-11-26 14:20:02 +09:00
smoogipoo
56032a4522
Merge branch 'mania-selection-movement' into inter-column-movements
...
# Conflicts:
# osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
# osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
2018-11-26 11:45:48 +09:00
Dean Herbert
1da2006dea
Merge branch 'master' into note-placement
2018-11-22 19:44:39 +09:00
smoogipoo
dc8cd51e15
Implement mania note deletion
2018-11-20 17:26:00 +09:00
smoogipoo
f27bd3ef3e
OpenTK -> osuTK
2018-11-20 17:14:59 +09:00
smoogipoo
d5b937f88f
Fix post-merge issue
2018-11-19 19:17:03 +09:00
Dan Balasescu
8cee4141e8
Merge branch 'master' into note-placement
2018-11-19 19:08:53 +09:00
smoogipoo
55edeb095d
SelectionBox -> SelectionHandler
2018-11-19 16:58:11 +09:00
smoogipoo
595e2ffbff
Unbind event when column changes
2018-11-19 16:20:21 +09:00
smoogipoo
4cbda97b1e
Move positional adjustment to SelectionBox
2018-11-16 17:12:24 +09:00
jorolf
80bd98bb9d
apply suggestions
2018-11-15 17:38:38 +01:00
smoogipoo
df7515b66f
Pass all selected hitobjects to the selection blueprints
2018-11-15 21:01:09 +09:00
smoogipoo
d5464702fa
Fix post-merge issue
2018-11-15 20:56:34 +09:00
smoogipoo
eddba44d0f
Merge branch 'note-placement' into inter-column-movements
2018-11-15 20:53:57 +09: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
smoogipoo
4b86c29f7b
Merge remote-tracking branch 'origin/master' into placement-hiding
2018-11-14 18:34:45 +09:00
smoogipoo
c963fc7cd2
Reduce chaining
2018-11-14 18:34:13 +09:00
Dean Herbert
4dec2d1db0
Merge remote-tracking branch 'upstream/master' into note-placement
2018-11-14 18:29:31 +09:00
Dean Herbert
84d16ee71b
Merge branch 'master' into placement-hiding
2018-11-14 16:59:41 +09:00
Dean Herbert
2ae139d260
Merge branch 'master' into more-global-scrollalgo
2018-11-14 13:54:53 +09:00
Dean Herbert
34973a3e9f
Merge branch 'master' into scrollalgorithm-timeat
2018-11-14 13:32:16 +09: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
6d43baf4bf
Make show/hide only invoked once each
2018-11-13 13:12:11 +09:00
smoogipoo
fbc20d2d4d
Hide placement when cursor is not in the playfield
2018-11-13 12:52:04 +09:00
smoogipoo
3a1fee59fb
Implement note placement
2018-11-12 18:24:18 +09:00
smoogipoo
a0c75a0597
Merge branch 'notepieces' into note-placement
2018-11-12 17:59:54 +09:00
smoogipoo
9e1b54f1ef
Merge branch 'more-global-scrollalgo' into note-placement
2018-11-12 17:47:02 +09:00
smoogipoo
b9b20607af
Add IScrollAlgorithm.TimeAt()
2018-11-12 17:43:22 +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
e7969ecec7
Move ScrollAlgorithm inside IScrollingInfo
2018-11-12 17:34:35 +09:00
smoogipoo
54668a0dec
Simplify construction of ScrollingInfo
2018-11-12 17:34:35 +09:00
smoogipoo
ad45bc7666
Move scroll direction to scrollinginfo
2018-11-12 17:34:35 +09:00
smoogipoo
48486895ba
Remove unused code
2018-11-12 17:34:35 +09:00
smoogipoo
9fde7f7f44
Move scrolling info to osu.Game
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
f3ba429701
Make sure control points is internally initialised
2018-11-12 17:14:06 +09:00
smoogipoo
f4fd6189f8
Implement IEquatable
2018-11-12 16:53:30 +09:00
smoogipoo
0220ed21b0
Ignore distance for json serialisation
2018-11-12 16:38:49 +09:00
smoogipoo
0e92b385f0
Define default json deserialisation constructor
2018-11-12 16:38:33 +09:00
smoogipoo
8ad9b6a02a
Safety for default(SliderPath)
2018-11-12 16:38:14 +09:00
smoogipoo
d594ce3530
Revert "Make SliderPath.ControlPoints read-only"
...
This reverts commit 3b88d94793
.
# Conflicts:
# osu.Game/Rulesets/Objects/SliderPath.cs
2018-11-12 16:20:38 +09:00
smoogipoo
77d16aa968
Add xmldocs
2018-11-12 14:16:21 +09:00
smoogipoo
4eef1134a6
Re-order file
2018-11-12 14:08:36 +09:00
smoogipoo
3aba462e52
Make Path.Distance a property again
2018-11-12 14:07:48 +09:00
smoogipoo
3b88d94793
Make SliderPath.ControlPoints read-only
2018-11-12 14:03:54 +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
Dean Herbert
4783df1d4b
Fix compose mode not working
2018-11-09 11:36:06 +09:00
Dean Herbert
27549586e6
Merge branch 'master' into manual-position-adjustments
2018-11-09 10:53:41 +09:00
smoogipoo
33056b8098
Adjust namespaces
2018-11-08 14:04:21 +09:00
smoogipoo
f66a9f4f1e
Rename IScrollChangeVisualiser -> IScrollAlgorithm
2018-11-08 14:04:21 +09:00
smoogipoo
2f87f267a3
Fix height being set instead of width
2018-11-08 14:04:20 +09:00
smoogipoo
195f82fa96
Give visualiser methods range+length params again
2018-11-08 14:04:20 +09:00
smoogipoo
f41bfd14ca
Add some xmldocs
2018-11-08 14:04:20 +09:00
smoogipoo
76ea314c27
Reorder params
2018-11-08 14:04:20 +09:00
smoogipoo
589c3a47e2
Remove state computation + updates from ISpeedChangeVisualiser
2018-11-08 14:04:20 +09:00
smoogipoo
0bdeebbce2
Expose basic values from ISpeedChangeVisualiser
2018-11-08 14:04:20 +09:00
smoogipoo
c6350c6efd
Remove IHasEditablePosition
2018-11-08 13:03:11 +09:00
smoogipoo
5d51719572
Make selection blueprints handle position adjustments
2018-11-07 16:21:32 +09:00
smoogipoo
cf4dad0fe8
Fix hitobjects not updating IsMaskedAway after being judged
2018-11-07 15:42:40 +09:00
smoogipoo
52f4923c8e
Remove intermediate Screens namespace
2018-11-06 18:28:22 +09:00
smoogipoo
ac25718c5a
Renamespace compose-mode components
2018-11-06 18:14:46 +09:00
smoogipoo
27d82052f4
BorderLayer -> EditorPlayfieldBorder
2018-11-06 18:10:46 +09:00
smoogipoo
85f96ad62f
Fix a few missed renames
2018-11-06 18:07:53 +09:00
smoogipoo
bd775af274
PlacementMask -> PlacementBlueprint
2018-11-06 18:04:03 +09:00
smoogipoo
11be820efe
CreateMaskFor -> CreateBlueprintFor
2018-11-06 18:03:21 +09:00
smoogipoo
90c813618a
Merge PlacementContainer into BlueprintContainer
2018-11-06 18:02:55 +09:00
smoogipoo
f2a5f28ea2
SelectionMask -> SelectionBlueprint
2018-11-06 17:56:04 +09:00
smoogipoo
ad2836a61e
MaskSelection -> SelectionBox
2018-11-06 17:52:47 +09:00
smoogipoo
26c9390c16
HitObjectMaskLayer -> BlueprintContainer
2018-11-06 17:36:10 +09:00
smoogipoo
ace1dce281
Merge remote-tracking branch 'origin/master' into fix-slider-samples
...
# Conflicts:
# osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
2018-11-05 18:10:22 +09:00
smoogipoo
92d570342c
Fix sample additions not falling back to non-addition bank
2018-11-05 17:35:24 +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
smoogipoo
1fffa48aa0
Sort nested hitobjects post-creation
2018-11-05 12:15:45 +09:00
Dean Herbert
e6ee3dc73e
Use framework helper functions for path approximation
2018-11-02 19:26:29 +09:00
smoogipoo
1aae123ff5
Make approximators share an interface
2018-11-01 19:16:44 +09:00
Dean Herbert
c1304eca1b
Merge remote-tracking branch 'upstream/master' into slider-placement
2018-11-01 17:59:37 +09:00
Dean Herbert
bb2f8deb18
ControlPoint -> PathControlPoint
...
Also Curve -> Path.
2018-11-01 03:56:51 +09:00
Dean Herbert
9cb4374b51
Merge branch 'master' into slider-controlpoint-masks
2018-11-01 02:37:31 +09:00
Dean Herbert
85a7325911
Fix placement masks handling scroll events
2018-10-31 17:23:27 +09:00
Dean Herbert
d38bf38606
Merge branch 'master' into slider-controlpoint-masks
2018-10-31 15:23:30 +09:00
Dean Herbert
3207a585c6
Add missing xmldoc
2018-10-31 12:01:10 +09:00
Dean Herbert
b28c0cd128
Merge branch 'master' into editor-mask-placement
2018-10-31 06:46:48 +09:00
Dean Herbert
6dde5e3b4a
Merge branch 'master' into auto-restart-mod-perfect
2018-10-31 03:56:08 +09:00
Paul Teng
007dfedbb7
Combine RestartOnFail into FailOverride
2018-10-30 07:12:06 -04:00
smoogipoo
5712a52817
Merge remote-tracking branch 'origin/master' into mask-separation
...
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
2018-10-30 16:46:13 +09:00
Kyle Chang
6d00aff9fd
Add type parameter to IApplicableToBeatmap
2018-10-30 00:13:33 -04:00
Paul Teng
52b9a3f5e9
Remove unused using
2018-10-29 17:51:49 -04:00
Paul Teng
cb9ec94dc2
Remove option from settings
2018-10-29 08:19:38 -04:00
smoogipoo
08b16be3b8
Merge branch 'slider-controlpoint-masks' into slider-placement
...
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/Components/SliderBodyPiece.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
2018-10-29 15:55:38 +09:00
smoogipoo
acd703c27b
Make sliders respond to control point changes
2018-10-29 15:36:43 +09:00
smoogipoo
a9f1484e8b
Fix some post-rebase issues
2018-10-29 15:26:28 +09:00
smoogipoo
8b36d9b482
Remove SliderCurve.Offset (unused)
2018-10-29 15:26:07 +09:00
smoogipoo
b3e105ba93
Make curve approximators implement common interface
2018-10-29 15:26:07 +09:00
Kyle Chang
df6fc4013a
Add interface to adjust Beatmaps
2018-10-28 02:21:25 -04:00
WebFreak001
3b08ad0742
Merge branch 'master' of https://github.com/ppy/osu into mod-fl2
...
Changes how OsuModBlinds passes the playfield and how DrawableOsuBlinds
handles the restrictTo parameter.
2018-10-27 16:34:48 +02: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
9656186b64
Make the hitobject masks move within their placement/selection
...
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/Components/HitCircleMask.cs
# osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/HitCircleSelectionMask.cs
# osu.Game.Rulesets.Osu/Edit/Masks/HitCirclePlacementMask.cs
# osu.Game/Rulesets/Edit/PlacementMask.cs
2018-10-26 13:45:31 +09:00
smoogipoo
8703db5cc1
Rename HitObjectMask -> SelectionMask
2018-10-26 13:31:23 +09:00
smoogipoo
2b141a2bc1
Make PlacementMask abstract
2018-10-25 19:10:59 +09:00
smoogipoo
ea6db8b793
Make the hitobject masks move within their placement/selection
2018-10-25 18:16:25 +09:00
Paul Teng
794afa988f
Make both SD and PF auto-restart based on settings
2018-10-24 13:37:27 -04:00
smoogipoo
0e841628b6
Implement hitobject deletion
2018-10-18 16:36:06 +09:00
Paul Teng
ec33e63a4f
Merge https://github.com/ppy/osu into auto-restart-mod-perfect
2018-10-17 07:04:11 -04:00
smoogipoo
5a5e91eaed
Add a way to re-invoke ApplyDefaults on placement object
2018-10-17 18:36:47 +09:00
smoogipoo
b7435c0c5f
Fix border layer not working
2018-10-17 18:29:30 +09:00
smoogipoo
6eb7a030d0
Fix placement container not being refreshed upon placement
2018-10-17 18:11:44 +09:00
smoogipoo
d36ac59ca2
Reduce complexity of creating edit ruleset containers
2018-10-17 18:06:00 +09:00
smoogipoo
969477dadd
Remove placement events, make everything pass top-down
2018-10-17 17:43:16 +09:00
smoogipoo
62635c5ab8
Add container to handle placement mask
2018-10-17 16:17:49 +09:00
smoogipoo
4ea4ec0d25
Move placement handling events to a higher level
2018-10-17 15:46:30 +09:00
smoogipoo
08e3fe1def
Add PlacementStarted event, rename placement methods
2018-10-17 14:37:45 +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
060cc24dba
Cleanup slidercurve calculation
2018-10-16 11:11:04 +09:00
smoogipoo
5095fbcdf7
Merge remote-tracking branch 'origin/master' into optimise-diffcalc
2018-10-16 10:27:18 +09:00
Paul Teng
39c767af2d
Update file name and update summary
2018-10-14 11:25:05 -04:00
Paul Teng
fd774c6a09
Allow restarts in ModPerfect
2018-10-14 11:18:52 -04:00
Paul Teng
dea2acaea3
Add new interface that allows restarts
2018-10-14 11:18:10 -04:00
Dean Herbert
468f7fd1ea
Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework
2018-10-12 19:25:08 +09:00
Dean Herbert
ad42f2244d
Add fallback logic in case a ruleset consumer forgets to add the HitObjectContainer
2018-10-12 19:15:11 +09:00
Jan Jurzitza
460c943958
Merge branch 'master' into mod-fl2
2018-10-12 11:44:55 +02:00
Dean Herbert
1de770e093
Merge branch 'master' into fix-sv
2018-10-12 18:13:50 +09:00
smoogipoo
e130204a3b
Merge remote-tracking branch 'origin/master' into optimise-diffcalc
2018-10-12 12:26:15 +09:00
Dean Herbert
5d26c1b771
Merge pull request #3574 from smoogipoo/hitobject-perf-improvements
...
Various performance improvements around hitobjects
2018-10-11 22:16:48 +09:00
smoogipoo
d282d16e1c
Use SortedList again
2018-10-11 20:49:12 +09:00
smoogipoo
83fd251c7b
Pass sub-controlpoints as span slices
2018-10-11 17:44:25 +09:00
Dean Herbert
e0a8157d92
Merge branch 'master' into mod-fl2
2018-10-10 19:48:46 +09:00
Dean Herbert
1b6f37f3eb
Merge branch 'master' into wiggle-repeat-points
2018-10-10 19:42:10 +09:00
Dean Herbert
ed0dcb2e73
Add comment explaining why
2018-10-10 19:41:40 +09:00
Dean Herbert
841b2e8692
Merge branch 'master' into consistent-terminology-format
2018-10-10 19:19:36 +09:00
smoogipoo
b56d09c83b
Set hitobject placement time manually
2018-10-10 15:32:59 +09:00
smoogipoo
f53bb81723
Remove unnecessary lambda allocation
2018-10-10 14:58:54 +09:00
smoogipoo
417ebaeb85
Reduce hitobject size by removing lazy
2018-10-10 13:03:18 +09:00
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