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

6888 Commits

Author SHA1 Message Date
Dean Herbert
fae6ea1ee2
Merge branch 'master' into storyboard-improvements 2018-02-19 17:28:53 +09:00
Dean Herbert
d70d40e3b8 Add back forgotten score store to valid importers 2018-02-19 15:52:14 +09:00
Dan Balasescu
34f76a4136
Merge branch 'master' into storyboard-improvements 2018-02-19 15:40:09 +09:00
Dan Balasescu
5401b0dfcd
Merge branch 'master' into abstract-model-managers 2018-02-19 14:56:21 +09:00
Dean Herbert
7c43a3b4c0
Merge branch 'master' into storyboard-improvements 2018-02-19 14:54:12 +09:00
Dean Herbert
57e61b0b0e Update xmldoc 2018-02-19 14:50:42 +09:00
Dean Herbert
8b89735e9e Improve xmldoc for DatabaseContextFactory.Get 2018-02-19 14:17:41 +09:00
Dean Herbert
a7915e7041 Fix typo 2018-02-19 14:00:48 +09:00
Dean Herbert
e0faf14a3e Actually consume ReplacesBackground 2018-02-19 12:33:07 +09:00
Dean Herbert
29adedfa96 Collapse visual settings by default in player 2018-02-16 12:47:32 +09:00
Dean Herbert
21b641b302 Give storyboards a BeatmapInfo to reduce weird method calls
Also removes unnecessary background texture (the actual storyboard background spec wasn't implemented correctly anyway).
2018-02-16 12:09:23 +09:00
Dean Herbert
ddf49c2e65 Fix intro not being replaced by a playable song when entering song select 2018-02-16 10:45:15 +09:00
Dean Herbert
9ea7f12f8d
Merge branch 'master' into abstract-model-managers 2018-02-15 20:39:08 +09:00
Dean Herbert
96c23d2a62 Add override to fix left/right arrow control 2018-02-15 19:41:15 +09:00
Dean Herbert
fa05822d7d Add missing licence headers 2018-02-15 16:33:33 +09:00
Dean Herbert
b9ef32b09b Further xmldoc and restoring of Cleanup method 2018-02-15 16:31:42 +09:00
Dean Herbert
1b13be1372 Cleanups and xmldoc additions 2018-02-15 16:24:14 +09:00
Dean Herbert
8c1d581fb3 Fix hiding beatmaps not refreshing correctly 2018-02-15 16:15:40 +09:00
Dean Herbert
89cf794f98 Add a lower level ConsumableItems implementation 2018-02-15 16:15:40 +09:00
Dean Herbert
671475f3b4 Ensure undeleted items are populated with includes before firing events 2018-02-15 16:15:40 +09:00
Dean Herbert
e51450a064 Fix query construction 2018-02-15 15:24:28 +09:00
Dean Herbert
d07ab1fbea Fix undelete all 2018-02-15 15:14:55 +09:00
Dean Herbert
fe5df663be Add more xmldoc 2018-02-15 15:14:46 +09:00
Dean Herbert
a0a65abcac Crentalise all import logic 2018-02-15 14:22:39 +09:00
Dean Herbert
d3dd31dadb Make deletion and purging logic even more global 2018-02-15 14:22:39 +09:00
Dean Herbert
d340509b1d Move ArchiveReaders to a more global namespace
Also moves delete and action logic to a shared implementation
2018-02-15 14:22:39 +09:00
Dean Herbert
6ff63c2f0c Move deletion to ArchiveModelImportManager 2018-02-15 14:22:39 +09:00
Dean Herbert
d8f84fcca3 Give ArchiveReader a filename 2018-02-15 14:22:39 +09:00
Dean Herbert
e0d28564d0 Move import logic to shared implementation 2018-02-15 14:22:39 +09:00
Dan Balasescu
c5b71d2cb7
Remove unused using 2018-02-14 23:15:34 +09:00
Dan Balasescu
9f7736fab3
Merge branch 'master' into restore-ruleset-tests 2018-02-14 22:48:29 +09:00
smoogipoo
bfb21d3d69 Merge remote-tracking branch 'origin/master' into drag-lenience 2018-02-13 21:39:28 +09:00
Dean Herbert
30581d03d2
Merge branch 'master' into PlayerResumeHotfix 2018-02-13 20:34:22 +09:00
Dean Herbert
86acc84988 Apply formatting 2018-02-13 20:23:51 +09:00
Dean Herbert
5ecb77fda7 Merge remote-tracking branch 'upstream/master' into default-approachrate 2018-02-13 20:23:01 +09:00
Dean Herbert
6f29cd35af
Merge branch 'master' into PlayerResumeHotfix 2018-02-13 20:21:45 +09:00
Dean Herbert
f4ddc0717b Fix incorrect PlaylistItem drag handling 2018-02-13 20:08:59 +09:00
Dean Herbert
e2d11af4ef Fix incorrect MusicController drag handling 2018-02-13 20:08:59 +09:00
Dean Herbert
179a151653
Merge branch 'master' into beatmap-import-simplification 2018-02-13 16:54:52 +09:00
Dean Herbert
8c42225646 Fix outdated xmldoc 2018-02-13 15:08:51 +09:00
Dean Herbert
50cdb03cd9 Don't dispose read contexts 2018-02-13 15:08:45 +09:00
Dean Herbert
ab34123ba8 Remove unnecessary class variable 2018-02-13 15:05:19 +09:00
Shane Woolcock
d603d032d5 Inlined delete beatmap dialog 2018-02-13 16:26:05 +10:30
Dean Herbert
3561326306 Remove fixed issue 2018-02-13 14:54:46 +09:00
Dean Herbert
e8e093d6f2 Fix incorrect xmldoc 2018-02-13 14:54:01 +09:00
Shane Woolcock
8d313486b3 Add a confirmation dialog to the Delete option in the beatmap context menu 2018-02-13 00:40:34 +10:30
Dean Herbert
a738664167 Add interface for database context factory 2018-02-12 23:10:05 +09:00
Dean Herbert
64cda9fd0f Remove incorrect assert assumption 2018-02-12 22:16:09 +09:00
Dean Herbert
8b37fde15b Only write when writes occur
Also add finaliser logic for safety. Also better threading. Also more cleanup.
2018-02-12 19:57:21 +09:00
Dean Herbert
edc3638175 DatabaseWriteUsage 2018-02-12 17:55:11 +09:00