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

16354 Commits

Author SHA1 Message Date
Dean Herbert
5579b52bdf
Merge branch 'master' into master 2019-01-20 20:16:20 +09:00
Dean Herbert
161d0f0564
Merge pull request #4097 from swoolcock/fix-logovis-ios
Use QuadBatch for LogoVisualisation
2019-01-20 19:57:04 +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
smoogipoo
3db23898df Merge remote-tracking branch 'origin/master' into diffcalc-fixes 2019-01-20 13:27:42 +09:00
smoogipoo
5ecc07b729 Revert "Fix out of bounds exception during indexing"
This reverts commit 88d80016aa.
2019-01-20 12:05:08 +09:00
Dean Herbert
655654760b
Merge pull request #4087 from Llaurence/build-run-doc
Made the build instructions more detailed
2019-01-20 11:31:05 +09:00
Dean Herbert
ffed411eaf
Minor fixes 2019-01-20 11:23:33 +09:00
Dean Herbert
e5610b61eb
Final pass 2019-01-20 11:13:15 +09:00
Shane Woolcock
1ba9e0dd0a Add better app icons and change info.plist properties 2019-01-19 22:39:11 +10:30
Shane Woolcock
de9511a7e2 Update references 2019-01-19 18:10:27 +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
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
Llaurence
c3c1e19301 Release -> Debug by default, linux note rewrite 2019-01-18 10:12:59 +01:00
Dean Herbert
2db2846882
Remove "with dotnet"
Co-Authored-By: Llaurence <40535137+Llaurence@users.noreply.github.com>
2019-01-18 08:52:52 +00:00
Dean Herbert
94648658f7
Links to ides sites
Co-Authored-By: Llaurence <40535137+Llaurence@users.noreply.github.com>
2019-01-18 08:52:31 +00:00
Dean Herbert
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
Dean Herbert
5528692260
Specify macOS version
Co-Authored-By: Llaurence <40535137+Llaurence@users.noreply.github.com>
2019-01-18 08:51:06 +00:00
Dean Herbert
32940074af
Windows 64 bit -> Windows (x64)
Co-Authored-By: Llaurence <40535137+Llaurence@users.noreply.github.com>
2019-01-18 08:50:36 +00:00
Bear Daniel
858541bcf4 Added "Use beatmap hitsounds" button to volume section of settings 2019-01-18 02:33:39 -06:00
Dean Herbert
209deb842a
Add note about iOS 2019-01-18 16:14:52 +09: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
Yusuf Bera Ertan
0c26145fd1
bellow -> below
Co-Authored-By: Llaurence <40535137+Llaurence@users.noreply.github.com>
2019-01-17 19:23:44 +00:00
Llaurence
2f0abeb4e9 Update 'Building and Running' in README.md 2019-01-17 19:02:19 +01:00
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