David Zhao
8f101e4f60
Remove unnecessary multi-slider tracking logic
2019-04-24 18:25:38 +09:00
Dean Herbert
4f31eee5ad
Merge branch 'master' into flashlight-dim
2019-04-24 17:01:11 +09:00
Dean Herbert
67382724f6
Reword and reoganise logic
2019-04-24 16:58:13 +09:00
David Zhao
8222923ab8
Only track logo if we're still the current screen
2019-04-24 16:20:51 +09:00
iiSaLMaN
c5ca337e66
Merge branch 'master' into sh-xh-grading-2
2019-04-24 10:08:08 +03:00
Dean Herbert
73401ebf65
Merge branch 'frame-stability-initial-seek' into fix-lead-in-issues
2019-04-24 15:56:19 +09:00
Dean Herbert
f273f5daae
Remove unnecessary using statement
2019-04-24 15:55:51 +09:00
Dean Herbert
3b36a4982d
Fix tests running under nUnit and running multiple times in concession
2019-04-24 15:46:49 +09:00
Dean Herbert
bb69330e9f
Call ProcessFrame on the userOffsetClock after a seek
...
Without doing this, GameplayClock can be left in an incorrect state after a seek (due to the userOffsetClock being its own FramedClock).
2019-04-24 15:28:14 +09:00
Dean Herbert
efaedafc08
Fix (legacy) AudioLeadIn being used incorrectly.
...
This lead-in is intended to specify a value before zero, not a value before the start time.
Also removes an unnecessary ProcessFrame call (it happens within Seek itself).
2019-04-24 15:28:14 +09:00
Dean Herbert
e69963e60e
Ensure there is enough time before the first object in osu! (roughly following osu-stable specs)
2019-04-24 15:28:14 +09:00
Dean Herbert
a3e7ec0a14
Add tests for FrameStabilityContainer
2019-04-24 15:25:53 +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
Dean Herbert
65f5318298
Shorten multiplayer header to multi ( #4669 )
...
Shorten multiplayer header to multi
2019-04-24 10:32:21 +09:00
iiSaLMaN
a29c7d81ee
Merge branch 'master' into sh-xh-grading-2
2019-04-23 10:31:17 +03:00
Joehu
0838206ddd
Shorten multiplayer header to multi
2019-04-22 22:44:43 -07:00
David Zhao
9890884726
Remove fade in, update comment
2019-04-23 14:23:09 +09:00
Dean Herbert
3bfd2a4d2f
Fix gameplay cursor being hidden in tests/replays ( #4667 )
...
Fix gameplay cursor being hidden in tests/replays
2019-04-23 13:54:44 +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
Dean Herbert
52336e9062
Fix pause tests
2019-04-23 11:54:41 +09:00
Dan Balasescu
0bf17081f6
Merge branch 'master' into update-framework
2019-04-23 11:31:17 +09:00
Dean Herbert
b8712b36ec
Fix possible exit from non-current screen ( #4663 )
...
Fix possible exit from non-current screen
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-04-23 09:52:20 +09:00
Dean Herbert
c88a11a38f
Merge branch 'master' into fix-multiplayer-crash
2019-04-23 09:28:03 +09:00
iiSaLMaN
a6b60a2fc2
Merge branch 'master' into sh-xh-grading-2
2019-04-22 19:39:20 +03:00
smoogipoo
414d555484
Fix possible exit from non-current screen
2019-04-22 19:24:57 +09:00
Dean Herbert
1f18c08cfc
Update framework
2019-04-22 19:17:58 +09:00
Dean Herbert
5fe45c9bed
Merge branch 'master' into update-framework
2019-04-22 19:17:14 +09:00
Dean Herbert
ffd8268076
Fix hold for menu button's icon being incorrect ( #4662 )
...
Fix hold for menu button's icon being incorrect
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-04-22 19:16:29 +09:00
Dean Herbert
c1b649b0fb
Standardise health adjustment process across all rulesets ( #4660 )
...
Standardise health adjustment process across all rulesets
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-04-22 19:16:14 +09:00
Dean Herbert
5313ba2938
Merge branch 'master' into hp-rewind
2019-04-22 19:02:41 +09:00
Dan Balasescu
8fc0bf24c7
Merge branch 'master' into fix-hold-for-menu-icon
2019-04-22 18:57:43 +09:00
Dan Balasescu
63fd3034ca
Merge pull request #4661 from peppy/fix-pause-tests
...
Fix pause tests and cursor visibility
2019-04-22 18:56:41 +09:00
Dean Herbert
48e82d4b1c
Fix hold for menu button's icon being incorrect
2019-04-22 18:47:28 +09:00
Dean Herbert
6856571f17
Fix incorrect seek target
2019-04-22 18:45:58 +09:00
Dean Herbert
55c5ef898d
Remove delay on entering player
2019-04-22 18:29:58 +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
910b9df2d5
Fix catch awarding too much hp
2019-04-22 18:02:57 +09:00
smoogipoo
4edb17a88a
Make hp work + cleanup
2019-04-22 18:02:49 +09:00
smoogipoo
144e6012dc
Implement hp increase for osu!
2019-04-22 17:24:42 +09:00
smoogipoo
78c844e259
Make catch provide some HP at DrainRate=10
2019-04-22 17:24:22 +09:00
Dean Herbert
b3c496d72c
Remove delay on entering player
2019-04-22 17:06:40 +09:00
Dean Herbert
034643b835
Fix pause tests
2019-04-22 17:06:22 +09:00
smoogipoo
b59f23d094
Implement hp increase for taiko
2019-04-22 17:04:46 +09:00
smoogipoo
4c5f41e40f
Implement hp increase for mania
2019-04-22 17:04:18 +09:00
smoogipoo
d7919544fe
Implement approximate hp increase for catch
2019-04-22 16:59:14 +09:00
smoogipoo
fbb4e9df04
Implement hp at base ScoreProcessor
2019-04-22 16:51:38 +09:00
David Zhao
b2b7143ed3
Merge branch 'master' into flashlight-dim
2019-04-22 16:41:25 +09:00
