1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 17:47:29 +08:00
Commit Graph

10630 Commits

Author SHA1 Message Date
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
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
Dean Herbert
a1513351c0 Add missing licence header 2018-02-09 20:35:54 +09:00
Dean Herbert
d547caa04e Further improve xmldoc 2018-02-09 19:44:17 +09:00
Dean Herbert
867b1b5f65 Move public methods up 2018-02-09 19:39:02 +09:00
Dean Herbert
c84cb0b33c Fix/add some xmldoc 2018-02-09 19:32:28 +09:00
Dean Herbert
db654004b7 Move BeatmapManagerWorkingBeatmap to its own file 2018-02-09 19:32:18 +09:00
Dean Herbert
fb6dc922c6 Reorder file 2018-02-09 19:25:55 +09:00
Dean Herbert
c7de79caf6 Remove storage class variable 2018-02-09 19:24:17 +09:00
Dean Herbert
5e0cb9d4b9 Simplify beatmap store retrieval 2018-02-09 19:12:29 +09:00
Dean Herbert
541068235d Test import twice in a row 2018-02-09 18:23:06 +09:00
Dean Herbert
623ba652ed Share more code between tests 2018-02-09 18:20:18 +09:00
Dean Herbert
981fa379b7 Count() -> Count 2018-02-09 18:02:28 +09:00
Dean Herbert
a771ca4077 Add try-finally to ensure host is exited 2018-02-09 18:02:06 +09:00
Dean Herbert
8140ffea15 Add test for deleting then reimporting 2018-02-09 17:59:27 +09:00
Dean Herbert
a166932468 Add deletion test 2018-02-09 17:51:29 +09:00
Dean Herbert
3b7018fcd6 Simplify beatmap import process 2018-02-09 17:22:48 +09:00
Bang Sunghwan
3894622ddc Remove redundant initializing field by default 2018-02-09 09:55:02 +09:00
Bang Sunghwan
f20e3ff31d Fix ApproachRate setting only DEFAULT_DIFFICULTY 2018-02-09 09:45:43 +09:00
Bang Sunghwan
cc6114b344 Fix ApproachRate not inheriting OverallDifficulty when it is undefined 2018-02-09 09:31:19 +09:00
TocoToucan
77a8b36529 Schedule Resume method call without delay 2018-02-08 22:30:15 +03:00