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

18200 Commits

Author SHA1 Message Date
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
David Zhao
3fbbb7dcf9 Move intiial fade outside of absolute sequence 2019-04-22 16:39:28 +09:00
iiSaLMaN
cfb3c38c3a
Fix. 2019-04-22 10:14:19 +03:00
iiSaLMaN
9030935030
Fix AppVeyor Errors 2019-04-22 10:07:45 +03:00
iiSaLMaN
64429aa968
Fix AppVeyor Errors 2019-04-22 09:59:51 +03:00
David Zhao
3c252d79ea Use var, rework dim application logic 2019-04-22 15:59:47 +09:00
iiSaLMaN
7a385e56ec
Fix AppVeyor Errors 2019-04-22 09:58:29 +03:00
smoogipoo
a47f5040af Improve waveform graph testing 2019-04-22 13:58:05 +09:00
iiSaLMaN
c784bc4418
Remove whitespaces 2019-04-22 06:15:37 +03:00
iiSaLMaN
de542ca202
Remove bindable and use property 2019-04-22 06:14:14 +03:00
iiSaLMaN
26f0b2a4fe
Remove bindable
Bad usage
2019-04-22 06:12:41 +03:00
iiSaLMaN
699bdd0498
Merge branch 'master' into sh-xh-grading-2 2019-04-22 05:56:55 +03:00
Dean Herbert
4cf813dc33 Merge remote-tracking branch 'upstream/master' into update-framework 2019-04-22 11:26:29 +09:00
Dan Balasescu
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
Dean Herbert
8ffb2f4224 Remove black box blocking some visual tests from being visible 2019-04-22 10:55:01 +09:00
Dean Herbert
732c38fa79 Update framework again 2019-04-22 10:45:56 +09:00
Dean Herbert
ae51a9e451 Fix drawable rank texture lookup 2019-04-22 09:57:33 +09:00
iiSaLMaN
cff319e0d8
Fix issue 2019-04-21 18:12:50 +03:00
iiSaLMaN
c4b3aef931
Merge branch 'master' into sh-xh-grading-2 2019-04-21 18:06:12 +03:00
iiSaLMaN
c5bf01cc5c
Fix issue 2019-04-21 18:05:52 +03:00
iiSaLMaN
b200142afb
Make AdjustRank Bindable and fix issue 2019-04-21 17:55:01 +03:00
iiSaLMaN
77614189c9
Make AdjustRank Bindable 2019-04-21 17:48:50 +03:00
iiSaLMaN
4e07975e7c
Ranks must be adjusted in Hidden Mod 2019-04-21 15:58:40 +03:00
iiSaLMaN
73da423639
Adjust rank 2019-04-21 15:58:19 +03:00
Dean Herbert
30d4dd9355 Change + rank strings to be cleaner for the end-user 2019-04-21 21:38:12 +09:00
Dean Herbert
6f2bc943eb Fix rank display on break info display 2019-04-21 12:04:15 +08:00
iiSaLMaN
59da78b0d4
nothing. 2019-04-20 06:44:59 +03:00
iiSaLMaN
8e485f3283
Fix issue 2019-04-20 06:41:09 +03:00
Dan Balasescu
4e1a9e4228
Merge pull request #4648 from smoogipoo/appveyor-broken
Fix appveyor temporarily
2019-04-19 21:38:01 +09:00
smoogipoo
4cf234295c Fix appveyor temporarily 2019-04-19 21:27:24 +09:00
smoogipoo
5989cf2849 Revert "Increase diagnostic level"
This reverts commit 7a0320d39e.
2019-04-19 20:39:25 +09:00
smoogipoo
489929d25c Fix PlayerLoader testcase being completely broken 2019-04-19 20:38:38 +09:00
smoogipoo
d3920d652d Fix loader animation test case 2019-04-19 20:38:38 +09:00
David Zhao
6502e26d09 Add draw size invalidation to ZoomableScrollContainer 2019-04-19 16:21:15 +09:00
Dean Herbert
7a0320d39e Increase diagnostic level 2019-04-19 00:01:26 +08:00
Dean Herbert
c8d760b555 Attempt using previous appveyor image 2019-04-18 21:33:29 +08:00
Dean Herbert
9d6912a692 Update framework 2019-04-18 21:23:40 +08:00
David Zhao
037e23247f Remove unused using 2019-04-18 14:31:47 +09:00
David Zhao
dfa5beea89 Use the actual scale of Flashlight for FlashlightSize 2019-04-18 14:24:19 +09:00
Dean Herbert
d1799d197d Update resources and mods usage 2019-04-18 09:27:30 +08:00
Dean Herbert
879f6152b0 Merge remote-tracking branch 'upstream/master' into flashlight-dim 2019-04-17 22:17:10 +08:00
Dean Herbert
f6cbae578b
Merge pull request #4614 from smoogipoo/player-mod-reinstantiation
Reinstantiate mods for each player instance

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-04-17 16:57:58 +08:00
Dean Herbert
2d7b3094ba
Merge branch 'master' into player-mod-reinstantiation 2019-04-17 16:42:57 +08:00
Dan Balasescu
118f512d98
Merge pull request #4540 from nyquillerium/facade-container
Implement FacadeContainer for tracking logo positions in other containers
2019-04-17 17:33:08 +09:00
smoogipoo
12b6bc48bd Use .With() wherever possible 2019-04-17 17:24:09 +09:00
smoogipoo
c145ce2d00 Remove usings 2019-04-17 17:19:55 +09:00
smoogipoo
09568be270 Merge remote-tracking branch 'origin/master' into facade-container
# Conflicts:
#	osu.Game/Screens/Play/PlayerLoader.cs
2019-04-17 17:17:33 +09:00