1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 17:02:55 +08:00
Commit Graph

10321 Commits

Author SHA1 Message Date
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
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
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
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
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
ekrctb
b6fb3a5c05 Cancel request on disposal for RoomInspector 2019-01-17 15:14:30 +09:00
Dean Herbert
2ab0c4632e
Merge branch 'master' into menu-background-skinning 2019-01-17 14:23:03 +09:00
Dan Balasescu
824fff5c85
Merge branch 'master' into fix-sticking-cursor 2019-01-17 12:06:00 +09:00
Dean Herbert
7bcf056872
Merge branch 'master' into update-framework 2019-01-16 19:16:53 +09:00
Dean Herbert
5ff58870b8 Update framework 2019-01-16 19:05:46 +09:00
Dean Herbert
3abfaea7ac Stop cursor from sticking to edges of scaled game window 2019-01-16 17:21:26 +09:00
Dan Balasescu
75113db438
Merge branch 'master' into fix-skip-button-scaling 2019-01-16 16:37:37 +09:00
Dean Herbert
bfb18b4ffb Update framework and other nuget packages 2019-01-16 10:14:37 +09:00
Dean Herbert
7ef127a3bf
Merge branch 'master' into update_tab_item_font 2019-01-15 18:31:16 +09:00
Shane Woolcock
6c35393d1a Fix TrackManager usage 2019-01-13 23:10:16 +10:30
Shane Woolcock
f70cb81a3f Update framework 2019-01-13 23:07:35 +10:30
Shane Woolcock
d80138d20d Ensure beatmap textures are loaded via CreateTextureLoaderStore 2019-01-12 23:05:49 +10:30
Shane Woolcock
8f2ce6d048 Update framework 2019-01-12 15:55:03 +10:30
Shane Woolcock
a6c54a9675 Merge branch 'master' into samah-ios 2019-01-12 00:16:09 +10:30
Unknown
6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
Dean Herbert
e2dd025225 Fix scaling of SkipOverlay when UI scale is adjusted
Closes #4040.
2019-01-11 16:54:42 +09:00
Min
29e8c21c46
Merge branch 'master' into menu-background-skinning 2019-01-11 11:36:20 +09:00
Dean Herbert
c1656a7608 Update framework 2019-01-10 21:22:42 +09:00
Dean Herbert
0a24d188b4 Remove TryGetValue as it won't work 2019-01-10 19:01:41 +09:00
Dean Herbert
1ff9203f9e
Merge branch 'master' into fix-idle-weirdness 2019-01-10 18:38:48 +09:00
Dean Herbert
8cd058ed9a
Merge branch 'master' into moreOptionsFromSkin.ini 2019-01-10 18:38:20 +09:00
Dean Herbert
aa68bbc1d9
Merge branch 'master' into fix-match-select-crash 2019-01-10 15:40:03 +09:00
Dean Herbert
930d6382c7
Merge pull request #4016 from smoogipoo/fix-link-flow
Fix links not working in partially masked text flow
2019-01-10 15:19:58 +09:00
smoogipoo
4578d36a67 Add comment 2019-01-10 14:55:36 +09:00
Dean Herbert
e04da7de1e
Merge pull request #4017 from smoogipoo/lounge-leaderboard
Show match participants in the lounge
2019-01-10 14:36:26 +09:00
Dean Herbert
a264b67d58
Merge branch 'master' into moreOptionsFromSkin.ini 2019-01-10 14:33:34 +09:00
Dan Balasescu
bb36f457fe
Merge branch 'master' into add-ui-scale 2019-01-10 14:25:38 +09:00
Dan Balasescu
e6c2d29a8e
Merge branch 'master' into moreOptionsFromSkin.ini 2019-01-10 14:01:52 +09:00
Dean Herbert
5e4bea9d99 Fix extra newline 2019-01-10 12:11:14 +09:00
Dean Herbert
4f5c208672 Add UI scale
Limited to (relatively) sane values until we eventually get around to adjusting UI to allow higher extermities.
2019-01-09 19:01:33 +09:00