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

20271 Commits

Author SHA1 Message Date
Dean Herbert
08014b1b99 Fix logo masking not being applied correctly for showcase/win screens 2019-07-13 11:13:05 +09:00
Dean Herbert
e973af9e52
Fix toggling storyboard after first load not getting correct cl… (#5299)
Fix toggling storyboard after first load not getting correct clock

Co-authored-by: Dean Herbert <pe@ppy.sh>
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-12 22:56:51 +09:00
Dan Balasescu
986031e127
Merge branch 'master' into storyboard-clock-di 2019-07-12 23:14:12 +09:30
Dean Herbert
a024bfd33a
Fix skip button not being clickable after fade out (#5245)
Fix skip button not being clickable after fade out

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-12 22:28:32 +09:00
Dean Herbert
3c665bfb29
Revert breaking README change 2019-07-12 22:21:25 +09:00
kakiremora
341f246223 Fix README icon display on mobile (#5341) 2019-07-12 22:17:13 +09:00
Dan Balasescu
fc96fbc8a1
Merge branch 'master' into fix-skip-button-clickability 2019-07-12 22:44:20 +09:30
Dan Balasescu
2a98c261eb
Merge pull request #5340 from peppy/update-icon
Use new logo style for icons / readme
2019-07-12 21:11:50 +09:30
Dean Herbert
1b29cfea3a Update android icon 2019-07-12 18:24:49 +09:00
Dean Herbert
23419a0ec3 Add drop shadow 2019-07-12 18:06:36 +09:00
Dean Herbert
376d228add Use new logo style for icons / readme 2019-07-12 17:49:59 +09:00
Dean Herbert
56be69abc7
Add link to bounty history to readme (#5339)
Add link to bounty history to readme
2019-07-12 17:46:45 +09:00
Dean Herbert
b24a6e64bd Add link to bounty history to readme 2019-07-12 16:22:02 +09:00
Dean Herbert
44855d8bb2 Ensure any existing background is expired if set more than once 2019-07-12 13:45:34 +09:00
Dean Herbert
671f7f99cd Use constant for blur amount 2019-07-12 13:44:43 +09:00
Dean Herbert
8b67f88d16 Don't expose dimmable container creation in player 2019-07-12 12:04:45 +09:00
Dean Herbert
46f7bb885b Move classes to local namespaces
Also renames test scene to more appropriate name.
2019-07-12 11:50:06 +09:00
Dean Herbert
b5ca7faca4 Move default value for EnableUserDim to base class 2019-07-12 11:40:38 +09:00
Dean Herbert
0d9f978857 Don't expose DimContainer 2019-07-12 11:38:15 +09:00
Dean Herbert
c9599b65eb Merge remote-tracking branch 'upstream/master' into storyboard-clock-di 2019-07-12 11:20:43 +09:00
Dean Herbert
3be5aff82d
Merge pull request #5205 from UselessToucan/flow_container_insert
Make FlowContainer insertions cleaner
2019-07-11 23:13:58 +09:00
Dean Herbert
ecbd0f7eff
Merge branch 'master' into fix-skip-button-clickability 2019-07-11 23:10:28 +09:00
Dean Herbert
6c8cf193bd
Disable frame accurate replay playback (#5316)
Disable frame accurate replay playback
2019-07-11 23:09:54 +09:00
Dean Herbert
19e8198bff
Merge branch 'master' into flow_container_insert 2019-07-11 22:53:57 +09:00
Dean Herbert
9cbd17415c
Force SQLite to multithreading mode (#5269)
Force SQLite to multithreading mode
2019-07-11 22:53:18 +09:00
Dean Herbert
72da615dde
Fix track transfer not running when beatmap is retrieved from c… (#5296)
Fix track transfer not running when beatmap is retrieved from cache
2019-07-11 22:53:07 +09:00
Dean Herbert
931a3936df
Update framework (#5333)
Update framework
2019-07-11 22:52:50 +09:00
Dean Herbert
b6e15fb791 Update framework 2019-07-11 22:33:51 +09:00
David Zhao
932243cfd4 public before private 2019-07-11 14:14:00 +09:00
David Zhao
ac170a6957 add comment and cleanup 2019-07-11 14:00:25 +09:00
Dean Herbert
548008c9ce
Merge pull request #5311 from Joehuu:lb-sign-out-placeholder
Update beatmap leaderboard to placeholder when signing out
2019-07-11 13:55:18 +09:00
David Zhao
6c0de0b436 Merge remote-tracking branch 'upstream/master' into storyboard-clock-di 2019-07-11 13:33:35 +09:00
David Zhao
321266e96f Make UserDimContainer abstract 2019-07-11 13:17:28 +09:00
Dean Herbert
c68b7a69b7
Add ablity to see user's top score in beatmap overlay (#5297)
Add ablity to see user's top score in beatmap overlay

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-11 11:58:03 +09:00
Dean Herbert
c22633967b Merge remote-tracking branch 'upstream/master' into user-best-score 2019-07-11 11:32:47 +09:00
Dean Herbert
85f2212ebc Reduce spacing and font for rank position 2019-07-11 11:32:42 +09:00
Dean Herbert
8f9b8ed5a1 Simplify information propagation logic 2019-07-11 11:17:33 +09:00
Dean Herbert
cc9ee472d6 Move score nulling out of loading property 2019-07-11 11:07:30 +09:00
Dean Herbert
a49bde7ed3 Move protected below public 2019-07-11 10:38:32 +09:00
Dean Herbert
f9e3b521f3
Merge pull request #5326 from iiSaLMaN/fix-beatmap-length-issues
Use the correct property to retrieve the milliseconds for online length
2019-07-11 08:21:31 +09:00
iiSaLMaN
b2f23a10c8 Use the correct property to retrieve the milliseconds 2019-07-10 23:12:18 +03:00
Andrei Zavatski
953d32366c Move request inside the ScoresContainer again 2019-07-10 19:40:29 +03:00
Andrei Zavatski
a041421e0d Merge remote-tracking branch 'refs/remotes/ppy/master' into user-best-score 2019-07-10 19:39:41 +03:00
Dean Herbert
e23d42522c
Merge pull request #5295 from peppy/fix-misc-inspections
Fix a few inspections from EAP r#
2019-07-11 00:56:18 +09:00
Dean Herbert
f21e700b7a Code style cleanup 2019-07-11 00:42:14 +09:00
Dean Herbert
c76b340a28
Remember user's selected pause state when changing game screens (#5289)
Remember user's selected pause state when changing game screens

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-11 00:37:09 +09:00
Dean Herbert
2285c2b1df
Merge branch 'master' into user-best-score 2019-07-11 00:31:26 +09:00
Dean Herbert
3b448b0086 Merge remote-tracking branch 'upstream/master' into Desconocidosmh-master 2019-07-11 00:25:35 +09:00
Dean Herbert
ad873b542a Simplify editor logic 2019-07-11 00:22:40 +09:00
Dean Herbert
6819c528db Use canBeNull instead of needlessly caching MusicController for tests 2019-07-11 00:20:01 +09:00