Commit Graph

16121 Commits

Author SHA1 Message Date
e35b0093f3 Merge branch 'master' into fix-toolbar-padding-regression 2019-01-22 19:18:02 +09:00
24ac1982cc Merge pull request #4117 from peppy/update-framework
Update framework
2019-01-22 17:01:14 +09:00
828b9451e5 Update framework 2019-01-22 16:48:32 +09:00
55fb401532 Merge pull request #4116 from ekrctb/fix-import-beatmap-completion-notification-click
Fix PresentBeatmap not working for unsubmitted beatmap set
2019-01-22 16:48:22 +09:00
fe2b83279e Correct wrong logic
`OnlineBeatmapSetID == null` was the problem
2019-01-22 16:40:32 +09:00
0095521fc2 Use both OnlineBeatmapSetID and Hash 2019-01-22 16:10:04 +09:00
1d5f5865aa Fix PresentBeatmap not working for unsubmitted beatmap set 2019-01-22 15:19:42 +09:00
ca470ffaf0 Merge pull request #4103 from ekrctb/taiko-namespace
Fix taiko sample namespace ignored
2019-01-22 10:34:36 +09:00
635046acff Merge branch 'master' into taiko-namespace 2019-01-22 10:26:25 +09:00
a9dd41eef8 Merge pull request #4091 from nwabear/master
Add beatmap skin/hitsound checkboxes to general settings
2019-01-22 10:15:15 +09:00
21317806c9 Merge remote-tracking branch 'upstream/master' into nwabear-master 2019-01-22 10:07:35 +09:00
7baff750de Consolidate layout, wording and ordering with VisualSettings 2019-01-22 10:06:30 +09:00
6cc7b1cea8 Merge pull request #4104 from ekrctb/score-panel-layout
Layout combo counter and accuracy counter based on score counter width
2019-01-22 09:59:12 +09:00
b373d78143 Add slight easing 2019-01-22 09:47:51 +09:00
25b5bbcd8f Merge branch 'master' into score-panel-layout 2019-01-22 09:43:37 +09:00
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
86581feb4a Merge branch 'master' into fix-playersettingsoverlay-not-coming-back-ctrl+H 2019-01-22 01:29:58 +01:00
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
d7d2e2fe44 trimmed whitespace 2019-01-21 19:22:19 +01:00
65fd69c817 Update HUDOverlay.cs
separate PlayerSettingsOverlay from the other HUD elements in the Visibility Container
2019-01-21 19:10:29 +01:00
fb51578df3 Update PlayerSettingsOverlay.cs
Framework renamed this variable so it needs to be renamed here too.
2019-01-21 17:19:40 +01:00
7cdb823c87 Moved "Use beatmap hitsounds" button 2019-01-21 08:04:06 -06:00
da83a83821 Merge branch 'master' into master 2019-01-21 07:49:56 -06:00
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
e6a3de8652 Format better 2019-01-21 20:15:53 +09:00
4eb5e67075 Fix overlays not being correctly offset by toolbar padding 2019-01-21 19:34:35 +09:00
1d1f8762c5 Add win7 & 8.1 requirements to readme 2019-01-21 19:09:24 +09:00
e74f0057bd Automatically layout based on score display width 2019-01-21 17:07:56 +09:00
0573c1c923 Fix taiko namespace ignored 2019-01-21 14:20:37 +09:00
5579b52bdf Merge branch 'master' into master 2019-01-20 20:16:20 +09:00
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
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
858541bcf4 Added "Use beatmap hitsounds" button to volume section of settings 2019-01-18 02:33:39 -06:00
209deb842a Add note about iOS 2019-01-18 16:14:52 +09:00
42fa04beee Update SkinSection.cs
Added "Use beatmap skins" button to general settings
2019-01-17 14:40:22 -06: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