1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 06:07:28 +08:00
Commit Graph

7967 Commits

Author SHA1 Message Date
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
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
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
98c76ec8ce Merge pull request #1313 from Shawdooow/sliderbouncers
Improve implementation of slider repeat points
2017-10-22 16:24:59 +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
Shane Woolcock
a9657d2142 Change beatmap import to use OpenTK's FileDrop event 2017-10-22 00:55:32 +10:30
Dean Herbert
a6f48f7f9f Merge pull request #1389 from peppy/db-migration-fixes
Fix a few issues with database upgrade
2017-10-21 12:46:45 +09:00
Dean Herbert
270f984ae7 Merge remote-tracking branch 'upstream/master' into db-migration-fixes 2017-10-21 00:15:21 +09:00
Dean Herbert
47213d2498 Rely on storage.DeleteDatabase for guaranteed database deletion
Relies on https://github.com/ppy/osu-framework/pull/1100 being merged for most effectiveness.
2017-10-21 00:15:02 +09:00
Dan Balasescu
da5e7766fb Merge pull request #1391 from peppy/fix-ef-hiding
Fix issues related to hiding beatmaps
2017-10-20 20:12:02 +09:00
Dan Balasescu
a9b9d82b74 Merge branch 'master' into fix-ef-hiding 2017-10-20 17:22:50 +09:00
Dan Balasescu
09f4d1df47 Merge pull request #1383 from peppy/notification-thread-safety
Make ProgressNotification's status and progress thread-safe
2017-10-20 17:01:39 +09:00
Dean Herbert
b805174143 Output the inner exception to the log when possible 2017-10-20 14:33:35 +09:00
Dean Herbert
980a6c93b4 Merge branch 'master' into fix-ef-hiding 2017-10-20 14:24:46 +09:00
Dean Herbert
f18a3117a2 Merge branch 'master' into notification-thread-safety 2017-10-20 14:24:33 +09:00
Dan Balasescu
310df17e2d Merge pull request #1390 from peppy/fix-ef-deletion
Fix issues with deletion
2017-10-20 13:58:27 +09:00
Dean Herbert
f9d5eadd05 Fix TestCase failing in an infinite loop 2017-10-20 12:21:18 +09:00
Dean Herbert
35ce6fd2bd Merge branch 'master' into notification-thread-safety 2017-10-20 11:48:14 +09:00
Dean Herbert
93b2fc6dc5 Fix issues with deletion
Main fix is avoiding nullrefs being thrown when metadata isn't present on a beatmap (quite a common scenario).
2017-10-20 11:18:08 +09:00
Dean Herbert
f69fa0cf1f Fix selection after hiding all difficulties in a set 2017-10-20 11:16:56 +09:00
Dean Herbert
7f83cf6780 Fix hiding not always working
Because we are not sharing a single context, we need to use Update to attach the entity to the local context.
2017-10-20 11:16:45 +09:00
Dean Herbert
d32059a7ba Ignore include-ignore warnings for now 2017-10-20 09:25:54 +09:00
Dean Herbert
ca78078436 Add more logging output 2017-10-20 08:06:07 +09:00
Dean Herbert
0e1328a30e Add maximum try count before bailing 2017-10-20 08:01:38 +09:00
Dean Herbert
efaf98c5cf Allow recovery from a very broken database 2017-10-20 00:48:27 +09:00
Dean Herbert
9b1ed5b3aa Keep trying until delete succeeds
Turns out it can fail if file handles are still open.
2017-10-19 23:33:27 +09:00
Dean Herbert
d9fd05a5af Hidden cannot be null 2017-10-19 23:19:30 +09:00
Dan Balasescu
22d39c6bf7 Merge pull request #1350 from UselessToucan/EfCore
Use EF for SQLite interfacing
2017-10-19 21:51:50 +09:00
Dean Herbert
8aea6068ba Add fallback logic for the case where previous database can't be migrated 2017-10-19 21:37:09 +09:00
Dean Herbert
7ce6167220 Merge branch 'master' into EfCore 2017-10-19 21:20:22 +09:00
Dan Balasescu
afaf3b4116 Merge branch 'master' into notification-thread-safety 2017-10-19 21:12:53 +09:00
Dan Balasescu
f49f02fda4 Merge pull request #1387 from peppy/fix-duplicate-opentk-reference
Remove duplicate reference to opentk package
2017-10-19 21:12:39 +09:00
Dean Herbert
1672e0d6b6 Add fallback logic in case migration fails
Nuke it all.
2017-10-19 21:11:43 +09:00
Dean Herbert
365e2343a1 Remove AllRuleset references 2017-10-19 21:09:29 +09:00
Dean Herbert
a724a20b02 Remove duplicate reference to opentk package 2017-10-19 20:07:25 +09:00
Dean Herbert
1fbbee14e4 Allow migration from sqlite-net to EF
Bonus stage
2017-10-19 20:04:59 +09:00
Dean Herbert
f7d0df1743 Fix beatmap difficulty and metadata deletion 2017-10-19 17:50:46 +09:00
Dean Herbert
b02dd196f6 Don't make one factory each context
A factory is supposed to be re-used.
2017-10-19 17:29:39 +09:00
Dean Herbert
36c00577af Reduce database log output
Also hard-disables it for uninteresting log levels, providing a further performance boost.
2017-10-19 16:35:06 +09:00