1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 22:02:56 +08:00
Commit Graph

8160 Commits

Author SHA1 Message Date
Jorolf
f65d4b626e don't use c# 7 feature 2017-10-24 20:46:15 +02:00
Jorolf
9109b1b3f1 Merge branch 'master' of git://github.com/ppy/osu into recent-scores 2017-10-24 20:34:26 +02:00
Jorolf
aadc699e73 show recent scores 2017-10-24 20:31:38 +02:00
Dean Herbert
89cc7b7945 Merge pull request #1424 from peppy/fix-deploy-script
Update MSBuild path
2017-10-24 22:33:05 +09:00
Dean Herbert
aab348bebc Update MSBuild path 2017-10-24 22:11:20 +09:00
Dean Herbert
f67b9afd2b Merge pull request #1421 from peppy/fix-wave-overlay-popin
Fix WaveOverlayContainer appearing incorrectly on first PopIn
2017-10-24 21:01:13 +09:00
Dean Herbert
18fc7e67d9 Update framework 2017-10-24 20:27:32 +09:00
Dean Herbert
15b9307b6c Fix WaveOverlayContainer appearing incorrectly on first PopIn 2017-10-24 20:26:27 +09:00
Dan Balasescu
93f691a487 Merge pull request #1422 from peppy/fix-api-init-requests
Fix multiple requests potentially being triggered during connect sequence
2017-10-24 19:52:45 +09:00
Dean Herbert
808c97fcb4 Fix multiple requests potentially being triggered during connect sequence
As the Success callbacks happen in a scheduled context, if the Update thread is in a stalled state, this loop can generate many unnecessary API requests.
2017-10-24 17:13:59 +09:00
Dean Herbert
65d1594be8 Merge pull request #1402 from odgaard/bugfix-nofail-scoreprocessor
Fix playing a map with NoFail mod never completing
2017-10-24 16:29:32 +09:00
Dean Herbert
4eef9c0067 Merge branch 'master' into bugfix-nofail-scoreprocessor 2017-10-24 15:48:42 +09:00
Jacob Odgård Tørring
493fe1d621 Makes HasFailed private set and removes alreadyFailed 2017-10-24 08:34:10 +02:00
Dan Balasescu
24de147046 Merge pull request #1418 from peppy/fix-volume-and-overlay
Fix VolumeControl and OnScreenDisplay being added to the wrong container
2017-10-24 15:24:15 +09:00
Dean Herbert
fb3e93e874 Merge branch 'master' into fix-volume-and-overlay 2017-10-24 15:15:46 +09:00
Jacob Odgård Tørring
86419e0ded Merge remote-tracking branch 'upstream/master' into bugfix-nofail-scoreprocessor 2017-10-24 08:05:31 +02:00
Dean Herbert
6e7c629153 Merge pull request #1410 from EVAST9919/extended-textawesome-test
Make TextAwesome TestCase more useful
2017-10-24 15:00:17 +09:00
Dean Herbert
542c6501a7 Fix VolumeControl and OnScreenDisplay being added to the wrong container 2017-10-24 13:10:17 +09:00
Dan Balasescu
4f64358d67 Merge branch 'master' into extended-textawesome-test 2017-10-24 12:10:24 +09:00
Dan Balasescu
4751ea07c6 Merge pull request #1412 from peppy/startup-load-improvements
Improve startup load times by sequentially loading components
2017-10-24 12:10:13 +09:00
Dean Herbert
635f26badc Remove unnecessary using 2017-10-24 11:59:57 +09:00
Dan Balasescu
ecd641c44a Merge branch 'master' into startup-load-improvements 2017-10-24 11:54:31 +09:00
Dean Herbert
9ec870a821 Add comment pertaining to why Schedule() is required 2017-10-24 11:50:18 +09:00
Dean Herbert
e98bfec644 Remove Thread.Sleep and tidy up new method 2017-10-24 11:40:38 +09:00
Dan Balasescu
b79edf6791 Merge pull request #1411 from peppy/remove-thread-sleep
Remove no-longer-necessary Thread.Sleep
2017-10-24 11:33:53 +09:00
Dean Herbert
756ce6d04e Merge branch 'master' into remove-thread-sleep 2017-10-24 11:24:54 +09:00
Dean Herbert
5ddc6b8ac2 Merge pull request #1393 from swoolcock/revert-to-default-glow
Added an indicator to the left of settings to revert to default
2017-10-24 10:55:52 +09:00
Dean Herbert
00bb82215b Merge branch 'master' into revert-to-default-glow 2017-10-24 10:48:08 +09:00
Dan Balasescu
74d83cba5a Merge pull request #1407 from swoolcock/config-slider-keyboardstep
Add KeyboardStep values for configuration options
2017-10-24 10:31:35 +09:00
Dean Herbert
cc01878f2b Update framework 2017-10-24 10:12:32 +09:00
Dan Balasescu
9eab2deee7 Merge branch 'master' into config-slider-keyboardstep 2017-10-24 10:10:39 +09:00
Dean Herbert
0e04260b3c Move ToolbarUserArea initialisation to BDL 2017-10-24 10:08:42 +09:00
Dean Herbert
777cdcbdc1 Load even more components async 2017-10-24 10:08:42 +09:00
Dean Herbert
65b23f38f1 fixup! Allow version manager to load completely async 2017-10-24 10:08:42 +09:00
Dean Herbert
9b7d569a65 Add a single-file loading sequence for main components
This stops aync loading from getting overloaded with tasks, which was happening previously.
2017-10-24 10:08:42 +09:00
Dean Herbert
ae0029082a Allow version manager to load completely async 2017-10-24 10:08:42 +09:00
Dean Herbert
0316ec3098 Remove no-longer-necessary Thread.Sleep 2017-10-24 10:08:00 +09:00
Dan Balasescu
cfd081493e Merge pull request #1403 from peppy/fix-missing-sqlite
Add sqlite raw packages to osu.Desktop to ensure sqlite is copied locally
2017-10-24 10:07:23 +09:00
Dean Herbert
d42371b8d4 Merge branch 'master' into fix-missing-sqlite 2017-10-24 09:46:40 +09:00
Dan Balasescu
62df10ef3d Merge pull request #1392 from peppy/import-test-fixes
Fix import testcases randomly failing
2017-10-24 09:45:30 +09:00
Dan Balasescu
cf6079fd07 Merge branch 'master' into import-test-fixes 2017-10-24 09:36:48 +09:00
Dean Herbert
46acd90bc4 Merge pull request #1408 from peppy/update-framework
Update WebRequest usage in line with framework changes
2017-10-24 08:43:02 +09:00
Dean Herbert
4e4f6c1a47 Merge branch 'master' into update-framework 2017-10-24 08:14:58 +09:00
Dean Herbert
26d8b67f25 Merge branch 'master' into config-slider-keyboardstep 2017-10-24 08:14:56 +09:00
Dean Herbert
f66747b63d Merge branch 'master' into fix-missing-sqlite 2017-10-24 08:14:55 +09:00
Dean Herbert
b877177b83 Merge branch 'master' into bugfix-nofail-scoreprocessor 2017-10-24 08:14:54 +09:00
Dean Herbert
ffe94ea880 Merge branch 'master' into revert-to-default-glow 2017-10-24 08:14:53 +09:00
Dean Herbert
c704c0349a Disable IPC test for now 2017-10-24 06:50:33 +09:00
Dean Herbert
7dadb7e21e Mark IPC non-parallelizable 2017-10-24 06:13:39 +09:00
EVAST9919
d4789e4a9c Make TextAwesome TestCase more useful 2017-10-23 19:08:53 +03:00