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

117 Commits

Author SHA1 Message Date
David Zhao
ab3fa91a2f
Merge branch 'master' into UserDimLogic 2019-02-22 20:38:10 +09:00
David Zhao
76de39a344 Put user dim logic in yet another container inside UserDimContainer 2019-02-22 20:34:51 +09:00
David Zhao
a4162a69fb Remove leftover usage of dimlevel in BackgroundScreenBeatmap 2019-02-22 18:01:50 +09:00
David Zhao
918a60ebbf Create a new player every time a test is performed. 2019-02-22 16:56:03 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
David Zhao
0677194f46 Move all storyboard show logic into UserDimContainer 2019-02-21 18:14:58 +09:00
David Zhao
ad5e81f0cd Add test case for background preview, fix unit tests 2019-02-21 15:24:26 +09:00
David Zhao
25e7dcb375 Remove unused includes 2019-02-20 17:39:35 +09:00
David Zhao
1bd1b6b099 Move user dim logic into UserDimContainer instead 2019-02-20 16:53:57 +09:00
David Zhao
4e07aba548 Make it so visual tests only load the osu ruleset 2019-02-18 18:12:45 +09:00
David Zhao
1d80674fbd Fix fadecontainer being added to multiple containers 2019-02-18 17:11:38 +09:00
David Zhao
f241d67e5f Use conditional operator isntead of if 2019-02-18 15:23:03 +09:00
David Zhao
df148f8787 Fix background dim not being disabled on playerloader exit 2019-02-18 12:55:42 +09:00
Dean Herbert
0a265c6d35
Update osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
2019-02-18 11:54:25 +09:00
David Zhao
53b7fdd834 Clean up test code and unused includes 2019-02-15 16:57:53 +09:00
David Zhao
6da9f94ae3 Fix regression with background dim 2019-02-15 16:17:01 +09:00
David Zhao
e2a312a663 Move user dimming logic into its own container 2019-02-14 17:47:53 +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
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
Min
29e8c21c46
Merge branch 'master' into menu-background-skinning 2019-01-11 11:36:20 +09:00
Dean Herbert
c528a3896d Formatting and naming 2019-01-04 15:34:32 +09:00
Dean Herbert
3953f829c8 Add letterbox/screen scaling support 2019-01-04 13:36:02 +09:00
phosphene47
3c677970cd Add menu background skinning for supporters 2018-12-27 17:25:28 +09:00
smoogipoo
4380ef15bf Fix potential exception during async load callback 2018-09-21 16:31:09 +09:00
Dean Herbert
83bf38f4bc Make menu background blurrable
Not actually blurring yet, needs further testing.
2018-09-21 03:13:34 +09:00
Dean Herbert
07a1c39fe5 Use random default background on starting the game 2018-09-21 03:12:20 +09:00
Dean Herbert
03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
smoogipoo
1b279d383f Use GetAsync on all textures 2018-08-27 17:26:44 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
Aergwyn
ae1adfd2f2 remove unnecessary empty lines
codefactor.io \(o.o)/
also one unnecessary semicolon
2018-01-12 19:30:34 +01:00
Dean Herbert
fcb197f7b6 Simplify logic 2018-01-09 22:21:15 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
Dean Herbert
f2d302f8dc Create a LargeTextureStore for cached (but not atlased) global textures
Also
- Fixes first transition depth being incorrect.
- Improves smoothness of transitions (and adds a slight delay to offset from screen switches).
2017-12-31 07:05:04 +09:00
Dean Herbert
5db2d383ed Remove temporary variable in beatmap background update 2017-11-21 12:42:28 +09:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
a7dc8a892b Update framework 2017-07-21 17:24:09 +02:00
Dean Herbert
8e8767cd37 Give song select a better default background whecn the beatmap's can't be loaded 2017-07-19 15:16:55 +09:00
Dan Balasescu
803bb3c780 Cleanup. 2017-06-26 23:05:35 +09:00
Dean Herbert
cbf188c293 Add new main menu backgrounds 2017-06-26 19:10:13 +09:00
Dean Herbert
6f1fff4ee7 Update async load usage to new style. 2017-04-02 15:56:12 +09:00
Dean Herbert
f7dc7e9bb9
Update references. 2017-03-28 21:26:20 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
Dean Herbert
da751804b6
Reduce error count. 2017-03-09 14:24:16 +09:00
Dean Herbert
1751532a01
Fix a few regressions. 2017-03-07 13:30:36 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Andrey Zavadskiy
3487dfe236 Removed unused variables and parameters 2017-02-27 17:32:32 +03:00
Thomas Müller
1585ae842a Update framework 2017-02-26 11:22:58 +09:00
Dean Herbert
c5552dfb27
Merge remote-tracking branch 'upstream/master' into remove-usings 2017-02-24 11:29:34 +09:00
Thomas Müller
2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00
Thomas Müller
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Dean Herbert
6701cd9016 Merge branch 'master' into general-fixes 2017-02-23 17:04:53 +09:00
Dean Herbert
da2bfe6d3c
Framework updates. 2017-02-23 16:42:12 +09:00
Dean Herbert
aef0eb49a1
Add loading screen. 2017-02-22 21:53:59 +09:00
Dean Herbert
e6ef9f67aa
GameMode -> Screen. 2017-02-17 19:23:58 +09:00
Dean Herbert
f207da6041
Add/update license headers. 2017-02-14 18:17:35 +09:00
Dean Herbert
37e75e9a54 Add null check when loading beatmap background. 2017-02-12 16:13:44 +09:00
Dean Herbert
50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Drew DeVault
0a81fdbd10 Update null background handling 2017-01-30 09:44:02 -05:00
Drew DeVault
7559fc593a Use default background on empty song select screen 2017-01-17 16:43:53 -05:00
Thomas Müller
b12b82fdd3 Fix depth values. 2016-11-29 20:50:12 +01:00
Tom94
718f2b13a8 Do not change depth value of drawables currently contained within a container. 2016-11-24 13:23:05 +09:00
Dean Herbert
611619fd9c Fix some namespaces. 2016-11-23 12:00:17 +09:00
Dean Herbert
a3234a5269 Avoid synchronous queries in BackgroundModeBeatmap. 2016-11-22 21:22:12 +09:00
Thomas Müller
0fdd505807 Add wedged background overlay to song select. 2016-11-20 10:02:20 +01:00
Thomas Müller
f8788bb24b Update the background according to the currently selected beatmap and blur it within song select. 2016-11-19 17:39:43 +01:00
Dean Herbert
0f4538f69f Rename GameModes namespace to Screens. 2016-11-14 17:23:33 +09:00