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
3d9fdf1d07
Fix missing references
...
Note that the NativeLibs package required by osu.Framework includes assemblies that will not link on Xamarin.iOS. For now we explicitly reference the package and exclude all assets, and manually provide the BASS libraries.
2019-01-19 17:43:25 +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
Dean Herbert
e62f1e8851
Merge pull request #4085 from peppy/update-framework
...
Update framework
2019-01-17 23:16:20 +09:00
Dean Herbert
b904bd9e8f
Update framework
2019-01-17 22:13:41 +09:00
Dean Herbert
b58a61b277
Merge pull request #4081 from peppy/fix-room-inspector-cover
...
Fix room inspector cover not resetting when no room selected
2019-01-17 22:09:48 +09:00
Dean Herbert
5269ca31be
Merge branch 'master' into fix-room-inspector-cover
2019-01-17 21:49:25 +09:00
Dean Herbert
cc16a7fa41
Merge pull request #4080 from peppy/add-room-null-check
...
Add null check to fix crash on deselecting multiplayer room
2019-01-17 21:47:47 +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
6b278ebafa
Merge pull request #4083 from peppy/remove-using
...
Remove stray using
2019-01-17 20:34:43 +09:00
Dean Herbert
93a08bdb23
Remove stray using
2019-01-17 20:23:15 +09:00
Dean Herbert
0bdc2b6995
Merge pull request #4082 from peppy/use-transfer-on-comit
...
Use TransferValueOnCommit for mouse sensitivity
2019-01-17 19:53:02 +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
3a7d09d6f2
Merge pull request #4079 from ekrctb/hide-multiplayer-match-room-tab
...
Hide Room tab content when Settings tab is active
2019-01-17 18:23:08 +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
e4dd1e1ebc
Merge pull request #4078 from ekrctb/fix-slider-bar-tooltip-not-shown-until-value-is-changed
...
Fix sliders don't show tooltip until first change
2019-01-17 17:59:49 +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
Dean Herbert
5fb90f0e96
Merge pull request #4077 from ekrctb/hold-for-menu-visibility
...
Always show "hold for menu"
2019-01-17 17:24:11 +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
38ddf3af56
Merge pull request #4075 from ekrctb/cancel-request-on-disposal
...
Cancel request on disposal for RoomInspector
2019-01-17 15:36:42 +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
0ff76d5f69
Merge pull request #3923 from phosphene47/menu-background-skinning
...
Menu background skinning
2019-01-17 14:35:17 +09:00
Dean Herbert
2ab0c4632e
Merge branch 'master' into menu-background-skinning
2019-01-17 14:23:03 +09:00
Dean Herbert
474347e566
Merge pull request #4074 from smoogipoo/diffcalc-save-last-strain
...
Fix final strain section not being saved
2019-01-17 13:36:59 +09:00
Dean Herbert
de5a9ed012
Merge pull request #4069 from peppy/fix-sticking-cursor
...
Stop cursor from sticking to edges of scaled game window
2019-01-17 12:56:14 +09:00
smoogipoo
a8e9adafdb
Fix final section not being saved
2019-01-17 12:51:49 +09:00
Dan Balasescu
824fff5c85
Merge branch 'master' into fix-sticking-cursor
2019-01-17 12:06:00 +09:00
Dan Balasescu
1c932d93c3
Merge pull request #4063 from peppy/update-framework
...
Update framework and other nuget packages
2019-01-16 19:55:37 +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
db5f860c2b
Merge pull request #4041 from peppy/fix-skip-button-scaling
...
Fix scaling of SkipOverlay when UI scale is adjusted
2019-01-16 17:21:55 +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
Dan Balasescu
98ec021bcf
Merge branch 'master' into update-framework
2019-01-16 16:22:00 +09:00
Dan Balasescu
89b5707f2b
Merge pull request #4064 from qwewqa/mania-random-mirror-fix
...
Fix mania autoplay with mirror and random mods
2019-01-16 16:21:13 +09:00
Kyle Chang
bd6c845fc8
Use IApplicableToBeatmap for mirror and random mania mods
2019-01-15 22:51:52 -05:00
Dean Herbert
bfb18b4ffb
Update framework and other nuget packages
2019-01-16 10:14:37 +09:00
Dean Herbert
f995d98661
Merge pull request #3969 from UselessToucan/update_tab_item_font
...
Update tab text font on activation/deactivation
2019-01-15 18:50:32 +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
