1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 10:47:28 +08:00
Commit Graph

24 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Thomas Müller
1585ae842a Update framework 2017-02-26 11:22:58 +09:00
Thomas Müller
2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01: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