Commit Graph

22148 Commits

Author SHA1 Message Date
c88a11a38f Merge branch 'master' into fix-multiplayer-crash 2019-04-23 09:28:03 +09:00
a6b60a2fc2 Merge branch 'master' into sh-xh-grading-2 2019-04-22 19:39:20 +03:00
414d555484 Fix possible exit from non-current screen 2019-04-22 19:24:57 +09:00
1f18c08cfc Update framework 2019-04-22 19:17:58 +09:00
5fe45c9bed Merge branch 'master' into update-framework 2019-04-22 19:17:14 +09:00
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
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
5313ba2938 Merge branch 'master' into hp-rewind 2019-04-22 19:02:41 +09:00
8fc0bf24c7 Merge branch 'master' into fix-hold-for-menu-icon 2019-04-22 18:57:43 +09:00
63fd3034ca Merge pull request #4661 from peppy/fix-pause-tests
Fix pause tests and cursor visibility
2019-04-22 18:56:41 +09:00
48e82d4b1c Fix hold for menu button's icon being incorrect 2019-04-22 18:47:28 +09:00
6856571f17 Fix incorrect seek target 2019-04-22 18:45:58 +09:00
55c5ef898d Remove delay on entering player 2019-04-22 18:29:58 +09:00
908eee9942 Fix pause tests 2019-04-22 18:29:51 +09:00
aeae759fcd Rename method + add xmldoc 2019-04-22 18:08:15 +09:00
910b9df2d5 Fix catch awarding too much hp 2019-04-22 18:02:57 +09:00
4edb17a88a Make hp work + cleanup 2019-04-22 18:02:49 +09:00
144e6012dc Implement hp increase for osu! 2019-04-22 17:24:42 +09:00
78c844e259 Make catch provide some HP at DrainRate=10 2019-04-22 17:24:22 +09:00
b3c496d72c Remove delay on entering player 2019-04-22 17:06:40 +09:00
034643b835 Fix pause tests 2019-04-22 17:06:22 +09:00
b59f23d094 Implement hp increase for taiko 2019-04-22 17:04:46 +09:00
4c5f41e40f Implement hp increase for mania 2019-04-22 17:04:18 +09:00
d7919544fe Implement approximate hp increase for catch 2019-04-22 16:59:14 +09:00
fbb4e9df04 Implement hp at base ScoreProcessor 2019-04-22 16:51:38 +09:00
b2b7143ed3 Merge branch 'master' into flashlight-dim 2019-04-22 16:41:25 +09:00
3fbbb7dcf9 Move intiial fade outside of absolute sequence 2019-04-22 16:39:28 +09:00
cfb3c38c3a Fix. 2019-04-22 10:14:19 +03:00
9030935030 Fix AppVeyor Errors 2019-04-22 10:07:45 +03:00
64429aa968 Fix AppVeyor Errors 2019-04-22 09:59:51 +03:00
3c252d79ea Use var, rework dim application logic 2019-04-22 15:59:47 +09:00
7a385e56ec Fix AppVeyor Errors 2019-04-22 09:58:29 +03:00
a47f5040af Improve waveform graph testing 2019-04-22 13:58:05 +09:00
c784bc4418 Remove whitespaces 2019-04-22 06:15:37 +03:00
de542ca202 Remove bindable and use property 2019-04-22 06:14:14 +03:00
26f0b2a4fe Remove bindable
Bad usage
2019-04-22 06:12:41 +03:00
699bdd0498 Merge branch 'master' into sh-xh-grading-2 2019-04-22 05:56:55 +03:00
4cf813dc33 Merge remote-tracking branch 'upstream/master' into update-framework 2019-04-22 11:26:29 +09:00
9d3d1fd10b Merge pull request #4658 from peppy/remove-black-box
Remove black box blocking some visual tests from being visible
2019-04-22 11:12:14 +09:00
8ffb2f4224 Remove black box blocking some visual tests from being visible 2019-04-22 10:55:01 +09:00
732c38fa79 Update framework again 2019-04-22 10:45:56 +09:00
ae51a9e451 Fix drawable rank texture lookup 2019-04-22 09:57:33 +09:00
cff319e0d8 Fix issue 2019-04-21 18:12:50 +03:00
c4b3aef931 Merge branch 'master' into sh-xh-grading-2 2019-04-21 18:06:12 +03:00
c5bf01cc5c Fix issue 2019-04-21 18:05:52 +03:00
b200142afb Make AdjustRank Bindable and fix issue 2019-04-21 17:55:01 +03:00
77614189c9 Make AdjustRank Bindable 2019-04-21 17:48:50 +03:00
4e07975e7c Ranks must be adjusted in Hidden Mod 2019-04-21 15:58:40 +03:00
73da423639 Adjust rank 2019-04-21 15:58:19 +03:00
30d4dd9355 Change + rank strings to be cleaner for the end-user 2019-04-21 21:38:12 +09:00