1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 05:27:40 +08:00
Commit Graph

6309 Commits

Author SHA1 Message Date
Dean Herbert
c86f23baea Merge pull request #1077 from MrTheMake/osulegacydecoder-parser
Fix OsuLegacyDecoder's parser being NULL if no ruleset was specified
2017-08-03 16:36:01 +09:00
Dean Herbert
248486f8f9 Merge branch 'master' into osulegacydecoder-parser 2017-08-03 16:30:37 +09:00
Dan Balasescu
ecf102f568 Merge pull request #1079 from peppy/ruleset-icons-revamp
Allow Rulesets to create a non-FontAwesome icon
2017-08-03 16:28:51 +09:30
Dean Herbert
a5a5c1a315 Remove debug code 2017-08-03 15:50:59 +09:00
Dean Herbert
91f3d8deb4 Improve class xmldoc 2017-08-03 15:48:06 +09:00
Dean Herbert
bb032508bd Add comment explaining why we use scale 2017-08-03 15:47:26 +09:00
Dean Herbert
c7f5b83e9e Derive from CompositeDrawable instead
We need to expose EdgeEffect as it's used in places.
2017-08-03 15:45:59 +09:00
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
MrTheMake
be3c7ec5f8 Added missing space 2017-08-02 16:17:33 +02:00
MrTheMake
79724e8018 Fix OsuLegacyDecoder's parser being NULL if no ruleset was specified 2017-08-02 16:05:09 +02:00
Dan Balasescu
d72a479d9d Merge pull request #1075 from peppy/import-from-stable-part-two
Tidy up osu-stable import process
2017-08-02 17:18:39 +09:30
Dean Herbert
2c1767e496 Update framework 2017-08-02 16:37:20 +09:00
Dan Balasescu
1f205d87f8 Merge branch 'master' into import-from-stable-part-two 2017-08-02 17:05:46 +09:30
Dean Herbert
7cb87c7145 Run each import in a single transaction
Improves performance substantially.
2017-08-02 14:18:35 +09:00
Dean Herbert
211731d017 Merge pull request #955 from MrTheMake/musiccontroller-canbeatmapchange
Disable track changing buttons in the music controller depending on the current screen
2017-08-02 12:51:22 +09:00
Dean Herbert
256daeaf68 Rename variable 2017-08-02 11:56:29 +09:00
MrTheMake
4d8e5898fd Updates according to the framework and formatting 2017-08-01 17:28:18 +02:00
Dean Herbert
6eb960010f Speed up startup cleanup operations. 2017-08-01 17:58:21 +09:00
Dean Herbert
3b1166d1e6 Optimise file lookups and other database operations
FirstOrDefault when called on a TableQuery with a predicate doesn't use table indices
2017-08-01 17:37:21 +09:00
Dean Herbert
e7e822ecd5 Fix StableStorage having "Songs" in the path twice 2017-08-01 16:37:43 +09:00
Dean Herbert
941f3f0934 Tidy up osu-stable import process
Now can locate any osu-stable installation using registry lookup (with ample fallbacks). Also uses a much more controlled access method via StableStorage.
2017-08-01 15:12:38 +09:00
Dean Herbert
209d024caa Merge branch 'master' into musiccontroller-canbeatmapchange 2017-08-01 11:54:05 +09:00
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
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