6349 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	c9c1a628af	Merge pull request #1074 from Alex4386/master ... Hide the notification overlay on screens which explicitly hide overlays	2017-08-01 11:45:20 +09:00
Dean Herbert	fc7f9cbae2	Merge branch 'master' into master	2017-08-01 11:34:59 +09:00
Alex Park (박상희)	bb3a8a29ea	Hide Notification when playing osu ... Hide Notification Overlay when playing osu	2017-08-01 11:31:11 +09:00
Dean Herbert	ab4be26ec3	Merge pull request #1072 from EVAST9919/scroll_to_selected ... Reset carousel position when mouse leaves the carousel area	2017-08-01 11:28:45 +09:00
Dean Herbert	024a34a9b3	Merge branch 'master' into scroll_to_selected	2017-08-01 11:17:16 +09:00
Dan Balasescu	d645563ad3	Merge pull request #1073 from peppy/fix-file-references ... Store filenames against BeatmapSetFileInfo for correctness	2017-08-01 11:46:41 +09:30
Dean Herbert	c8b5c1b8a5	Merge branch 'master' into scroll_to_selected	2017-08-01 11:06:32 +09:00
Dean Herbert	b4acdd5f90	Merge remote-tracking branch 'upstream/master' into fix-file-references	2017-08-01 11:05:38 +09:00
Dean Herbert	9db4caafba	Update framework	2017-08-01 11:05:33 +09:00
Dean Herbert	9d630e446e	Use new storage methods to reset FileStore ... Guarantees that backing files are cleaned up correctly. Also handles lingering "beatmaps" directory from older builds.	2017-08-01 10:57:46 +09:00
Dan Balasescu	8aac289add	Merge pull request #1067 from peppy/import-from-stable ... Beatmap import support from osu!stable	2017-08-01 11:10:25 +09:30
Dean Herbert	821f65c381	Actually delete files	2017-08-01 10:24:12 +09:00
Dean Herbert	c73e139954	Add "migration" ... Also simplify initial migration for BeatmapStore by just nuking everything.	2017-08-01 10:24:04 +09:00
Dean Herbert	c060d32765	Separate out startup tasks to ensure they run after migrations	2017-08-01 10:24:00 +09:00
Dean Herbert	ed3e78452e	Lock beatmaps for good measure	2017-08-01 09:38:43 +09:00
Dean Herbert	6af0629cc0	Remove unnecessary newline	2017-08-01 09:37:33 +09:00
Dean Herbert	404497fa10	Allow a single beatmap to reference the same file multiple times ... This fixes incorrect reference counts causing database desync.	2017-07-31 21:49:57 +09:00
EVAST9919	700c7753c3	Applied suggestions	2017-07-31 14:20:12 +03:00
EVAST9919	1ce4966644	Merge remote-tracking branch 'refs/remotes/ppy/master' into scroll_to_selected	2017-07-31 14:08:15 +03:00
Dean Herbert	f67822a59b	Add progress for deleting all maps	2017-07-31 18:52:59 +09:00
Huo Yaoyuan	df3f75b842	Merge branch 'master' into fixes	2017-07-31 17:51:34 +08:00
Dean Herbert	bc8f8de049	Make QueryAndPopulate's filter non-optional (you basically *never* want this missing)	2017-07-31 18:41:54 +09:00
Dean Herbert	92b3c7ac08	Fix the whole database being retrieved when importing each beatmap	2017-07-31 18:38:42 +09:00
Dean Herbert	df5094c0d4	Rework how notifications are distributed	2017-07-31 18:03:55 +09:00
Dean Herbert	57d45b180c	Merge remote-tracking branch 'upstream/master' into import-from-stable	2017-07-31 17:31:10 +09:00
Dean Herbert	bc21798e41	Merge pull request #1069 from peppy/notification-improvements ... Improvements to (progress) notifications	2017-07-31 17:21:13 +09:00
Dean Herbert	502ccae0ca	Merge branch 'master' into notification-improvements	2017-07-31 17:12:11 +09:00
Dean Herbert	5c87106f94	Merge pull request #1068 from peppy/fix-notification-threading ... Fix cross-thread notification posting causing a hard crash	2017-07-31 16:50:34 +09:00
Dean Herbert	063add6d10	Merge branch 'master' into fix-notification-threading	2017-07-31 16:39:53 +09:00
Dean Herbert	4d47beb2f1	Merge pull request #1066 from peppy/button-visually-disables ... Make OsuButtons visually disable when not enabled	2017-07-31 16:39:16 +09:00
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