1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 20:47:24 +08:00
Commit Graph

24904 Commits

Author SHA1 Message Date
Andrei Zavatski
ca3e8db79f Merge dependency 2019-12-26 21:03:39 +03:00
Andrei Zavatski
2d32fe08ff Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay_headers_update 2019-12-26 21:02:14 +03:00
Dean Herbert
cac011edc1
Merge branch 'master' into hp-drain 2019-12-26 23:51:12 +09:00
Dean Herbert
32843ffef5
Merge branch 'master' into fix-hold-note-input 2019-12-26 23:50:53 +09:00
Dean Herbert
033bb15500
Fix early-escape not continuing to results screen (#7362)
Fix early-escape not continuing to results screen
2019-12-26 23:50:21 +09:00
Dean Herbert
3d5561b02e
Separate health and score processing components (#7358)
Separate health and score processing components
2019-12-26 23:48:55 +09:00
mcendu
64381bf4b1
rm unnecessary usings 2019-12-26 22:08:46 +08:00
mcendu
75d1e4cc76
rm TestLegacySkin 2019-12-26 22:06:29 +08:00
mcendu
8ebfe5cfd8
add tests 2019-12-26 21:15:49 +08:00
mcendu
92dd1ade17
Attempt to implement mania-specific sprites 2019-12-26 21:03:21 +08:00
Dean Herbert
a4d4efc312
Fix missing comments 2019-12-26 19:33:59 +09:00
Dean Herbert
8d79934d39
Fix nub position getting offset by size changes (#7359)
Fix nub position getting offset by size changes
2019-12-26 19:18:52 +09:00
smoogipoo
00a36c388c Fix tests 2019-12-26 19:18:39 +09:00
Dean Herbert
a041f32072 Use cleaner solution via cancellation of older schedule 2019-12-26 19:05:32 +09:00
Dean Herbert
74d875a2e0 Give empty archives a hash based on archive name to avoid duplicate imports 2019-12-26 18:44:50 +09:00
Dan Balasescu
f005784070
Merge pull request #7360 from huoyaoyuan/mod-typo
Fix name typo of OsuModObjectScaleTween
2019-12-26 18:29:10 +09:00
smoogipoo
8903f286ef Fix escape not continuing to results screen 2019-12-26 18:27:48 +09:00
smoogipoo
d45556eb6a Remove whitespace 2019-12-26 17:57:16 +09:00
smoogipoo
35f64d9aae More comments 2019-12-26 17:54:31 +09:00
smoogipoo
7ee0370d23 Add some tests 2019-12-26 17:48:46 +09:00
smoogipoo
f5dbd57d55 Refactor drain calculation for resiliency 2019-12-26 17:36:40 +09:00
smoogipoo
662ec2d812 Refactor gameplay-time drain limitation 2019-12-26 15:46:07 +09:00
smoogipoo
429272b864 Clean up + document taiko health processor 2019-12-26 15:28:30 +09:00
Huo Yaoyuan
9a013acb26 Fix name typo of OsuModObjectScaleTween 2019-12-26 14:25:41 +08:00
smoogipoo
96a4f9ae53 Fix nub position getting offset by size changes 2019-12-26 15:14:19 +09:00
smoogipoo
e0c1072ab2 Add xmldocs 2019-12-26 15:01:19 +09:00
smoogipoo
eba6371526 Re-implement taiko's accumulating health processor 2019-12-26 15:01:19 +09:00
smoogipoo
3b07c3913d Add perfect and ok values, move to base Judgement 2019-12-26 15:00:59 +09:00
smoogipoo
0454c5022d Fix some maps potentially starting with 0 health 2019-12-26 15:00:59 +09:00
smoogipoo
90a0569660 Tweak drain values 2019-12-26 15:00:58 +09:00
smoogipoo
522847987b Implement break/gameplay start times 2019-12-26 15:00:58 +09:00
smoogipoo
b348abcd07 Only drain health in non-break times 2019-12-26 14:59:49 +09:00
smoogipoo
977fb3d1bf Make processors and break overlay frame-stable 2019-12-26 14:59:49 +09:00
smoogipoo
85c44b5a5a Disable list additions during gameplay 2019-12-26 14:59:49 +09:00
smoogipoo
bd74d086fb Remove adjustment factor 2019-12-26 14:59:49 +09:00
smoogipoo
70d2d8a2fa Add adjustable target percentage 2019-12-26 14:59:49 +09:00
smoogipoo
a4b1c79e18 Initial implementation of HP drain 2019-12-26 14:59:49 +09:00
smoogipoo
985277da79 Add time elapsation to judgement simulation 2019-12-26 14:59:49 +09:00
smoogipoo
90cb9d9162 Simplify scoreprocesor/healthprocessor implementations 2019-12-26 14:59:49 +09:00
smoogipoo
7414a6aadd Merge remote-tracking branch 'huoyaoyuan/master' into health-processor
# Conflicts:
#	osu.Game.Rulesets.Catch/CatchRuleset.cs
#	osu.Game.Rulesets.Mania/ManiaRuleset.cs
#	osu.Game.Rulesets.Taiko/TaikoRuleset.cs
2019-12-26 14:56:54 +09:00
Dean Herbert
f603dd82bc Fix difficulty adjust mod not correctly reading settings while leaderboard visible 2019-12-26 14:52:08 +09:00
Dan Balasescu
5a11fe9a84
Merge pull request #7347 from peppy/fix-sample-lookup
Fix sample lookup not working correctly for custom rulesets
2019-12-26 12:40:55 +09:00
Andrei Zavatski
bb4d02a1f8 Fix incorrect icon offset 2019-12-25 22:09:14 +03:00
Andrei Zavatski
c77679e36c Naming fixes for overlays using ScreenTitle 2019-12-25 21:57:22 +03:00
Andrei Zavatski
3e34155114 Update ScreenTitle with the new design 2019-12-25 21:56:43 +03:00
Dean Herbert
a47e5aeead Fix sample lookup not working correctly for custom rulesets 2019-12-26 00:51:44 +09:00
Dan Balasescu
19ce3eba28
Merge pull request #7338 from peppy/remove-legacy-id
Fix missing ruleset IDs in non-legacy rulesets
2019-12-25 21:41:46 +09:00
Dean Herbert
9b0af901ef
Merge branch 'master' into remove-legacy-id 2019-12-25 21:25:33 +09:00
Dean Herbert
3862bbfa25
Allow ctrl-tabbing on more tab controls (#7319)
Allow ctrl-tabbing on more tab controls
2019-12-25 21:09:27 +09:00
Dan Balasescu
9702cc9809
Merge branch 'master' into remove-legacy-id 2019-12-25 21:01:12 +09:00