1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 01:02:55 +08:00
Commit Graph

132 Commits

Author SHA1 Message Date
Dean Herbert
98e384129c Remove redundant initialisation 2019-09-10 01:34:48 +09:00
Dean Herbert
7eb20da820 Add back local bool (required due to action limitations) 2019-09-10 01:18:02 +09:00
Dean Herbert
f398f134e1 Remove unnecessary bool storage
Also delay show slightly for better user experience.
2019-09-10 01:12:30 +09:00
Dean Herbert
0ec642d826 Show instead of toggle 2019-09-10 01:06:37 +09:00
LeNitrous
ff49c4ae98 remove redundancies 2019-09-09 13:50:14 +08:00
LeNitrous
c2353cbdfa move logic to logo action 2019-09-09 13:30:48 +08:00
LeNitrous
04a4f9c9a3 use IsLoggedIn and remove useless clause 2019-09-09 11:26:51 +08:00
LeNitrous
be4f0cc2dd remove null conditional 2019-09-09 06:14:49 +08:00
LeNitrous
a67a2899a9 move api state check to it's own clause 2019-09-08 16:18:15 +08:00
LeNitrous
3435e2a8d3 open login on enter main menu 2019-09-08 13:36:58 +08:00
Joehu
77df6a0cb7 Remove unused direct placeholder screen 2019-08-07 21:16:36 -07:00
Dean Herbert
a1e64106d4
Merge branch 'master' into intro-testing-improvements 2019-07-11 23:46:02 +09:00
Dean Herbert
6819c528db Use canBeNull instead of needlessly caching MusicController for tests 2019-07-11 00:20:01 +09:00
Dean Herbert
b225b2eb39 Rename to IsUserPaused 2019-07-11 00:18:19 +09:00
Desconocidosmh
100d15e651 Move reseting tempo to Editor 2019-07-10 10:43:02 +02:00
Desconocidosmh
8b8e67fd72 Add accidentally deleted code 2019-07-10 10:41:52 +02:00
Desconocidosmh
2546f647be Completely change the way we fix the bug 2019-07-09 11:32:49 +02:00
Dean Herbert
0580c32263 Abstract intro screen logic to base class 2019-07-09 18:05:57 +09:00
Desconocidosmh
338371c3fc Fix music playing while exiting from editor 2019-07-09 00:08:18 +02:00
David Zhao
79d6670dc5 Expose durations from MainMenu and reorder 2019-07-05 13:08:45 +09:00
smoogipoo
aa81c95f30 Remove unnecessary extra property 2019-06-25 18:38:14 +09:00
smoogipoo
8c96e4c1fa Move back button to OsuGame 2019-06-25 18:33:08 +09:00
Dean Herbert
dd926f55bd Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-19 14:55:34 +09:00
Dean Herbert
f26fe53feb Fix startup crash if main menu does not load fast enough 2019-06-19 13:16:19 +09:00
Dean Herbert
e93fea7dc3 Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-05-18 19:20:44 +09:00
Dean Herbert
958598d13b Fix crash on switching from main menu to gameplay too fast 2019-05-15 19:39:36 +09:00
Dean Herbert
7b56180b8b Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-05-15 12:08:23 +09:00
Dean Herbert
4b508915f6 Centralise caching of components at OsuGame level 2019-05-13 17:10:25 +09:00
Dean Herbert
1ef2a4c46f Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-04-03 16:23:33 +09:00
Dean Herbert
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert
81d9e391f4 Preload main menu background 2019-03-12 00:04:19 +09:00
Dean Herbert
796f6c3092 Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-03-02 13:13:51 +09:00
Shane Woolcock
e91c07209f Move MainMenu initialisation from ctor to load 2019-02-26 09:54:42 +09:00
Shane Woolcock
bebb635ca1 Merge branch 'master' into hide-exit-button
# Conflicts:
#	osu.Game/Screens/Menu/MainMenu.cs
2019-02-25 21:48:42 +09:00
Dean Herbert
a4e119786f Fix some weird formatting 2019-02-25 19:19:28 +09:00
Shane Woolcock
61be4f2695 Conditionally add ExitConfirmOverlay and disable back action 2019-02-25 10:43:47 +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
Dean Herbert
482a01e7ba Merge branch 'master' into tournament-tools
# Conflicts:
#	osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
#	osu.Game/OsuGameBase.cs
#	osu.Game/Overlays/ChatOverlay.cs
#	osu.Game/Screens/Menu/MainMenu.cs
#	osu.Game/Screens/Tournament/Drawings.cs
#	osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-02-02 19:09:48 +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
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
03e416cda9 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-12-01 10:03:31 +09:00
smoogipoo
d07a724970 Only allow replay screen changes in menu + songselect 2018-11-30 18:25:54 +09:00
Dean Herbert
f91d2e2e07 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-22 10:25:30 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
ekrctb
b7a2ad1aa5 Use UIEvent level getters for modifier keys. 2018-10-02 13:26:36 +09:00
ekrctb
50091252e2 Adapt signature change of event handlers 2018-10-02 12:02:55 +09:00
ekrctb
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00