1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 20:07:25 +08:00
Commit Graph

6206 Commits

Author SHA1 Message Date
Jorolf
4720a47363 Merge branch 'master' of git://github.com/ppy/osu into ranks-section 2017-07-29 00:45:14 +02:00
Jorolf
88f206cfe4 rename file 2017-07-29 00:39:47 +02:00
Jorolf
0fc36065f4 replace Play with Score 2017-07-29 00:31:52 +02:00
Thomas Müller
b2119efddf Merge pull request #1070 from peppy/transaction-on-import
Use a transaction when adding a beatmap
2017-07-28 10:57:01 +02:00
Dean Herbert
b45f1e5381 Merge branch 'master' into transaction-on-import 2017-07-28 17:43:18 +09:00
Thomas Müller
05aeb2e8c6 Merge pull request #1064 from peppy/store-migration
Add the ability to create migrations on a per-store level
2017-07-28 10:41:49 +02:00
Thomas Müller
88265c3223 Merge branch 'master' into store-migration 2017-07-28 10:34:22 +02:00
Dean Herbert
6807caa752 Use a transaction when adding a beatmap
Fixes flakey unit test.
2017-07-28 17:31:50 +09:00
Dean Herbert
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
EVAST9919
3263aa2ca7 Always return true while dragging 2017-07-27 17:02:23 +03:00
EVAST9919
eb4880cdd5 Applied suggestions 2017-07-27 16:33:10 +03:00
EVAST9919
ed08bcf844 Merge remote-tracking branch 'refs/remotes/ppy/master' into chat_dragging 2017-07-27 16:19:21 +03:00
Dean Herbert
cd22ff11e9 Fix VisualTests 2017-07-27 20:50:26 +09:00
Dean Herbert
3a6f3cdd8a Add the ability to create migrations on a per-store level
Now stores store versions to the database itself.
2017-07-27 20:38:40 +09:00
Dan Balasescu
cb68f18f47 Merge pull request #1063 from peppy/from-hex-hash
Allow OsuColour.FromHex to support prefix #.
2017-07-27 18:52:04 +09:30
Dean Herbert
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
Dan Balasescu
834793be43 Merge pull request #1060 from peppy/database-tidy
Tidy up database namespaces and classes
2017-07-27 18:18:30 +09:30
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
Dan Balasescu
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
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
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
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
Jorolf
7b8997cfc2 CI stuff 2017-07-26 19:42:34 +02:00
Jorolf
8e685a98d4 add RanksSection 2017-07-26 19:21:45 +02: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
d441a7a6f9 Merge pull request #1053 from Tom94/no-more-colourinfo
Use Colour instead of ColourInfo
2017-07-25 10:21:26 +09:00
Dean Herbert
32a6975521 Update framework 2017-07-25 10:16:10 +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
4aba6f1903 Merge pull request #1054 from Nabile-Rahmani/drawableflag-ctor
Less verbose DrawableFlag constructor
2017-07-25 09:51:07 +09:00
Dean Herbert
b528568547 Merge branch 'master' into drawableflag-ctor 2017-07-25 09:46:27 +09:00
Dean Herbert
1c501df83c Merge pull request #1055 from tgi74/master
Fixed various exceptions when no beatmaps are imported
2017-07-25 09:37:30 +09:00
Dean Herbert
84f12c722f Merge branch 'master' into master 2017-07-24 18:23:36 +09:00
Dean Herbert
4dc4ff171a Merge pull request #1046 from EVAST9919/scrollable_carousel
Make BeatmapCarousel inherit from OsuScrollContainer
2017-07-24 18:23:00 +09:00