1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 15:17:44 +08:00
Commit Graph

499 Commits

Author SHA1 Message Date
Lucas A
d5b7865ab8 Invert notification and loginOverlay depth order 2019-04-06 17:40:48 +02:00
Joehu
debda7ae7d Fix volume overlay container reference 2019-04-05 00:05:42 -07:00
Joehu
53906e87ec Split floatingOverlayContent 2019-04-05 00:00:21 -07:00
Dean Herbert
1709e22763
Merge branch 'master' into fix-blocked-volume-overlay 2019-04-04 17:28:46 +09:00
Samuel Van Allen
55a6e43778 Check against databasedSet instead of function param 2019-04-03 21:49:33 +08:00
Samuel Van Allen
e9269dc83b Prevent unnecessary query in OsuGame::PresentBeatmap
This resolves issue #4575
2019-04-02 23:57:31 +08:00
Dean Herbert
f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
Joehu
1ba608f01f Remove line spacing on similar code 2019-03-29 00:26:17 -07:00
Joehu
eefc55f89b Fix volume overlay being blocked by other floating overlays
- excluding settings
2019-03-29 00:20:16 -07:00
Dean Herbert
ccc0853f75 Change login overlay's depth and load order 2019-03-29 14:53:40 +09:00
Dean Herbert
90a4cb8e04 Fix unnecessary positioning 2019-03-29 14:49:15 +09:00
Joseph Madamba
9a32e12435
Merge branch 'master' into fix-login-overlay-behavior 2019-03-28 22:28:56 -07:00
Dean Herbert
95bf0b9ed6 Merge remote-tracking branch 'upstream/master' into fix-music-controller-offset 2019-03-29 13:57:02 +09:00
Dean Herbert
c4096fb628 Remove unused using 2019-03-29 13:56:56 +09:00
Dean Herbert
176b4ecc38
Merge branch 'master' into sprite-icon-compatibility 2019-03-28 23:47:44 +09:00
Joehu
9a3528ea9d Fix field modifier 2019-03-27 22:31:40 -07:00
Joehu
53f3dacdfb Fix login overlay behavior 2019-03-27 22:01:06 -07:00
Joehu
bdb39a79a9 Fix offset of music controller when toolbar is hidden 2019-03-27 20:27:26 -07:00
Joseph Madamba
cdf79ffe39
Merge branch 'master' into clean-overlays-code-1 2019-03-27 10:32:13 -07:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
David Zhao
5169f7a43c Change default for null screen parallax, apply reviews 2019-03-24 16:21:43 +09:00
David Zhao
dcae86e39a Add a new test for OsuScreenStack, fix parallax 2019-03-22 14:10:38 +09:00
Joseph Madamba
d5272a83cf
Rename "urgent" to "topMost" 2019-03-21 11:16:10 -07:00
Joehu
1f95abf7c7 Fix regressions caused by removing specified depths
- urgentOverlayContent is added so toolbar can be loaded first
2019-03-19 21:30:24 -07:00
Joehu
a39648edbc Normalize format of single line curly brackets 2019-03-19 20:51:43 -07:00
Joehu
44e0291737 Remove specified depths of overlays 2019-03-19 20:47:12 -07:00
David Zhao
9368081b99 Fix TestCasePlayer 2019-03-12 17:33:16 +09:00
David Zhao
e3567a5507 Make OsuGame use OsuScreenStack too 2019-03-12 16:03:25 +09:00
Dan Balasescu
fd147dae21
Merge branch 'master' into fix-disabled-set-crash 2019-03-05 17:25:13 +09:00
smoogipoo
7583279e08 Remove unnecessary precondition 2019-03-01 13:29:02 +09:00
Shane Woolcock
5d1eacf1c1 Ensure all OsuFocusedOverlayContainers contribute to screen fading 2019-03-01 12:20:31 +09:00
smoogipoo
951b95ff78 Fix potential race condition 2019-02-28 17:17:57 +09:00
Dean Herbert
2dbf7d122c
Merge branch 'master' into use-pattern-matching 2019-02-28 14:53:07 +09:00
Dean Herbert
e2c6a8bc07 Use pattern matching wherever possible 2019-02-28 14:35:00 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Dean Herbert
43b02212ce Add disposal check in single file load path 2019-02-28 12:24:56 +09:00
Dan Balasescu
32b8bb2ccc
Fix broken grammar
Co-Authored-By: peppy <pe@ppy.sh>
2019-02-26 12:28:49 +09:00
Dean Herbert
314f35b0c5 Further simplify import messaging 2019-02-25 18:42:08 +09:00
Dean Herbert
80737b9ef8 Remove "silent" parameter; consolidate import logic 2019-02-25 18:24:06 +09:00
Dean Herbert
706da017d7 Add target screen support and user bypass 2019-02-25 14:01:51 +09:00
Dean Herbert
caef58675d Tidy up and standardise present logic 2019-02-25 12:58:58 +09:00
Dean Herbert
56397dbea6 Ensure beatmap is not disabled before continuing with present 2019-02-24 12:08:27 +09:00
Dean Herbert
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
Dean Herbert
3fe4b8fd1c Update variable names
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
smoogipoo
49eadcb575 Update active state immediately + fix potential nullref 2019-02-19 19:44:09 +09:00
smoogipoo
703df77000 Update in-line with framework IsActive changes 2019-02-19 19:16:03 +09:00
Jamie Taylor
3ea13b1ade
Fix mouse cursor appearing prematurely during startup 2019-02-15 16:55:39 +09:00
Dean Herbert
5318de29b4 Fix import logic again 2019-02-13 19:57:54 +09:00