1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 16:27:43 +08:00
Commit Graph

6519 Commits

Author SHA1 Message Date
Dean Herbert
fcd502642d Merge branch 'master' into button-visually-disables 2017-07-31 16:38:33 +09:00
Dean Herbert
17c5bdbc92 Merge branch 'master' into fix-notification-threading 2017-07-31 16:33:34 +09:00
EVAST9919
62365090ad Removed useless variable 2017-07-29 17:51:11 +03:00
EVAST9919
6b3a81f567 Fix hard crash when pressing random if no beatmaps avaliable 2017-07-29 17:42:32 +03:00
EVAST9919
e121b119be Added "scroll to" container 2017-07-29 17:33:20 +03:00
EVAST9919
8458622c4d Add ScrollToSelected method 2017-07-29 16:03:17 +03: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
4bb8f40b49 AutoSize notifications (and add animation) 2017-07-28 17:00:30 +09:00
Dean Herbert
74044baeff Don't cancel a ProgressNotification when clicking by default 2017-07-28 17:00:27 +09:00
Dean Herbert
b3e3c4a226 Fix setting a ProgressNotification's progress too early crashing 2017-07-28 17:00:24 +09:00
Dean Herbert
5dfed1dba5 Add word-wrap functionality of ProgressNotification
Fixes a potential threading issue when updating Text.
2017-07-28 17:00:20 +09:00
Dean Herbert
0d332d4754 Fix NotificationOverlay no longer automatically displaying 2017-07-28 16:59:42 +09:00
Dean Herbert
c48bf3940e Add a progress notification when importing beatmaps 2017-07-28 16:57:33 +09:00
Dean Herbert
f5b0253e82 Apply CI fixes 2017-07-28 15:36:23 +09:00
Dean Herbert
d93d9e6190 Tidy up file deletion after import 2017-07-28 15:08:56 +09:00
Dean Herbert
6616721e37 Don't block imports and BeatmapStore operations using the same lock 2017-07-28 15:05:12 +09:00
Dean Herbert
e691dd12c5 Fix potential sequen of execution issues in BeatmapCarousel 2017-07-28 15:05:08 +09:00
Dean Herbert
a55586f2ad FIx potential sequence of execution issues in PlaylistOverlay 2017-07-28 15:04:58 +09:00
Dean Herbert
02a04afb29 Ensure notification posts are always scheduled to local thread
Posts can be triggered by Logger.Log events which are not guaranteed to be on the update thread.
2017-07-28 15:03:53 +09:00
Dean Herbert
f705589bf2 Rename NotificationManager to NotificationOverlay 2017-07-28 15:03:42 +09:00
Dean Herbert
e448f79154 Fix deleted beatmaps not correctly being removed from the playlist 2017-07-28 12:58:35 +09:00
Dean Herbert
d51ce896f9 Add locking to all BeatmapManager operations 2017-07-28 12:58:35 +09:00
Dean Herbert
7d4218ea6c Add option to import from osu-stable
Also adds an option to delete all beatmaps for testing purposes.
2017-07-28 12:58:35 +09:00
Dean Herbert
e5306997dd Fix VisualTests 2017-07-28 12:58:35 +09:00
Dean Herbert
9ee59dd637 Add the ability to create migrations on a per-store level
Now stores store versions to the database itself.
2017-07-28 12:58:35 +09:00
Dean Herbert
6a36fa7809 Make OsuButtons visually disable when not enabled 2017-07-28 12:58:03 +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