3a5015d013
Merge branch 'master' into fix-hold-note-input
2019-12-27 21:48:38 +09:00
2df57918b1
Merge pull request #7357 from peppy/fix-mod-read-setting
...
Fix difficulty adjust mod not correctly reading settings while leaderboard visible
2019-12-27 17:45:50 +09:00
199c0bca02
Merge branch 'master' into fix-mod-read-setting
2019-12-27 17:45:24 +09:00
750b0746cd
Implement HP drain ( #7361 )
...
Implement HP drain
Co-authored-by: Dean Herbert <pe@ppy.sh >
2019-12-27 17:44:51 +09:00
ecfe1d361b
Merge branch 'master' into fix-mod-read-setting
2019-12-27 17:29:13 +09:00
7507fee9f9
Add test for HP rewind
2019-12-27 16:55:46 +09:00
b330aec03e
Drain starting at the first hitobject, not gameplay start
2019-12-27 16:16:30 +09:00
aa97487f8e
Merge branch 'master' into hp-drain
2019-12-27 14:58:22 +09:00
df7714a3e8
Give empty archives a hash based on archive name to avoid dupli… ( #7363 )
...
Give empty archives a hash based on archive name to avoid duplicate imports
2019-12-27 14:55:58 +09:00
6bff5cfb9e
Merge remote-tracking branch 'upstream/master' into avoid-duplicate-empty-archives
2019-12-27 14:07:34 +09:00
ea52bbea35
Update framework
2019-12-27 14:05:48 +09:00
ebbd32fb28
Merge pull request #7366 from EVAST9919/overlay-headers-update-two
...
Update overlay headers layout in line with the new web design
2019-12-27 13:53:48 +09:00
8eef636e6c
Merge branch 'master' into overlay-headers-update-two
2019-12-27 13:28:51 +09:00
84c10728d8
Use mania-specific judgement sprites for mania ( #7365 )
...
Use mania-specific judgement sprites for mania
Co-authored-by: Dean Herbert <pe@ppy.sh >
2019-12-27 13:22:40 +09:00
9478fe5ec3
Revert to using empty container, not null
2019-12-27 13:15:55 +09:00
9f3c53cc0a
Update resources
2019-12-27 13:02:54 +09:00
35cdd67c4a
Remove instantiation of non-existing processor
2019-12-27 12:47:23 +09:00
c22744de2c
Better define minimum health targets
2019-12-27 12:46:35 +09:00
fbbd16b4f0
Remove healthIncreases nullability
2019-12-27 12:39:25 +09:00
04a4821a9f
Make CreateContent a method again
2019-12-27 06:36:41 +03:00
2d167a5161
Some little size adjustments
2019-12-27 05:53:31 +03:00
3feaaa3e4d
Use FillMode.Fit for icons
2019-12-27 05:37:06 +03:00
cfa1dfa1a4
Split out into own method
2019-12-27 11:37:05 +09:00
380c3161f1
Update resources
2019-12-27 11:28:07 +09:00
dc720dd653
Bump ppy.osu.Game.Resources from 2019.1215.0 to 2019.1227.0
2019-12-27 05:27:36 +03:00
3ae0564db7
Merge master with conflicts resolved
2019-12-27 05:17:53 +03:00
5260eb76d0
Merge remote-tracking branch 'upstream/master' into mania-judgement
2019-12-27 11:17:47 +09:00
66ae97709a
Update ScreenTitle in line with the new web design ( #7350 )
...
Update ScreenTitle in line with the new web design
Co-authored-by: Dean Herbert <pe@ppy.sh >
2019-12-27 11:10:46 +09:00
183307d636
Use circle instead of CircularContainer
2019-12-27 10:53:20 +09:00
bd6e603be3
Add icon for profile header
2019-12-27 04:01:33 +03:00
25f6517fba
Update dependency
2019-12-27 03:53:01 +03:00
39cfe848e9
Improve notification overlay test robustness ( #7368 )
...
Improve notification overlay test robustness
2019-12-27 09:28:48 +09:00
fd8c5d7706
Improve notification overlay test robustness
...
Stress testing one of the notification overlay tests by running it 10000
times on repeat has shown that it is susceptible to intermittent
failures due to races between delays and asserts checking the number of
currently progressing notifications and the actual progress update,
which contains a random generation factor.
Replace step sequences checking for notification completion by waiting
and asserting with explicit until steps that don't terminate unless
there are zero progressing notifications.
2019-12-26 23:01:31 +01:00
3d7c7a1ced
Fix profile title wasn't in lowercase
2019-12-26 22:39:13 +03:00
e360aa4588
Fix TabControl wasn't on top of everything
2019-12-26 22:16:20 +03:00
a1c91af095
Update layout of every overlay using OverlayHeader
2019-12-26 22:09:06 +03:00
647c83e6c8
Add ability to not create content for headers
...
Rather than creating an empty container
2019-12-26 21:21:15 +03:00
ca3e8db79f
Merge dependency
2019-12-26 21:03:39 +03:00
2d32fe08ff
Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay_headers_update
2019-12-26 21:02:14 +03:00
cac011edc1
Merge branch 'master' into hp-drain
2019-12-26 23:51:12 +09:00
32843ffef5
Merge branch 'master' into fix-hold-note-input
2019-12-26 23:50:53 +09:00
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
3d5561b02e
Separate health and score processing components ( #7358 )
...
Separate health and score processing components
2019-12-26 23:48:55 +09:00
64381bf4b1
rm unnecessary usings
2019-12-26 22:08:46 +08:00
75d1e4cc76
rm TestLegacySkin
2019-12-26 22:06:29 +08:00
8ebfe5cfd8
add tests
2019-12-26 21:15:49 +08:00
92dd1ade17
Attempt to implement mania-specific sprites
2019-12-26 21:03:21 +08:00
a4d4efc312
Fix missing comments
2019-12-26 19:33:59 +09:00
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
00a36c388c
Fix tests
2019-12-26 19:18:39 +09:00