smoogipoo
|
4abe0473b9
|
Fix relative beat length not considering slider multiplier
|
2019-09-24 16:49:42 +09:00 |
|
smoogipoo
|
af0c15a93c
|
Fix initial hitobject states not being recomputed correctly
|
2019-09-24 16:48:39 +09:00 |
|
smoogipoo
|
75cceb9e30
|
Fix LifetimeChanged being invoked before lifetime is set
|
2019-09-24 16:47:34 +09:00 |
|
Dean Herbert
|
c99b48f934
|
Bring up-to-date and use IApplicableFailOverride
|
2019-09-21 23:30:54 +09:00 |
|
Dean Herbert
|
4c4b71eeec
|
Merge branch 'master' into master
|
2019-09-21 22:45:05 +09:00 |
|
Andrei Zavatski
|
e7118a9272
|
Use System mod type for NoMod
|
2019-09-20 23:47:21 +03:00 |
|
Andrei Zavatski
|
0d43f4e4f9
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
|
2019-09-20 23:39:44 +03:00 |
|
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 |
|