Aergwyn
c2297b0c3b
Fix incorrect param doc
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-01-29 23:04:48 +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
Dean Herbert
baea9691cc
Fix baetmap downloads using too much memory
2019-01-29 18:34:10 +09:00
Dean Herbert
23d0399e51
Allow deselection of textboxes on registration screen on mobile devices
2019-01-29 17:23:23 +09:00
Dean Herbert
bbc24bbfdd
Merge remote-tracking branch 'upstream/master' into resources-via-nuget
...
# Conflicts:
# osu-resources
# osu.sln
2019-01-29 12:19:35 +09:00
Dean Herbert
628b3e1119
Move osu-resources to nuget
2019-01-28 18:33:39 +09:00
smoogipoo
7b1c1f3728
Move toolbar showing and overlay activation to OsuGame
...
Now exposed through IOsuScreen.
2019-01-28 15:42:06 +09:00
Dean Herbert
354a99f5e1
Merge branch 'master' into samah-ios
2019-01-28 15:34:46 +09:00
Dan Balasescu
47f35c423b
Merge branch 'master' into carousel-wedge-level
2019-01-28 13:49:12 +09:00
Dan Balasescu
610c2df2d4
Merge branch 'master' into dont-always-focus-textboxes
2019-01-28 13:40:08 +09:00
Dean Herbert
a208874e74
Fix incorrect handling of download failures
2019-01-28 11:59:25 +09:00
Shane Woolcock
a14ad4f53f
Merge branch 'master' into samah-ios
2019-01-25 22:43:21 +10:30
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
Dean Herbert
28f529ca19
Rename to host
2019-01-25 20:24:32 +09:00
Dean Herbert
0b587baab8
Merge remote-tracking branch 'upstream/master' into fix-texture-loader-stores
2019-01-25 20:23:51 +09:00
Dean Herbert
4d032af26d
Merge pull request #3919 from peppy/fix-idle-weirdness
...
Fix global idle state being entered when overlays are visible
2019-01-25 20:18:33 +09:00
Dean Herbert
a110569f56
Merge pull request #4151 from peppy/fix-sensitivity-tooltip
...
Fix cursor sensitivity tooltip not updating instantly
2019-01-25 20:17:56 +09:00
Dean Herbert
4d982adf69
Merge branch 'master' into fix-idle-weirdness
2019-01-25 19:48:52 +09:00
Aergwyn
c8c375636f
Use lambda
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-01-25 19:34:25 +09:00
smoogipoo
e1e7759e0f
Re-implement MultiplayerSubScreen
2019-01-25 19:32:37 +09:00
smoogipoo
3fb17ead06
Fix breadcrumbs crash when last screen exits
2019-01-25 19:31:58 +09:00
Dean Herbert
49051a359f
Merge branch 'dont-always-focus-textboxes' into samah-ios
2019-01-25 19:22:26 +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
Dean Herbert
82d944dc89
Fix textbox colours not always being set corrrectly
2019-01-25 19:20:29 +09:00
Dean Herbert
9e8347413b
Merge remote-tracking branch 'origin/fix-texture-loader-stores' into samah-ios
...
# Conflicts:
# osu.Game/Beatmaps/BeatmapManager.cs
2019-01-25 18:59:22 +09:00
Dean Herbert
159ac7359e
Merge branch 'update-framework' into samah-ios
2019-01-25 18:52:17 +09:00
Dean Herbert
144533706e
Update framework
2019-01-25 18:51:29 +09:00
Dean Herbert
e3fde56780
Merge remote-tracking branch 'origin/fix-idle-weirdness' into samah-ios
2019-01-25 18:49:41 +09:00
Dean Herbert
f4729d41f3
Merge branch 'master' into samah-ios
2019-01-25 18:49:08 +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
Dean Herbert
4a59ccb81d
Merge branch 'master' into fix-idle-weirdness
2019-01-25 17:52:59 +09:00
Dean Herbert
a5f1aa644b
Fix cursor sensitivity tooltip not updating instantly
2019-01-25 17:30:35 +09:00
smoogipoo
f0e0088f43
Create a custom background stack to fix various background issues
2019-01-25 15:36:22 +09:00
Dean Herbert
a25dce53cd
Fix logical regression
2019-01-25 15:03:32 +09:00
Dean Herbert
e88d36ed38
Merge branch 'master' into fix-multiplayer-parallax-overflow
2019-01-25 14:55:28 +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
Dean Herbert
99d349c865
Merge branch 'master' into fix-texture-loader-stores
2019-01-25 12:39:02 +09:00
Dean Herbert
2b250aa47b
Merge branch 'master' into fix-tracked-config-disposal
2019-01-25 12:14:58 +09:00
Dean Herbert
c3b73d2d53
ALlow null host
2019-01-25 12:08:31 +09:00
Dean Herbert
014ea972d9
Merge remote-tracking branch 'origin/master' into samah-ios
2019-01-25 11:51:44 +09:00
Dean Herbert
bda5a90252
Readonly variable
2019-01-25 11:50:52 +09:00
Dean Herbert
6b3d53750c
Fix remaining cases of not using host-created TextureLoaderStore
2019-01-25 11:48:28 +09:00
Unknown
2bbaa2ac60
silently return instead of throwing
2019-01-24 16:02:47 +01: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
a7e281469b
Fix game exiting instantly on pressing close button
2019-01-24 20:13:29 +09: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
a580c17949
Fix codefactor issue
2019-01-24 17:46:09 +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
Unknown
93c9037394
fix crash when config doesn't have tracked settings
2019-01-23 13:09:03 +01:00
Shane Woolcock
728c744e4d
Merge branch 'master' into samah-ios
2019-01-23 22:19:49 +10:30
Dean Herbert
7415a6e764
Cache input manager
2019-01-23 20:37:56 +09:00
Dean Herbert
484268f1f2
Expose CalculateAccuracy for performance tools
2019-01-23 20:30:32 +09:00
Dean Herbert
4c8e7a26dc
Merge branch 'master' into fix-idle-weirdness
2019-01-23 18:53:52 +09:00
Dean Herbert
1730ad143f
Merge branch 'master' into fix-key-counter
2019-01-23 18:22:08 +09:00
Dan Balasescu
067f290e6e
Merge branch 'master' into fix-key-counter
2019-01-23 17:49:21 +09:00
Christian Kamphausen
512e75982f
Merge branch 'master' into fix-transparent-background-on-screen-scale-modes
2019-01-23 09:49:19 +01: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
1025c51e0d
Allow filtering settings matching based on dropdown content
2019-01-23 17:30:05 +09: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
49633b3394
Fix key counter receptor getting overwritten by async load drawables
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
Christian Kamphausen
5e31db275d
Merge branch 'master' into Fix-OsuSliderBar-tooltip-not-updating-in-special-case
2019-01-23 04:14:59 +01:00
chrisny286
260011fc13
remove manual update
...
misunderstood that earlier
2019-01-23 04:05:03 +01:00
chrisny286
fe5d34a657
replace as requested
2019-01-23 03:25:56 +01:00
chrisny286
47181cf5d7
add back update in onUserChange
2019-01-23 03:21:09 +01:00
Dean Herbert
e4007fcf23
Merge branch 'master' into download-tracking-component
2019-01-23 11:12:57 +09:00
Dean Herbert
7d6d7cf457
Merge remote-tracking branch 'upstream/master' into download-tracking-component
...
# Conflicts:
# osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs
2019-01-23 11:06:29 +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
chrisny286
3f96231b2f
convert to method group
2019-01-22 19:34:26 +01:00
chrisny286
09a2b287f9
Fix Tooltip not updating in special case
...
When the Bindvalue of the Sliderbar gets changed by a line like "Bindable.Value = ..." the sliderbar will only update the nubs but wont run any methods which contain the updateToolTipText(T value) function.
Example scenario:
Two interlinked sliderbars which change the value of each other in certain cases.
2019-01-22 18:29:30 +01:00
Dean Herbert
09553550a3
Remove remaining supporter check
2019-01-23 00:19:39 +09:00
Dean Herbert
f33f91dadb
Merge pull request #4108 from peppy/fix-toolbar-padding-regression
...
Fix overlays not being correctly offset by toolbar padding
2019-01-22 21:29:36 +09:00
Shane Woolcock
59eb33684d
Merge branch 'master' into samah-ios
2019-01-22 22:07:15 +10:30
Shane Woolcock
0c56942761
Code sanity
2019-01-22 21:32:23 +10:30
Shane Woolcock
fe86b14659
Update framework
2019-01-22 21:14:13 +10:30
Dean Herbert
863756a252
Merge pull request #4115 from peppy/allow-download-no-supporter
...
Allow full osu!direct usage regardless of supporter status
2019-01-22 19:26:30 +09:00
Dan Balasescu
e35b0093f3
Merge branch 'master' into fix-toolbar-padding-regression
2019-01-22 19:18:02 +09:00
Dean Herbert
828b9451e5
Update framework
2019-01-22 16:48:32 +09:00
ekrctb
fe2b83279e
Correct wrong logic
...
`OnlineBeatmapSetID == null` was the problem
2019-01-22 16:40:32 +09:00
ekrctb
0095521fc2
Use both OnlineBeatmapSetID and Hash
2019-01-22 16:10:04 +09:00
ekrctb
1d5f5865aa
Fix PresentBeatmap not working for unsubmitted beatmap set
2019-01-22 15:19:42 +09:00
Dean Herbert
5ea6e8e247
Allow full osu!direct usage regardless of supporter status for now
2019-01-22 14:22:38 +09: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
635046acff
Merge branch 'master' into taiko-namespace
2019-01-22 10:26:25 +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
Bear Daniel
7cdb823c87
Moved "Use beatmap hitsounds" button
2019-01-21 08:04:06 -06:00
Dean Herbert
8160162cde
Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics
2019-01-21 20:58:17 +09:00
Dean Herbert
4eb5e67075
Fix overlays not being correctly offset by toolbar padding
2019-01-21 19:34:35 +09:00
ekrctb
e74f0057bd
Automatically layout based on score display width
2019-01-21 17:07:56 +09:00
ekrctb
0573c1c923
Fix taiko namespace ignored
2019-01-21 14:20:37 +09:00
Shane Woolcock
25c3304766
Update framework
2019-01-20 22:07:59 +10:30
Shane Woolcock
0baa96fa4c
Merge branch 'master' into samah-ios
2019-01-20 21:48:08 +10:30
Dean Herbert
5579b52bdf
Merge branch 'master' into master
2019-01-20 20:16:20 +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
Shane Woolcock
10b91e18bd
Merge branch 'master' into samah-ios
...
# Conflicts:
# osu.Game/osu.Game.csproj
2019-01-19 18:03:58 +10:30
Shane Woolcock
f26a551e95
Revert audio changes
2019-01-19 17:40:37 +10:30
Shane Woolcock
63c61d3e27
Convert to PackageReference
2019-01-19 14:13:46 +10:30
Bear Daniel
858541bcf4
Added "Use beatmap hitsounds" button to volume section of settings
2019-01-18 02:33:39 -06:00
Dean Herbert
f489718e25
Fix non-matching filename
2019-01-18 14:35:32 +09:00
Dean Herbert
21e79f51b1
Remove necessity of BeatmapSetDownloader
2019-01-18 14:28:06 +09:00
Dean Herbert
8848fa8b1b
Improve UX of download buttons on beatmap set overlay
2019-01-18 12:04:49 +09:00
Dean Herbert
b62630ecd2
Centralise download tracking logic so we can show it in multiple scenarios
2019-01-18 11:28:10 +09:00
nwabear
42fa04beee
Update SkinSection.cs
...
Added "Use beatmap skins" button to general settings
2019-01-17 14:40:22 -06:00
Dean Herbert
b904bd9e8f
Update framework
2019-01-17 22:13:41 +09:00
Dean Herbert
5269ca31be
Merge branch 'master' into fix-room-inspector-cover
2019-01-17 21:49:25 +09:00
Dean Herbert
1d40d88f82
Merge branch 'master' into add-room-null-check
2019-01-17 21:34:25 +09:00
Dan Balasescu
b9c3b33e26
Merge branch 'master' into fix-room-inspector-cover
2019-01-17 20:55:17 +09:00
Dean Herbert
93a08bdb23
Remove stray using
2019-01-17 20:23:15 +09:00
Dean Herbert
d16f4af92b
Use TransferValueOnCommit for mouse sensitivity
2019-01-17 19:18:40 +09:00
Dean Herbert
59f7c5a26e
Fix room inspector cover not resetting when no room selected
2019-01-17 18:44:22 +09:00
Dean Herbert
ba9cdf2ce2
Add null check to fix crash on deselecting multiplayer room
2019-01-17 18:17:47 +09:00
Dean Herbert
491537b8ba
Add fade duration
...
Not really visible in the existing usage, but once we enable the settings tab it will be required. Tested by manually enabling it.
2019-01-17 18:13:05 +09:00
Dean Herbert
c1f5c0edc9
Merge branch 'master' into hide-multiplayer-match-room-tab
2019-01-17 18:02:17 +09:00
Dean Herbert
4082c0e8e0
Merge branch 'master' into fix-slider-bar-tooltip-not-shown-until-value-is-changed
2019-01-17 17:34:04 +09:00
ekrctb
2bc3464802
Hide Room tab when Settings tab is active
2019-01-17 17:27:34 +09:00
ekrctb
6bfae52305
Fix sliders don't show tooltip until first change
2019-01-17 17:03:53 +09:00
ekrctb
f982b6da55
Don't hide 'hold for menu' even hud is hidden
2019-01-17 16:49:04 +09:00
Dean Herbert
99c963c56a
Merge branch 'master' into cancel-request-on-disposal
2019-01-17 15:29:49 +09:00
