Commit Graph

16120 Commits

Author SHA1 Message Date
fe86b14659 Update framework 2019-01-22 21:14:13 +10:30
25c3304766 Update framework 2019-01-20 22:07:59 +10:30
0baa96fa4c Merge branch 'master' into samah-ios 2019-01-20 21:48:08 +10:30
161d0f0564 Merge pull request #4097 from swoolcock/fix-logovis-ios
Use QuadBatch for LogoVisualisation
2019-01-20 19:57:04 +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
655654760b Merge pull request #4087 from Llaurence/build-run-doc
Made the build instructions more detailed
2019-01-20 11:31:05 +09:00
ffed411eaf Minor fixes 2019-01-20 11:23:33 +09:00
e5610b61eb Final pass 2019-01-20 11:13:15 +09:00
1ba9e0dd0a Add better app icons and change info.plist properties 2019-01-19 22:39:11 +10:30
de9511a7e2 Update references 2019-01-19 18:10:27 +10:30
10b91e18bd Merge branch 'master' into samah-ios
# Conflicts:
#	osu.Game/osu.Game.csproj
2019-01-19 18:03:58 +10:30
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
f26a551e95 Revert audio changes 2019-01-19 17:40:37 +10:30
63c61d3e27 Convert to PackageReference 2019-01-19 14:13:46 +10:30
c3c1e19301 Release -> Debug by default, linux note rewrite 2019-01-18 10:12:59 +01:00
2db2846882 Remove "with dotnet"
Co-Authored-By: Llaurence <40535137+Llaurence@users.noreply.github.com>
2019-01-18 08:52:52 +00:00
94648658f7 Links to ides sites
Co-Authored-By: Llaurence <40535137+Llaurence@users.noreply.github.com>
2019-01-18 08:52:31 +00:00
6aaedb8808 Reword the "other platforms have no prebuilt binaries" sentence
Co-Authored-By: Llaurence <40535137+Llaurence@users.noreply.github.com>
2019-01-18 08:51:57 +00:00
5528692260 Specify macOS version
Co-Authored-By: Llaurence <40535137+Llaurence@users.noreply.github.com>
2019-01-18 08:51:06 +00:00
32940074af Windows 64 bit -> Windows (x64)
Co-Authored-By: Llaurence <40535137+Llaurence@users.noreply.github.com>
2019-01-18 08:50:36 +00:00
209deb842a Add note about iOS 2019-01-18 16:14:52 +09:00
0c26145fd1 bellow -> below
Co-Authored-By: Llaurence <40535137+Llaurence@users.noreply.github.com>
2019-01-17 19:23:44 +00:00
2f0abeb4e9 Update 'Building and Running' in README.md 2019-01-17 19:02:19 +01:00
e62f1e8851 Merge pull request #4085 from peppy/update-framework
Update framework
2019-01-17 23:16:20 +09:00
b904bd9e8f Update framework 2019-01-17 22:13:41 +09:00
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
5269ca31be Merge branch 'master' into fix-room-inspector-cover 2019-01-17 21:49:25 +09:00
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
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
6b278ebafa Merge pull request #4083 from peppy/remove-using
Remove stray using
2019-01-17 20:34:43 +09:00
93a08bdb23 Remove stray using 2019-01-17 20:23:15 +09:00
0bdc2b6995 Merge pull request #4082 from peppy/use-transfer-on-comit
Use TransferValueOnCommit for mouse sensitivity
2019-01-17 19:53:02 +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
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
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
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
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
5fb90f0e96 Merge pull request #4077 from ekrctb/hold-for-menu-visibility
Always show "hold for menu"
2019-01-17 17:24:11 +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
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
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
0ff76d5f69 Merge pull request #3923 from phosphene47/menu-background-skinning
Menu background skinning
2019-01-17 14:35:17 +09:00