1
0
mirror of https://github.com/ppy/osu.git synced 2024-10-01 23:37:30 +08:00
Commit Graph

571 Commits

Author SHA1 Message Date
Dean Herbert
609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
smoogipoo
4dc77d64a3 Fix overlay group + depth 2019-05-31 13:23:50 +09:00
Dean Herbert
40f7cbde3a Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay 2019-05-21 14:00:50 +09:00
Dean Herbert
85a41cf6c3 Allow chaining of loadComponentSingleFile 2019-05-21 13:44:18 +09:00
Dean Herbert
d7098e2066 Hide other overlays when showing changelog 2019-05-15 17:38:19 +09:00
Dean Herbert
e46a61febf Allow chaining of loadComponentSingleFile 2019-05-15 17:36:29 +09:00
Dean Herbert
88528e797f Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay 2019-05-15 14:24:45 +09:00
Dean Herbert
1fd44d7945 Move OsuScreenDependencies to GameBase 2019-05-15 13:00:11 +09:00
Dean Herbert
ec5b024fa6 Define toolbarElements 2019-05-14 18:34:25 +09:00
Dan Balasescu
bffde7de08
Merge branch 'master' into exit-hide-music-controller 2019-05-14 17:36:38 +09:00
Dean Herbert
0fc43afd34 Merge branch 'master' into HoutarouOreki-changelog-overlay 2019-05-14 17:35:14 +09:00
Dean Herbert
7553e2da25 Fix incorrect DI reference and update naming of SettingsOverlay classes 2019-05-14 10:45:05 +09:00
Dean Herbert
4b508915f6 Centralise caching of components at OsuGame level 2019-05-13 17:10:25 +09:00
Dean Herbert
50c440de8d Add toolbar button 2019-05-13 17:01:17 +09:00
Dean Herbert
65097fddc1 Hide music controller when exiting via Alt-F4
Closes #4764.
2019-05-12 22:34:58 +09:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
smoogipoo
0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
smoogipoo
0222424aef Make mods IReadOnlyList<Mod> gamewide
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
smoogipoo
4310f07a5c Rename SelectedMods -> Mods 2019-04-10 12:03:57 +09:00
smoogipoo
ad124bfeec Reimplement select mod track adjustments 2019-04-09 12:59:32 +09:00
smoogipoo
c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00
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
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +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
Dean Herbert
e604806398 Fix regression in screen change allowance logic 2019-02-13 19:43:01 +09:00
Dean Herbert
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
Dean Herbert
d1c8ee65a5 Fix osu! logo potentially appearing during game load in a weird place 2019-01-31 19:22:29 +09:00
Dean Herbert
ba6176fd03 Fix major regression in scaling behaviour 2019-01-31 18:28:46 +09:00
Dean Herbert
b48bb5b792 Move parallax logic out of BackgroundScreenStack 2019-01-31 18:10:33 +09:00
smoogipoo
91302ea0bc Merge remote-tracking branch 'origin/master' into iscreen
# Conflicts:
#	osu.Game/Screens/Multi/Match/MatchSubScreen.cs
#	osu.Game/Screens/Multi/Multiplayer.cs
#	osu.Game/Screens/Multi/MultiplayerSubScreen.cs
#	osu.Game/Screens/OsuScreen.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-01-29 21:21:36 +09:00
smoogipoo
7b1c1f3728 Move toolbar showing and overlay activation to OsuGame
Now exposed through IOsuScreen.
2019-01-28 15:42:06 +09:00
Dean Herbert
4a59ccb81d
Merge branch 'master' into fix-idle-weirdness 2019-01-25 17:52:59 +09:00
smoogipoo
f0e0088f43 Create a custom background stack to fix various background issues 2019-01-25 15:36:22 +09:00
smoogipoo
a7e281469b Fix game exiting instantly on pressing close button 2019-01-24 20:13:29 +09:00
smoogipoo
8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert
7415a6e764 Cache input manager 2019-01-23 20:37:56 +09:00
Dean Herbert
4c8e7a26dc
Merge branch 'master' into fix-idle-weirdness 2019-01-23 18:53:52 +09:00
Dan Balasescu
e35b0093f3
Merge branch 'master' into fix-toolbar-padding-regression 2019-01-22 19:18:02 +09:00
ekrctb
fe2b83279e
Correct wrong logic
`OnlineBeatmapSetID == null` was the problem
2019-01-22 16:40:32 +09:00
ekrctb
0095521fc2
Use both OnlineBeatmapSetID and Hash 2019-01-22 16:10:04 +09:00
ekrctb
1d5f5865aa Fix PresentBeatmap not working for unsubmitted beatmap set 2019-01-22 15:19:42 +09:00
Dean Herbert
4eb5e67075 Fix overlays not being correctly offset by toolbar padding 2019-01-21 19:34:35 +09:00
Dean Herbert
1ff9203f9e
Merge branch 'master' into fix-idle-weirdness 2019-01-10 18:38:48 +09:00
Dean Herbert
4f5c208672 Add UI scale
Limited to (relatively) sane values until we eventually get around to adjusting UI to allow higher extermities.
2019-01-09 19:01:33 +09:00
Dean Herbert
440f4703cb Fix toolbar offset not being applied 2019-01-08 12:57:31 +09:00
Dean Herbert
74539b5e5c Merge remote-tracking branch 'upstream/master' into letterboxing 2019-01-07 18:52:48 +09:00
Roman Kapustin
4b5fc85875 Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
Dean Herbert
4c2c7bd937 Fix global idle state being entered when overlays are visible 2019-01-04 16:26:10 +09:00
Dean Herbert
3953f829c8 Add letterbox/screen scaling support 2019-01-04 13:36:02 +09:00
Dean Herbert
ab5f6e149c Remvoe extra newline 2018-12-27 19:25:56 +09:00
Dean Herbert
31db768bdc Hide version overlay when not in main menu 2018-12-27 19:21:07 +09:00