Commit Graph

10432 Commits

Author SHA1 Message Date
0baa96fa4c Merge branch 'master' into samah-ios 2019-01-20 21:48:08 +10:30
5579b52bdf Merge branch 'master' into master 2019-01-20 20:16:20 +09:00
fa6dd8c99e Code sanity 2019-01-20 19:03:06 +10:30
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
10b91e18bd Merge branch 'master' into samah-ios
# Conflicts:
#	osu.Game/osu.Game.csproj
2019-01-19 18:03:58 +10:30
f26a551e95 Revert audio changes 2019-01-19 17:40:37 +10:30
63c61d3e27 Convert to PackageReference 2019-01-19 14:13:46 +10:30
858541bcf4 Added "Use beatmap hitsounds" button to volume section of settings 2019-01-18 02:33:39 -06:00
f489718e25 Fix non-matching filename 2019-01-18 14:35:32 +09:00
21e79f51b1 Remove necessity of BeatmapSetDownloader 2019-01-18 14:28:06 +09:00
8848fa8b1b Improve UX of download buttons on beatmap set overlay 2019-01-18 12:04:49 +09:00
b62630ecd2 Centralise download tracking logic so we can show it in multiple scenarios 2019-01-18 11:28:10 +09:00
42fa04beee Update SkinSection.cs
Added "Use beatmap skins" button to general settings
2019-01-17 14:40:22 -06:00
b904bd9e8f Update framework 2019-01-17 22:13:41 +09:00
5269ca31be Merge branch 'master' into fix-room-inspector-cover 2019-01-17 21:49:25 +09:00
1d40d88f82 Merge branch 'master' into add-room-null-check 2019-01-17 21:34:25 +09:00
b9c3b33e26 Merge branch 'master' into fix-room-inspector-cover 2019-01-17 20:55:17 +09:00
93a08bdb23 Remove stray using 2019-01-17 20:23:15 +09:00
d16f4af92b Use TransferValueOnCommit for mouse sensitivity 2019-01-17 19:18:40 +09:00
59f7c5a26e Fix room inspector cover not resetting when no room selected 2019-01-17 18:44:22 +09:00
ba9cdf2ce2 Add null check to fix crash on deselecting multiplayer room 2019-01-17 18:17:47 +09:00
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
c1f5c0edc9 Merge branch 'master' into hide-multiplayer-match-room-tab 2019-01-17 18:02:17 +09:00
4082c0e8e0 Merge branch 'master' into fix-slider-bar-tooltip-not-shown-until-value-is-changed 2019-01-17 17:34:04 +09:00
2bc3464802 Hide Room tab when Settings tab is active 2019-01-17 17:27:34 +09:00
6bfae52305 Fix sliders don't show tooltip until first change 2019-01-17 17:03:53 +09:00
f982b6da55 Don't hide 'hold for menu' even hud is hidden 2019-01-17 16:49:04 +09:00
99c963c56a Merge branch 'master' into cancel-request-on-disposal 2019-01-17 15:29:49 +09:00
b6fb3a5c05 Cancel request on disposal for RoomInspector 2019-01-17 15:14:30 +09:00
2ab0c4632e Merge branch 'master' into menu-background-skinning 2019-01-17 14:23:03 +09:00
824fff5c85 Merge branch 'master' into fix-sticking-cursor 2019-01-17 12:06:00 +09:00
7bcf056872 Merge branch 'master' into update-framework 2019-01-16 19:16:53 +09:00
5ff58870b8 Update framework 2019-01-16 19:05:46 +09:00
3abfaea7ac Stop cursor from sticking to edges of scaled game window 2019-01-16 17:21:26 +09:00
75113db438 Merge branch 'master' into fix-skip-button-scaling 2019-01-16 16:37:37 +09:00
bfb18b4ffb Update framework and other nuget packages 2019-01-16 10:14:37 +09:00
7ef127a3bf Merge branch 'master' into update_tab_item_font 2019-01-15 18:31:16 +09:00
6c35393d1a Fix TrackManager usage 2019-01-13 23:10:16 +10:30
f70cb81a3f Update framework 2019-01-13 23:07:35 +10:30
d80138d20d Ensure beatmap textures are loaded via CreateTextureLoaderStore 2019-01-12 23:05:49 +10:30
8f2ce6d048 Update framework 2019-01-12 15:55:03 +10:30
a6c54a9675 Merge branch 'master' into samah-ios 2019-01-12 00:16:09 +10:30
6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
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
c1656a7608 Update framework 2019-01-10 21:22:42 +09:00
0a24d188b4 Remove TryGetValue as it won't work 2019-01-10 19:01:41 +09:00
1ff9203f9e Merge branch 'master' into fix-idle-weirdness 2019-01-10 18:38:48 +09:00
8cd058ed9a Merge branch 'master' into moreOptionsFromSkin.ini 2019-01-10 18:38:20 +09:00
aa68bbc1d9 Merge branch 'master' into fix-match-select-crash 2019-01-10 15:40:03 +09:00