1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 09:22:58 +08:00
Commit Graph

10653 Commits

Author SHA1 Message Date
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
Dean Herbert
af61a524b5
Merge pull request #2034 from smoogipoo/restore-ruleset-tests
Restore nunit ruleset + waveform test cases
2018-02-15 00:12: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
Dean Herbert
22192c4569
Merge pull request #2066 from ppy/osu/update-framework
Update framework with GameThread fixes
2018-02-14 17:55:14 +09:00
smoogipoo
20de3c421a Update framework 2018-02-14 17:43:45 +09:00
Dan Balasescu
44c9d14142
Merge pull request #2064 from peppy/drag-lenience
Fix drag handling in line with framework changes
2018-02-13 22:19:20 +09:00
smoogipoo
bf6c93e77e Update framework 2018-02-13 21:50:46 +09:00
smoogipoo
bfb21d3d69 Merge remote-tracking branch 'origin/master' into drag-lenience 2018-02-13 21:39:28 +09:00
Dean Herbert
32d45ccdb4
Merge pull request #2044 from UselessToucan/PlayerResumeHotfix
Fix pressing escape quickly unexpectedly exiting gameplay
2018-02-13 20:51:19 +09:00
Dean Herbert
30581d03d2
Merge branch 'master' into PlayerResumeHotfix 2018-02-13 20:34:22 +09:00
Dean Herbert
d8224809e6
Merge pull request #2049 from sunghwan2789/default-approachrate
Fix ApproachRate not inheriting OverallDifficulty when it is undefined
2018-02-13 20:34:02 +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
Dan Balasescu
110cd02e20
Merge pull request #2054 from peppy/beatmap-import-simplification
Improvments to EF context handling and BeatmapManager
2018-02-13 18:51:51 +09:00
Dan Balasescu
8e9deb53fa
Merge branch 'master' into beatmap-import-simplification 2018-02-13 18:38:45 +09:00
Dan Balasescu
7bf5b837bc
Merge pull request #2057 from Aergwyn/fade-slider-ticks
Fade slider ticks with hidden mod
2018-02-13 18:14:43 +09:00
Dan Balasescu
2870b15c3f
Merge branch 'master' into fade-slider-ticks 2018-02-13 17:43:07 +09:00
Dean Herbert
179a151653
Merge branch 'master' into beatmap-import-simplification 2018-02-13 16:54:52 +09:00
Dean Herbert
5e9d0aaf5a
Merge pull request #2060 from ppy/osu/context-menu-delete-confirmation
Add confirmation dialog to Delete in beatmap context menu
2018-02-13 15:54:36 +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
Dean Herbert
cc948d688f Fix unrelated spacing issue 2018-02-12 15:39:13 +09:00
Dean Herbert
9ed05543d7 Fix post-test conditionals from being inverse of what we want to test 2018-02-12 15:39:00 +09:00
Dean Herbert
e54de0c267 Remove sqlite-net migration
Anyone that may have benefited from this already has.
2018-02-12 15:25:09 +09:00
Dean Herbert
264a0f59e2 Fix duplicate test name 2018-02-12 12:22:13 +09:00
Dean Herbert
efeffaf634 Update CFS version 2018-02-12 11:40:24 +09:00
Aergwyn
c3ce015869 fade slider ticks with hidden mod 2018-02-11 11:03:01 +01:00
TocoToucan
86f200e257 Fix possible nullref 2018-02-09 22:04:39 +03:00
TocoToucan
a86a4f49cf Resolve "Pressing escape on continuing causes the game to return to song select" problem without removing Delay 2018-02-09 21:20:49 +03:00
Dean Herbert
721bb7e4dd Add proper handling for OnlineBeatmapSetID conflicts
Not yet working
2018-02-09 21:31:33 +09:00