Commit Graph

6195 Commits

Author SHA1 Message Date
5dfed1dba5 Add word-wrap functionality of ProgressNotification
Fixes a potential threading issue when updating Text.
2017-07-28 17:00:20 +09:00
bd79a69e2e Merge pull request #1047 from EVAST9919/chat_dragging
Allow ChatOverlay resize only if it dragged by tabs area only
2017-07-28 12:56:39 +09:00
3263aa2ca7 Always return true while dragging 2017-07-27 17:02:23 +03:00
eb4880cdd5 Applied suggestions 2017-07-27 16:33:10 +03:00
ed08bcf844 Merge remote-tracking branch 'refs/remotes/ppy/master' into chat_dragging 2017-07-27 16:19:21 +03:00
cb68f18f47 Merge pull request #1063 from peppy/from-hex-hash
Allow OsuColour.FromHex to support prefix #.
2017-07-27 18:52:04 +09:30
b64fe68233 Allow OsuColour.FromHex to support prefix #.
Coincides with https://github.com/ppy/osu-web/pull/1373
2017-07-27 18:03:35 +09:00
834793be43 Merge pull request #1060 from peppy/database-tidy
Tidy up database namespaces and classes
2017-07-27 18:18:30 +09:30
6f4efbeda6 Merge remote-tracking branch 'upstream/master' into database-tidy 2017-07-27 17:41:29 +09:00
996e5e8b4a Use SHA2 for hashing 2017-07-27 17:40:08 +09:00
816ea5e6d7 Merge pull request #1056 from peppy/chat-line-word-wrap
Add word wrap support to chat
2017-07-27 17:32:41 +09:30
5f53426a9a *Database -> *Store
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
fe193207c5 Merge branch 'master' into chat-line-word-wrap 2017-07-27 16:57:15 +09:30
32d207e516 Merge pull request #1062 from peppy/fix-non-scheduled-callback
Fix a potential hard crash when exiting song select
2017-07-27 16:56:53 +09:30
d375459fa9 Merge branch 'master' into chat-line-word-wrap 2017-07-27 16:54:15 +09:30
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
cbe7b08642 Make BeatmapStore's BeatmapDatabase private 2017-07-27 15:34:13 +09:00
96b08b8777 Simplify and document DatabaseStore API 2017-07-27 15:06:10 +09:00
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
a90eff69db Simplify BeatmapSetInfo deletion by relying on cascading deletes 2017-07-27 12:51:49 +09:00
c7a6343985 Never cascade-delete rulesets 2017-07-27 12:51:21 +09:00
aa81397df4 Recursively retrieve files 2017-07-27 12:41:34 +09:00
690b41b1e9 Fix join rows not being deleted when a beatmap is cleaned up 2017-07-27 12:37:37 +09:00
4e742959f2 CI fixes 2017-07-27 00:21:57 +09:00
87add0765e Initial documentation pass on BeatmapDatabase
Also a bit of tidying up.
2017-07-27 00:08:19 +09:00
07d4d2dbe4 Secondary documentation pass on BeatmapStore 2017-07-26 23:13:02 +09:00
99e53b5109 Initial documentation pass on BeatmapStore 2017-07-26 22:48:16 +09:00
898a601098 Introduce a reference counting file store 2017-07-26 20:22:02 +09:00
5fc68aabbf Fix reset function not running in correct order 2017-07-26 17:14:38 +09:00
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
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
d441a7a6f9 Merge pull request #1053 from Tom94/no-more-colourinfo
Use Colour instead of ColourInfo
2017-07-25 10:21:26 +09:00
32a6975521 Update framework 2017-07-25 10:16:10 +09:00
3c7546e2c1 Merge remote-tracking branch 'upstream/master' into no-more-colourinfo 2017-07-25 10:14:48 +09:00
4aba6f1903 Merge pull request #1054 from Nabile-Rahmani/drawableflag-ctor
Less verbose DrawableFlag constructor
2017-07-25 09:51:07 +09:00
b528568547 Merge branch 'master' into drawableflag-ctor 2017-07-25 09:46:27 +09:00
1c501df83c Merge pull request #1055 from tgi74/master
Fixed various exceptions when no beatmaps are imported
2017-07-25 09:37:30 +09:00
84f12c722f Merge branch 'master' into master 2017-07-24 18:23:36 +09:00
4dc4ff171a Merge pull request #1046 from EVAST9919/scrollable_carousel
Make BeatmapCarousel inherit from OsuScrollContainer
2017-07-24 18:23:00 +09:00
7fcd24ab69 Merge branch 'master' into scrollable_carousel 2017-07-24 18:16:47 +09:00
ed7bb329de Add word wrap support to chat 2017-07-24 18:11:25 +09:00
d0e99f0c95 check removed beatmap being null, check promptdelete beatmap being default 2017-07-24 10:25:33 +02:00
5d30efc090 Do not trigger Random if no Beatmaps are imported 2017-07-24 09:57:12 +02:00
038e47ceda Merge branch 'master' into drawableflag-ctor 2017-07-24 16:46:20 +09:00
c80f5c708a Less verbose DrawableFlag constructor. 2017-07-24 09:25:49 +02:00
9bb404b799 Merge pull request #1050 from benpigchu/playlist-beatmaplist-sync
Update playlist when importing or deleting a beatmap
2017-07-24 15:13:32 +09:00
750d96be8f Merge branch 'master' into playlist-beatmaplist-sync 2017-07-24 14:12:04 +09:00
950c55d6d0 No need to dispose/unbind the delegates 2017-07-24 13:10:51 +08:00
197f57c129 Merge branch 'master' into no-more-colourinfo 2017-07-23 13:10:28 +02:00
64f2e2dc32 Use Colour instead of ColourInfo 2017-07-23 13:06:16 +02:00