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

16427 Commits

Author SHA1 Message Date
Dean Herbert
25b5bbcd8f
Merge branch 'master' into score-panel-layout 2019-01-22 09:43:37 +09:00
Dean Herbert
e8e852f745
Merge pull request #4111 from chrisny286/fix-playersettingsoverlay-not-coming-back-ctrl+H
Fix player settings getting stuck in a hidden state
2019-01-22 09:43:30 +09:00
Christian Kamphausen
86581feb4a
Merge branch 'master' into fix-playersettingsoverlay-not-coming-back-ctrl+H 2019-01-22 01:29:58 +01:00
Dean Herbert
d228ac42c0
Merge pull request #4112 from chrisny286/fix-playback-and-visual-settings-interactable-with-when-UI-hidden
Fix Player Settings being interactable with when hiding HUD with shift+tab
2019-01-22 09:12:11 +09: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
nwabear
da83a83821
Merge branch 'master' into master 2019-01-21 07:49:56 -06:00
Dean Herbert
8160162cde Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics 2019-01-21 20:58:17 +09:00
Dean Herbert
9156a7357d
Merge pull request #4107 from smoogipoo/add-prereqs-note
Add win7 & 8.1 requirements to readme
2019-01-21 20:16:08 +09:00
Dean Herbert
e6a3de8652
Format better 2019-01-21 20:15:53 +09:00
Dean Herbert
4eb5e67075 Fix overlays not being correctly offset by toolbar padding 2019-01-21 19:34:35 +09:00
smoogipoo
1d1f8762c5 Add win7 & 8.1 requirements to readme 2019-01-21 19:09:24 +09:00
ekrctb
67ea3beeb4 Fix catch slider conversion for last droplets 2019-01-21 18:05:55 +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
smoogipoo
baae53d784 Merge branch 'diffcalc-fixes' into xexxar-angles 2019-01-20 22:19:50 +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
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