1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 19:47:24 +08:00
Commit Graph

437 Commits

Author SHA1 Message Date
smoogipoo
04d756524d Adjust with shader changes 2019-03-07 18:30:18 +09:00
smoogipoo
e430b8a640 Merge remote-tracking branch 'nekodex/master' into drawnode-changes 2019-03-07 18:15:12 +09:00
Dean Herbert
08e153208d Unbinds are automatic 2019-03-03 20:03:22 +09:00
Dean Herbert
6ffa139ea8 Adjust transition length slightly 2019-03-03 20:02:56 +09:00
jorolf
e8d568470d use a bindable instead 2019-03-02 19:13:38 +01:00
jorolf
176cbc7f2e Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer 2019-03-02 19:04:48 +01:00
smoogipoo
83a02d32f7 Fix a few incorrect fonts 2019-03-02 13:25:59 +09:00
smoogipoo
bf8360636a Adjust drawnodes to use the new shared data structure 2019-03-01 17:25:15 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
jorolf
4c10185f5b Fade out text instead of removing it immediately 2019-02-26 15:26:00 +01:00
jorolf
cacef7421d Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer 2019-02-26 14:09:12 +01:00
Shane Woolcock
e91c07209f Move MainMenu initialisation from ctor to load 2019-02-26 09:54:42 +09:00
jorolf
796044ee7d *I should've rechecked the code after the master merge* 2019-02-25 23:53:44 +01:00
jorolf
501dab7b32 Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer 2019-02-25 23:49:01 +01:00
jorolf
c680d63694 Don't show the supporter text if the user already has supporter status 2019-02-25 23:44:43 +01: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
Shane Woolcock
2bd5bb3f69 Move all MainMenu button creation into load 2019-02-25 21:41:41 +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
Shane Woolcock
add8b8e9c4 Only add Exit button if the GameHost supports it 2019-02-25 09:56:00 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
Dean Herbert
3fe4b8fd1c Update variable names
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
smoogipoo
8853f7ad76 Explicitly set exo typeface in a few places 2019-02-21 19:26:02 +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
Jamie Taylor
9b3f2fdd24
Change RelativePositionAxes default on osu! logo to be both 2019-02-20 19:34:55 +09:00
smoogipoo
4db5531e4b Replace copy-constructor/method with extension method 2019-02-20 19:32:30 +09:00
smoogipoo
0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Dean Herbert
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +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
50a384e19c Fix game not exiting 2019-01-24 20:13:19 +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
5ea6e8e247 Allow full osu!direct usage regardless of supporter status for now 2019-01-22 14:22:38 +09:00
Shane Woolcock
fa6dd8c99e Code sanity 2019-01-20 19:03:06 +10:30
Shane Woolcock
521b11dfcb Use QuadBatch rather than LinearBatch of quads for LogoVisualisation
GL_QUADS is deprecated, and is not supported at all on OpenGL ES.
This fixes the logo visualisation not drawing on iOS.
2019-01-20 18:51:17 +10:30
Dean Herbert
3953f829c8 Add letterbox/screen scaling support 2019-01-04 13:36:02 +09:00
Dean Herbert
e4a72c0c64 Fix failing testcase 2018-12-26 13:18:36 +09:00
smoogipoo
02365ee5ba Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-22 23:23:21 +09:00
Dean Herbert
0df9fa1e59 Remove pointless default size specification in OsuLogo 2018-12-06 11:56:16 +09:00
smoogipoo
b251129c59 Block going into multiplayer while logged out 2018-12-04 17:43:27 +09:00
smoogipoo
d07a724970 Only allow replay screen changes in menu + songselect 2018-11-30 18:25:54 +09:00
Dean Herbert
32b36f2883 Use IBindable<> 2018-11-26 17:07:30 +09:00
Dean Herbert
626048038c Handle the null case 2018-11-26 16:50:41 +09:00
Dean Herbert
8d65d49126 Use bindable flow for checking idle time 2018-11-26 16:32:59 +09:00
Dean Herbert
fe5b043a59
Merge branch 'master' into fix_idle_tracker 2018-11-26 15:24:44 +09:00