1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 03:52:55 +08:00
Commit Graph

8134 Commits

Author SHA1 Message Date
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
Dean Herbert
22b3f5dd19 Merge remote-tracking branch 'upstream/master' into import-test-fixes 2017-10-23 22:03:37 +09:00
Dan Balasescu
9a9a1a680e Merge pull request #1409 from peppy/move-tests-to-tests
Move all TestCases to Testing project
2017-10-23 22:00:41 +09:00
Dean Herbert
bbc5c05055 Disable ruleset-level tests for now 2017-10-23 21:25:54 +09:00
Dean Herbert
4e7c0f11f1 Disable import tests so we can make forward progress 2017-10-23 20:14:17 +09:00
Dean Herbert
e7c935a985 Fix incorrect reference to osu.Game project 2017-10-23 19:33:36 +09:00
Dean Herbert
dc9c474033 Move all TestCases to Testing project
This allows tests to successfully retrieve rulesets, as they are referenced.
2017-10-23 19:32:02 +09:00
Dean Herbert
1a3debc91d Ensure thread safety on shared contexts
Let's call this one temporary.
2017-10-23 17:56:04 +09:00
Dean Herbert
e7931ef4c7 Add a default icon when a ruleset isn't present 2017-10-23 17:32:28 +09:00
Dean Herbert
df20845fbb Share one context per file store for performance reasons
There is now a CreateContext method for retrieving a stand-alone context for threaded use.

We may want to add safety against this context being disposed (or just return a fresh one if it is).
2017-10-23 16:35:35 +09:00
Dean Herbert
c1fb7de1da Merge branch 'master' into fix-missing-sqlite 2017-10-23 15:10:15 +09:00
Dean Herbert
4a68dd88cb Centralise BeginTransaction and disable transaction use for now 2017-10-23 14:53:13 +09:00
Dean Herbert
8fab6abf90 Update WebRequest usage in line with framework changes 2017-10-23 14:46:17 +09:00
Shane Woolcock
ea2934d92c Add KeyboardStep values for configuration options 2017-10-23 16:06:08 +10:30
Dean Herbert
1b455019a8 Merge remote-tracking branch 'upstream/master' into revert-to-default-glow 2017-10-23 11:56:17 +09:00
Dan Balasescu
59d908861e Merge pull request #1406 from Nabile-Rahmani/fix-linux-build
Fixed .NET Standard build on Linux.
2017-10-23 09:51:06 +09:00
Nabile Rahmani
5af6fb41f5 Fixed .NET Standard build on Linux. 2017-10-23 02:03:46 +02:00
Jacob Odgård Tørring
9b54e834d9 Implements virtual Failcondition in scoreprocessor and enforces nofail in UpdateFailed 2017-10-22 20:32:59 +02:00
Dean Herbert
c089842adf Merge branch 'master' into import-test-fixes 2017-10-23 02:21:42 +09:00
Dean Herbert
b1d5fc523f Add sqlite raw packages to osu.Desktop to ensure sqlite is copied locally 2017-10-23 00:36:50 +09:00
Dean Herbert
ded019b2eb Merge pull request #1401 from DerpyCrabs/patch-1
Fix linux build
2017-10-22 22:23:43 +09:00
DerpyCrabs
cf468d6708 Fix linux build
Build is failing on linux because of case sensitive file system. This change fixes it.
2017-10-22 20:14:38 +07:00