Dean Herbert
166cdab2e8
Remove unnecessary null check
2019-02-13 14:14:57 +09:00
Dean Herbert
2ea839c475
Fix crashes on beatmap not being set correctly in player
2019-02-12 19:18:22 +09:00
Dean Herbert
ca5c8d37d1
Use leased bindables
2019-02-01 16:44:06 +09:00
Dean Herbert
3da851d93e
Merge branch 'master' into fix-replay-multiplier-text
2019-01-31 21:17:40 +09:00
smoogipoo
bdaff27575
Fix nullref due to screens now being removed from parent
2019-01-31 15:02:07 +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
b3403c78da
Fix a few potential crashes
2019-01-25 20:47:37 +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
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09: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
Dean Herbert
c58fe4f4ff
Fix nullref
2019-01-22 13:18:01 +09:00
Dean Herbert
cebeb0a219
Fix replay playback speed not being displayed initially
2019-01-22 11:40:57 +09:00
Dean Herbert
21317806c9
Merge remote-tracking branch 'upstream/master' into nwabear-master
2019-01-22 10:07:35 +09:00
Dean Herbert
7baff750de
Consolidate layout, wording and ordering with VisualSettings
2019-01-22 10:06:30 +09:00
Dean Herbert
b373d78143
Add slight easing
2019-01-22 09:47:51 +09:00
Dean Herbert
25b5bbcd8f
Merge branch 'master' into score-panel-layout
2019-01-22 09:43:37 +09:00
Christian Kamphausen
86581feb4a
Merge branch 'master' into fix-playersettingsoverlay-not-coming-back-ctrl+H
2019-01-22 01:29:58 +01:00
chrisny286
d7d2e2fe44
trimmed whitespace
2019-01-21 19:22:19 +01:00
chrisny286
65fd69c817
Update HUDOverlay.cs
...
separate PlayerSettingsOverlay from the other HUD elements in the Visibility Container
2019-01-21 19:10:29 +01:00
chrisny286
fb51578df3
Update PlayerSettingsOverlay.cs
...
Framework renamed this variable so it needs to be renamed here too.
2019-01-21 17:19:40 +01:00
ekrctb
e74f0057bd
Automatically layout based on score display width
2019-01-21 17:07:56 +09:00
ekrctb
f982b6da55
Don't hide 'hold for menu' even hud is hidden
2019-01-17 16:49:04 +09:00
Dean Herbert
e2dd025225
Fix scaling of SkipOverlay when UI scale is adjusted
...
Closes #4040 .
2019-01-11 16:54:42 +09:00
Dean Herbert
958840fe17
Merge branch 'master' into fix-sliderbar
2019-01-08 21:23:34 +09:00
smoogipoo
38a3ccc817
Use value where applicable
2019-01-08 16:31:44 +09:00
smoogipoo
8692be9de3
Fix sliderbar not working correctly with TransferValueOnCommit = true
2019-01-08 16:07:54 +09:00
Dean Herbert
74539b5e5c
Merge remote-tracking branch 'upstream/master' into letterboxing
2019-01-07 18:52:48 +09:00
Dean Herbert
7d1163a7d2
Remove unnecessary null check
2019-01-04 15:49:23 +09:00
Dean Herbert
c528a3896d
Formatting and naming
2019-01-04 15:34:32 +09:00
Dean Herbert
3953f829c8
Add letterbox/screen scaling support
2019-01-04 13:36:02 +09:00
Dean Herbert
b6dc6c4a74
Merge branch 'master' into do_not_use_local_user_for_autoplay_score
2019-01-04 13:11:17 +09:00
smoogipoo
a62405d82d
Fix plays with mods not submitting
2018-12-27 22:17:03 +09:00
Dean Herbert
67e200e1b2
Leaderboard design updates
2018-12-27 15:52:40 +09:00
Dean Herbert
8cf30bdb6a
Play with delegate
2018-12-26 22:16:35 +09:00
smoogipoo
bb08bf10a0
Fix post-merge issues
2018-12-22 16:26:27 +09:00
smoogipoo
c2a00b84c7
Merge remote-tracking branch 'peppy/modular-results-screen' into timeshift-wip
...
# Conflicts:
# osu.Game/Screens/Multi/IMultiplayerScreen.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/Screens/Play/SoloResults.cs
# osu.Game/Screens/Ranking/IResultPageInfo.cs
# osu.Game/Screens/Ranking/ResultMode.cs
# osu.Game/Screens/Ranking/ResultModeButton.cs
# osu.Game/Screens/Ranking/ResultModeTabControl.cs
# osu.Game/Screens/Ranking/Results.cs
2018-12-22 16:22:02 +09:00
