1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 00:02:54 +08:00
Commit Graph

15786 Commits

Author SHA1 Message Date
Dean Herbert
651abd2e11 Update framework 2019-12-27 21:51:18 +09:00
Dan Balasescu
199c0bca02
Merge branch 'master' into fix-mod-read-setting 2019-12-27 17:45:24 +09:00
Dan Balasescu
ecfe1d361b
Merge branch 'master' into fix-mod-read-setting 2019-12-27 17:29:13 +09:00
Dean Herbert
b330aec03e Drain starting at the first hitobject, not gameplay start 2019-12-27 16:16:30 +09:00
Dean Herbert
aa97487f8e
Merge branch 'master' into hp-drain 2019-12-27 14:58:22 +09:00
Dean Herbert
6bff5cfb9e Merge remote-tracking branch 'upstream/master' into avoid-duplicate-empty-archives 2019-12-27 14:07:34 +09:00
Dean Herbert
ea52bbea35 Update framework 2019-12-27 14:05:48 +09:00
Dean Herbert
9478fe5ec3 Revert to using empty container, not null 2019-12-27 13:15:55 +09:00
smoogipoo
c22744de2c Better define minimum health targets 2019-12-27 12:46:35 +09:00
smoogipoo
fbbd16b4f0 Remove healthIncreases nullability 2019-12-27 12:39:25 +09:00
Andrei Zavatski
04a4821a9f Make CreateContent a method again 2019-12-27 06:36:41 +03:00
Andrei Zavatski
2d167a5161 Some little size adjustments 2019-12-27 05:53:31 +03:00
Andrei Zavatski
3feaaa3e4d Use FillMode.Fit for icons 2019-12-27 05:37:06 +03:00
Andrei Zavatski
dc720dd653 Bump ppy.osu.Game.Resources from 2019.1215.0 to 2019.1227.0 2019-12-27 05:27:36 +03:00
Andrei Zavatski
3ae0564db7 Merge master with conflicts resolved 2019-12-27 05:17:53 +03:00
Dean Herbert
183307d636 Use circle instead of CircularContainer 2019-12-27 10:53:20 +09:00
Andrei Zavatski
bd6e603be3 Add icon for profile header 2019-12-27 04:01:33 +03:00
Andrei Zavatski
25f6517fba Update dependency 2019-12-27 03:53:01 +03:00
Andrei Zavatski
3d7c7a1ced Fix profile title wasn't in lowercase 2019-12-26 22:39:13 +03:00
Andrei Zavatski
e360aa4588 Fix TabControl wasn't on top of everything 2019-12-26 22:16:20 +03:00
Andrei Zavatski
a1c91af095 Update layout of every overlay using OverlayHeader 2019-12-26 22:09:06 +03:00
Andrei Zavatski
647c83e6c8 Add ability to not create content for headers
Rather than creating an empty container
2019-12-26 21:21:15 +03:00
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
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
Dean Herbert
a4d4efc312
Fix missing comments 2019-12-26 19:33:59 +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
smoogipoo
8903f286ef Fix escape not continuing to results screen 2019-12-26 18:27:48 +09:00
smoogipoo
35f64d9aae More comments 2019-12-26 17:54:31 +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
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