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