Commit Graph

10680 Commits

Author SHA1 Message Date
d434852fe6 Merge pull request #2073 from peppy/storyboard-improvements
Give storyboards a BeatmapInfo to reduce weird method calls
2018-02-19 17:59:29 +09:00
fae6ea1ee2 Merge branch 'master' into storyboard-improvements 2018-02-19 17:28:53 +09:00
6cad316d69 Merge pull request #2087 from peppy/fix-replay-import
Fix replay import
2018-02-19 17:28:26 +09:00
d70d40e3b8 Add back forgotten score store to valid importers 2018-02-19 15:52:14 +09:00
34f76a4136 Merge branch 'master' into storyboard-improvements 2018-02-19 15:40:09 +09:00
999d0f99a6 Merge pull request #2070 from peppy/abstract-model-managers
Abstract away model-filemodel and add mutable stores
2018-02-19 15:25:42 +09:00
5401b0dfcd Merge branch 'master' into abstract-model-managers 2018-02-19 14:56:21 +09:00
7c43a3b4c0 Merge branch 'master' into storyboard-improvements 2018-02-19 14:54:12 +09:00
57e61b0b0e Update xmldoc 2018-02-19 14:50:42 +09:00
8d61f60388 Merge pull request #2074 from peppy/visual-settings-improvements
Collapse visual settings by default in player
2018-02-19 14:31:08 +09:00
8b89735e9e Improve xmldoc for DatabaseContextFactory.Get 2018-02-19 14:17:41 +09:00
a7915e7041 Fix typo 2018-02-19 14:00:48 +09:00
e0faf14a3e Actually consume ReplacesBackground 2018-02-19 12:33:07 +09:00
29adedfa96 Collapse visual settings by default in player 2018-02-16 12:47:32 +09:00
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
ddf49c2e65 Fix intro not being replaced by a playable song when entering song select 2018-02-16 10:45:15 +09:00
9ea7f12f8d Merge branch 'master' into abstract-model-managers 2018-02-15 20:39:08 +09:00
e1f81488cd Merge pull request #2071 from peppy/fix-textboxes
Update framework (and fix left/right arrow control of textboxes)
2018-02-15 20:28:33 +09:00
96c23d2a62 Add override to fix left/right arrow control 2018-02-15 19:41:15 +09:00
e2421ffe31 Update framework 2018-02-15 19:41:03 +09:00
fa05822d7d Add missing licence headers 2018-02-15 16:33:33 +09:00
b9ef32b09b Further xmldoc and restoring of Cleanup method 2018-02-15 16:31:42 +09:00
1b13be1372 Cleanups and xmldoc additions 2018-02-15 16:24:14 +09:00
8c1d581fb3 Fix hiding beatmaps not refreshing correctly 2018-02-15 16:15:40 +09:00
89cf794f98 Add a lower level ConsumableItems implementation 2018-02-15 16:15:40 +09:00
671475f3b4 Ensure undeleted items are populated with includes before firing events 2018-02-15 16:15:40 +09:00
e51450a064 Fix query construction 2018-02-15 15:24:28 +09:00
d07ab1fbea Fix undelete all 2018-02-15 15:14:55 +09:00
fe5df663be Add more xmldoc 2018-02-15 15:14:46 +09:00
a0a65abcac Crentalise all import logic 2018-02-15 14:22:39 +09:00
d3dd31dadb Make deletion and purging logic even more global 2018-02-15 14:22:39 +09:00
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
6ff63c2f0c Move deletion to ArchiveModelImportManager 2018-02-15 14:22:39 +09:00
d8f84fcca3 Give ArchiveReader a filename 2018-02-15 14:22:39 +09:00
e0d28564d0 Move import logic to shared implementation 2018-02-15 14:22:39 +09:00
af61a524b5 Merge pull request #2034 from smoogipoo/restore-ruleset-tests
Restore nunit ruleset + waveform test cases
2018-02-15 00:12:39 +09:00
c5b71d2cb7 Remove unused using 2018-02-14 23:15:34 +09:00
9f7736fab3 Merge branch 'master' into restore-ruleset-tests 2018-02-14 22:48:29 +09:00
22192c4569 Merge pull request #2066 from ppy/osu/update-framework
Update framework with GameThread fixes
2018-02-14 17:55:14 +09:00
20de3c421a Update framework 2018-02-14 17:43:45 +09:00
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
bf6c93e77e Update framework 2018-02-13 21:50:46 +09:00
bfb21d3d69 Merge remote-tracking branch 'origin/master' into drag-lenience 2018-02-13 21:39:28 +09:00
32d45ccdb4 Merge pull request #2044 from UselessToucan/PlayerResumeHotfix
Fix pressing escape quickly unexpectedly exiting gameplay
2018-02-13 20:51:19 +09:00
30581d03d2 Merge branch 'master' into PlayerResumeHotfix 2018-02-13 20:34:22 +09:00
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
86acc84988 Apply formatting 2018-02-13 20:23:51 +09:00
5ecb77fda7 Merge remote-tracking branch 'upstream/master' into default-approachrate 2018-02-13 20:23:01 +09:00
6f29cd35af Merge branch 'master' into PlayerResumeHotfix 2018-02-13 20:21:45 +09:00
f4ddc0717b Fix incorrect PlaylistItem drag handling 2018-02-13 20:08:59 +09:00