RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,085 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

8085 Commits

Author SHA1 Message Date
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
Shane Woolcock 2e6a68d358 Rename indicator class, add colour/fade easing, and add tooltip 2017-10-22 16:12:30 +10:30
Dean Herbert ad685bd919 Merge branch 'master' into sliderbouncers 2017-10-22 14:12:03 +09:00
Dean Herbert 448ff3bf38 Update framework 2017-10-22 13:28:17 +09:00
Dean Herbert f45eb96a5b Merge remote-tracking branch 'upstream/master' into revert-to-default-glow 2017-10-22 13:27:53 +09:00
Shane Woolcock 5785af9f6a Reenable revert indicator on audio device since the potential crash was addressed in #1101 2017-10-22 14:22:57 +10:30
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
Shane Woolcock 59b10981dc CI fixes 2017-10-21 17:06:28 +10:30
Shane Woolcock f5946c0e07 Fix wrong license header 2017-10-21 16:28:03 +10:30
Shane Woolcock 840ba9f48e Allow the default indicator colour to be specified, and fix bug where disabled bindables could be reset 2017-10-21 16:05:37 +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
Shane Woolcock b4d575fbcd Fix namespace and unnecessary using 2017-10-21 13:22:21 +10:30
Shane Woolcock 290fac8990 Temporarily disable revert functionality for audio device, since it crashes 2017-10-21 13:17:03 +10:30
Shane Woolcock 98044a17d3 Fix misaligned settings buttons 2017-10-21 13:16:06 +10:30
Shane Woolcock 2c7343e965 Add revert-to-default glow for settings items 2017-10-21 12:44:47 +10:30
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