RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,917 Commits 3 Branches 651 Tags 357 MiB
Commit Graph

29 Commits

Author SHA1 Message Date
Dean Herbert de47e0a8e8 Merge remote-tracking branch 'upstream/master' into screen-title-class 2019-03-29 14:01:08 +09:00
Dean Herbert de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
jorolf 454c82c49e Don't go outside of the container bounds 2019-03-21 22:18:45 +01:00
jorolf f91e4a1fdd make ScreenTitle abstract and properties protected 2019-03-11 19:10:37 +01:00
jorolf f3ab5070b9 apply suggestions 2019-03-11 18:37:36 +01:00
jorolf af1c54d995 add ScreenTitle class 2019-03-08 23:44:01 +01: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 bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
smoogipoo a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +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
Dean Herbert 787d4da153 Combine constant 2019-01-25 14:10:59 +09:00
ProgrammaticNajel 4cae9bae83
Merge branch 'master' into fix-multiplayer-parallax-overflow 2019-01-24 20:41:10 +08: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
ProgrammaticNajel 7ac20c3545 Add overflow padding to account for parallax shifting 
Added overflow padding in the Multiplayer screen, and adjusting content (LoungeSubScreen, FilterControl, Header, "Create Room" button) to account for this padding.
 2019-01-24 16:11:24 +08:00
Dean Herbert 2353c204ee Renaming 2018-12-26 20:05:57 +09:00
smoogipoo dbd391825a Rework+fix TestCaseMultiHeader 2018-12-22 14:30:08 +09:00
smoogipoo bf3f5ab685 Change ready button to "Start" and make it enter player 2018-12-11 17:32:01 +09:00
smoogipoo 1ac615b490 Renamespace 2018-12-10 19:27:25 +09:00
smoogipoo a7ac544e12 Add interface for the multiplayer screen short title 2018-12-04 17:43:44 +09:00
smoogipoo f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Dean Herbert da8fc0ee5d ToLower -> ToLowerInvariant 2018-07-25 07:37:05 +02:00
DrabWeb ff93a54a64 Default Type to Title, use ToLower for the screen type title. 2018-05-30 23:16:54 -03:00
DrabWeb 7b8211e6db Add MultiplayerScreen.Type 2018-05-29 04:23:29 -03:00
Dean Herbert 02c37ebc1f Move screen titles to OsuScreen 2018-05-28 13:30:24 +09:00
DrabWeb 1210368e29 Add MultiplayerScreen base class. 2018-05-21 23:00:02 -03:00
DrabWeb ebfbe58abb Move Header breadcrumbs to a subclass. 2018-05-17 06:19:55 -03:00
DrabWeb 1450bf64f5 Add multiplayer screen header. 2018-05-15 20:34:14 -03:00