Dan Balasescu
9eab2deee7
Merge branch 'master' into config-slider-keyboardstep
2017-10-24 10:10:39 +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
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
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
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
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
Dean Herbert
61c1dd3636
Don't output database logs unless DEBUG_DATABASE is specified compile-time
2017-10-22 19:46:08 +09:00
Dean Herbert
7ba22f0028
Merge remote-tracking branch 'upstream/master' into import-test-fixes
2017-10-22 17:50:03 +09:00
Dean Herbert
f86a13ef61
Merge pull request #1396 from peppy/key-binding-store-improvements
...
Improve performance and db safety of KeyBindings
2017-10-22 17:39:31 +09:00
Dan Balasescu
9a005fb63a
Merge branch 'master' into key-binding-store-improvements
2017-10-22 17:33:43 +09:00
Dean Herbert
7cb893ea21
Merge branch 'master' into import-test-fixes
2017-10-22 16:31:19 +09:00
Dean Herbert
98c76ec8ce
Merge pull request #1313 from Shawdooow/sliderbouncers
...
Improve implementation of slider repeat points
2017-10-22 16:24:59 +09:00
Dean Herbert
aff30db89d
Add thread sleep as a temporary workaround for failing tests
2017-10-22 16:21:41 +09:00
Dean Herbert
5b2219a692
Add back test cleanup before run
2017-10-22 16:20:04 +09:00
Dean Herbert
1514d8451e
Use a more elegant method of setting the connection timeout
2017-10-22 16:20:04 +09:00
Dean Herbert
9aa46bfb0d
Add transaction usage for key binding defaults
2017-10-22 16:17:55 +09:00
Dean Herbert
29fcd210aa
Centralise transaction committing
2017-10-22 16:17:40 +09:00
Dean Herbert
208f4cfbbc
Merge branch 'master' into sliderbouncers
2017-10-22 16:03:40 +09:00
Thomas Müller
6de037127d
Merge pull request #1399 from peppy/fix-double-migration
...
Fix migrating in back and forth between database engines breaking startup
2017-10-22 08:39:41 +02:00
Dean Herbert
39b356880e
Fix typo
2017-10-22 15:32:47 +09:00
Dean Herbert
6818ebdaff
Change the way migrations are checked for
...
This method allows switching between sqlite-net and EF builds without completely breaking. Note that DB migration still only happens in a forward direction, but this will allow switching back and forth without eventually being unable to start the game.
2017-10-22 15:27:16 +09:00
Dean Herbert
ad685bd919
Merge branch 'master' into sliderbouncers
2017-10-22 14:12:03 +09:00
Dean Herbert
7302e5a236
Merge pull request #1395 from swoolcock/opentk-filedrop
...
Change beatmap import to use OpenTK's FileDrop event
2017-10-22 12:13:57 +09:00
Dean Herbert
30307de498
Update framework
2017-10-22 11:58:40 +09:00
Dean Herbert
1a7e23b5c1
Don't query database on keypress
2017-10-21 23:39:31 +09:00
Dean Herbert
4f392a867a
Use a transaction for key binding population
2017-10-21 23:39:24 +09:00
