Commit Graph

4063 Commits

Author SHA1 Message Date
Dean Herbert 6f4efbeda6 Merge remote-tracking branch 'upstream/master' into database-tidy 2017-07-27 17:41:29 +09:00
Dean Herbert 996e5e8b4a Use SHA2 for hashing 2017-07-27 17:40:08 +09:00
Dean Herbert 5f53426a9a *Database -> *Store
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
Dan Balasescu fe193207c5 Merge branch 'master' into chat-line-word-wrap 2017-07-27 16:57:15 +09:30
Dan Balasescu d375459fa9 Merge branch 'master' into chat-line-word-wrap 2017-07-27 16:54:15 +09:30
Dean Herbert fdc6666c71 Simplify hashing method
Also exit the import process before importing files to the file store to avoid incorrect reference count increments.
2017-07-27 15:55:55 +09:00
Dean Herbert cbe7b08642 Make BeatmapStore's BeatmapDatabase private 2017-07-27 15:34:13 +09:00
Dean Herbert 96b08b8777 Simplify and document DatabaseStore API 2017-07-27 15:06:10 +09:00
Dean Herbert 31bfa00d60 Schedule API callback to own scheduler
Fixes race condition when API returns a failure after exiting song select. Note that the API does also schedule to the correct thread, but this schedule ensures the callback is never run, which is what we want in this case.
2017-07-27 12:55:14 +09:00
Dean Herbert a90eff69db Simplify BeatmapSetInfo deletion by relying on cascading deletes 2017-07-27 12:51:49 +09:00
Dean Herbert c7a6343985 Never cascade-delete rulesets 2017-07-27 12:51:21 +09:00
Dean Herbert aa81397df4 Recursively retrieve files 2017-07-27 12:41:34 +09:00
Dean Herbert 690b41b1e9 Fix join rows not being deleted when a beatmap is cleaned up 2017-07-27 12:37:37 +09:00
Dean Herbert 4e742959f2 CI fixes 2017-07-27 00:21:57 +09:00
Dean Herbert 87add0765e Initial documentation pass on BeatmapDatabase
Also a bit of tidying up.
2017-07-27 00:08:19 +09:00
Dean Herbert 07d4d2dbe4 Secondary documentation pass on BeatmapStore 2017-07-26 23:13:02 +09:00
Dean Herbert 99e53b5109 Initial documentation pass on BeatmapStore 2017-07-26 22:48:16 +09:00
Dean Herbert 898a601098 Introduce a reference counting file store 2017-07-26 20:22:02 +09:00
Dean Herbert 5fc68aabbf Fix reset function not running in correct order 2017-07-26 17:14:38 +09:00
Dean Herbert 9e20a02c0a Split out BeatmapDatabase into BeatmapStore
Hide database functionality at a lower level in preparation from eventually making it private.
2017-07-26 16:31:34 +09:00
Dean Herbert fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Dean Herbert 3c7546e2c1 Merge remote-tracking branch 'upstream/master' into no-more-colourinfo 2017-07-25 10:14:48 +09:00
Dean Herbert b528568547 Merge branch 'master' into drawableflag-ctor 2017-07-25 09:46:27 +09:00
Dean Herbert 84f12c722f Merge branch 'master' into master 2017-07-24 18:23:36 +09:00
Dean Herbert 7fcd24ab69 Merge branch 'master' into scrollable_carousel 2017-07-24 18:16:47 +09:00
Dean Herbert ed7bb329de Add word wrap support to chat 2017-07-24 18:11:25 +09:00
tgi74000 d0e99f0c95 check removed beatmap being null, check promptdelete beatmap being default 2017-07-24 10:25:33 +02:00
tgi74000 5d30efc090 Do not trigger Random if no Beatmaps are imported 2017-07-24 09:57:12 +02:00
Dean Herbert 038e47ceda Merge branch 'master' into drawableflag-ctor 2017-07-24 16:46:20 +09:00
Nabile Rahmani c80f5c708a Less verbose DrawableFlag constructor. 2017-07-24 09:25:49 +02:00
Dean Herbert 750d96be8f Merge branch 'master' into playlist-beatmaplist-sync 2017-07-24 14:12:04 +09:00
Ben Pig Chu 950c55d6d0 No need to dispose/unbind the delegates 2017-07-24 13:10:51 +08:00
Dean Herbert 64f2e2dc32 Use Colour instead of ColourInfo 2017-07-23 13:06:16 +02:00
EVAST9919 d9e9ab22db Merge remote-tracking branch 'refs/remotes/ppy/master' into scrollable_carousel 2017-07-23 13:27:03 +03:00
Ben Pig Chu 76edcb4a67 Update playlist when adding or removing beatmap set 2017-07-23 14:21:10 +08:00
Dean Herbert 831bd24b00 Merge branch 'master' into easing 2017-07-23 13:46:35 +09:00
Dean Herbert c6250e1da5 Supress compiler warning
I don't think this is a sustainable solution if we start doing this in more places.
2017-07-23 11:34:09 +09:00
Thomas Müller e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller 750fc0db0e Merge branch 'prevent-dependency-pollution' of github.com:Tom94/osu into better-transforms 2017-07-22 11:34:27 +02:00
Thomas Müller 598b3f051e Address CI concerns and update framework 2017-07-22 11:15:45 +02:00
Thomas Müller dae0f61b2b Don't obtain DependencyContainer via DI 2017-07-22 11:09:13 +02:00
Thomas Müller 95684f7d40 Merge branch 'master' of github.com:ppy/osu into prevent-dependency-pollution 2017-07-22 10:56:28 +02:00
Thomas Müller e36b65bfe0 Merge branch 'master' into better-transforms 2017-07-22 10:50:58 +02:00
Dean Herbert 7549d3a2c4 Allow ChatLines to exist without UserProfileOverlay
Fixes testcases failing when logged in.
2017-07-22 17:18:20 +09:00
Thomas Müller e469a114a6 Update dependency caching according to framework 2017-07-21 19:03:43 +02:00
Thomas Müller 0f2bcb2904 Update framework 2017-07-21 18:23:01 +02:00
Thomas Müller a7dc8a892b Update framework 2017-07-21 17:24:09 +02:00
EVAST9919 388fcfb295 Make BeatmapCarousel inherit from OsuScrollContainer 2017-07-21 13:13:53 +03:00
Thomas Müller 2cd8f6b30c Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
#	osu-framework
2017-07-21 11:15:26 +02:00
Dean Herbert 9a33e77d63 Merge branch 'master' into fix-carousel-debounce-race 2017-07-21 17:44:04 +09:00