Dean Herbert
3da851d93e
Merge branch 'master' into fix-replay-multiplier-text
2019-01-31 21:17:40 +09:00
Dean Herbert
f85518b175
Don't expose padding
2019-01-31 18:16:28 +09:00
Dean Herbert
b48bb5b792
Move parallax logic out of BackgroundScreenStack
2019-01-31 18:10:33 +09:00
smoogipoo
bdaff27575
Fix nullref due to screens now being removed from parent
2019-01-31 15:02:07 +09:00
smoogipoo
255b4a30e0
Allow logo to be null
2019-01-31 13:50:37 +09:00
smoogipoo
58d744e5dc
Remove manual overlay/toolbar logic from multiplayer
2019-01-31 13:38:21 +09:00
Dean Herbert
beab367e6d
Add null checks/allowances
2019-01-31 11:00:33 +09:00
Dean Herbert
d34aa50613
Merge branch 'master' into iscreen
2019-01-31 01:08:06 +09:00
smoogipoo
ac0bc53c4b
Revert "Merge pull request #4154 from phosphene47/carousel-wedge-level"
...
This reverts commit cc8793a45e94276c8abb
2019-01-31 00:02:05 +09:00
smoogipoo
5e78f51e24
Fix multiplayer crashing when exiting from lounge
2019-01-30 23:56:03 +09:00
smoogipoo
82dc7f39a3
Update licenses
2019-01-29 21:48:35 +09:00
smoogipoo
b5d187c4af
Fix post-merge errors
2019-01-29 21:27:32 +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
Dan Balasescu
47f35c423b
Merge branch 'master' into carousel-wedge-level
2019-01-28 13:49:12 +09:00
smoogipoo
117703374e
Fix logo animations
2019-01-25 21:02:35 +09:00
smoogipoo
60cc2314ef
Fix ruleset + beatmap being changeable in match
2019-01-25 21:02:30 +09:00
phosphene47
5c70be07ab
Display carousel over beatmap info wedge
2019-01-25 22:58:55 +11:00
smoogipoo
b3403c78da
Fix a few potential crashes
2019-01-25 20:47:37 +09:00
smoogipoo
e2891ab1e9
Fix anchors + origins
2019-01-25 20:47:31 +09:00
smoogipoo
95e6785968
Make Multiplayer not an OsuScreen
2019-01-25 20:25:55 +09:00
smoogipoo
e1e7759e0f
Re-implement MultiplayerSubScreen
2019-01-25 19:32:37 +09:00
Dean Herbert
260034a80e
Don't auto-focus textboxes when on screen keyboard would cause inconvenience
2019-01-25 19:20:29 +09:00
smoogipoo
da135346b2
Fix screen titles
2019-01-25 18:38:48 +09:00
smoogipoo
15100632f1
Remove MultiplayerSubScreen and fix multiplayer crashes
2019-01-25 18:26:04 +09:00
smoogipoo
f0e0088f43
Create a custom background stack to fix various background issues
2019-01-25 15:36:22 +09:00
Dean Herbert
7ed215c521
Make InternalPadding a bit simpler
2019-01-25 14:46:45 +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
ProgrammaticNajel
593e0b36f5
Add overflow padding in other multiplayer screen components
...
Added padding to Room Creation and Beatmap Selection in Multiplayer.
2019-01-24 19:42:35 +08:00
smoogipoo
50a384e19c
Fix game not exiting
2019-01-24 20:13:19 +09:00
smoogipoo
28f5c950ec
Fix player never completing load
2019-01-24 19:55:42 +09:00
smoogipoo
8ea7ec6445
Convert everything to use IScreen
2019-01-24 19:47:44 +09:00
ProgrammaticNajel
9fcefa7d69
Typo fix
2019-01-24 18:18:32 +08:00
ProgrammaticNajel
e4084b7d5d
Add overflow padding in other multiplayer screen components
...
Added overflow padding in room selection screen (Header, Room Info, Leaderboards, and Room Chat)
2019-01-24 17:40:48 +08: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
1730ad143f
Merge branch 'master' into fix-key-counter
2019-01-23 18:22:08 +09:00
chrisny286
76700ad20f
Merge branch 'fix-transparent-background-on-screen-scale-modes' of https://github.com/chrisny286/osu into fix-transparent-background-on-screen-scale-modes
2019-01-23 09:40:44 +01:00
chrisny286
03e3247baf
replace FadeTo in PlayerLoader
...
didnt notice that interaction yet. yes this makes it neccessary.
2019-01-23 09:40:38 +01:00
Dean Herbert
4180ca75bc
Fix typo in comment
2019-01-23 17:14:08 +09:00
chrisny286
bb56c4a1a7
use Color4.Black and White + using osuTK.Graphics
2019-01-23 09:08:34 +01:00
chrisny286
5d2b2ecf06
Merge remote-tracking branch 'upstream/master' into fix-transparent-background-on-screen-scale-modes
2019-01-23 08:52:46 +01:00
chrisny286
f4ebab2d3a
Fix backgrounds being transparent in some scaling modes
...
by replacing `.FadeTo` at the necessary places with `.FadeColour`.
restoring the `.FadeColour` in `fadeOut` of the Player Screen which is ran in every exit scenario.
2019-01-23 08:52:25 +01:00
Dean Herbert
c18ce2c23a
Formatting fixes
2019-01-23 14:51:25 +09:00
Dean Herbert
f107a922b4
Add tests for key counter inside player heirarchy
2019-01-23 14:51:25 +09:00
chrisny286
13ba9d64d0
revert empty line
2019-01-23 02:56:00 +01:00
chrisny286
12503b4d07
revert and make VisibilityContainer not AlwaysPresent
2019-01-23 02:37:17 +01:00
chrisny286
f01ba17d1f
add check if replay is loaded before allowseeking can be overwitten
2019-01-23 02:12:40 +01:00
chrisny286
cabcfffdeb
Fix autoplay rewind/skip usable when UI hidden
2019-01-23 01:16:37 +01:00
