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

9652 Commits

Author SHA1 Message Date
smoogipoo
d026587a91 Add flag to explicitly serialize the type version 2017-12-07 12:49:16 +09:00
smoogipoo
9e51480aa3 Cleanup TypedListConverter a bit 2017-12-07 12:27:30 +09:00
smoogipoo
f1dbcc4f1a Remove misleading comments 2017-12-07 12:23:53 +09:00
smoogipoo
feef4b1890 Add license header 2017-12-07 12:18:00 +09:00
smoogipoo
fcfdbc8e07 Don't show the migrate button on deployed builds for now 2017-12-07 12:02:48 +09:00
smoogipoo
b0684cb194 Add storyboard test case but disable for now 2017-12-07 12:02:34 +09:00
smoogipoo
851c20aff0 Add a few comments 2017-12-07 11:17:32 +09:00
smoogipoo
499ecb4edd Add parity checking OsuJsonDecoder test cases 2017-12-07 11:11:38 +09:00
smoogipoo
ea2c67ca5f Fix incorrect serialization condition 2017-12-07 11:10:46 +09:00
smoogipoo
9597f9d46b Resharper cleanup 2017-12-07 11:10:20 +09:00
smoogipoo
0e3b001b13 Make maps with storyboards decode correctly with OsuJsonDecoder 2017-12-07 10:37:51 +09:00
Dan Balasescu
de6d1cc647
Merge pull request #1660 from peppy/shader-precompile
Add shader precompile step
2017-12-07 04:25:15 +09:00
Dan Balasescu
9c4ca46786
Merge branch 'master' into shader-precompile 2017-12-07 04:15:24 +09:00
smoogipoo
a8db3a9484 Add progress notification to migration 2017-12-07 04:09:03 +09:00
smoogipoo
41b607c165 Dont serialize hitobject sample properties copied from the control point 2017-12-07 03:40:43 +09:00
smoogipoo
9787788081 Revert unintended change 2017-12-07 03:39:43 +09:00
smoogipoo
4232a54b32 Make TypedListConverter not reconstruct serializers 2017-12-07 03:04:56 +09:00
smoogipoo
b6b26cfe25 Add basic method to migrate beatmaps to the new JSON format 2017-12-07 03:04:36 +09:00
Dan Balasescu
eaffd496f2
Merge pull request #1661 from peppy/fix-async-is-loaded
Fix IsValueCreated method not checking whether the async task was completed
2017-12-07 01:28:28 +09:00
Dan Balasescu
8e3cce798d
Merge branch 'master' into fix-async-is-loaded 2017-12-06 23:01:38 +09:00
Dean Herbert
34596b3368 Rename and comment for clarification 2017-12-06 21:47:48 +09:00
smoogipoo
ed5f7e5353 Make OsuJsonDecoder apply defaults similar to OsuLegacyDecoder 2017-12-06 16:28:34 +09:00
smoogipoo
f9e34dfa3d Assume that control points are already sequentially-ordered
Fixes up deserializing.
2017-12-06 16:24:09 +09:00
Dean Herbert
04ae64e9fd Add missing IsCompleted check to ensureValid 2017-12-06 16:20:49 +09:00
smoogipoo
887b81148d Don't ignore RulesetId for now 2017-12-06 14:14:07 +09:00
smoogipoo
44edb8724f Add JsonIgnores to CommandTimelineGroup 2017-12-06 13:48:44 +09:00
Dean Herbert
988cc27f0e Update framework 2017-12-06 11:59:53 +09:00
Dean Herbert
15ed3b4aac Fix IsValueCreated method not cecking whether the async task was completed
Caused potential stutters for components that relied on this check.
2017-12-06 09:49:12 +09:00
smoogipoo
e199ee5225 Add a few xmldocs 2017-12-06 00:42:17 +09:00
smoogipoo
d2dc7c8937 Add OsuJsonDecoder 2017-12-06 00:38:12 +09:00
smoogipoo
b584178e85 Make Beatmap ISerializable and add more JsonIgnores 2017-12-06 00:37:37 +09:00
Dean Herbert
fb6408257a Add shader precompile step
Resolves  https://github.com/ppy/osu-framework/issues/1180 in a way.
2017-12-05 17:41:47 +09:00
Dan Balasescu
abf5f3b390
Merge pull request #1658 from peppy/add-wait-for-restart
Wait until track has restarted before continuing operation
2017-12-05 14:24:25 +09:00
Dean Herbert
c1b607fed9 Wait until track has restarted before continuing operation
I removed this from my previous PR thinking it was not required, but it turned out to be required after all. Just isn't so noticeable when it fails.
2017-12-05 14:06:40 +09:00
Dean Herbert
634700fae5
Merge pull request #1649 from Aergwyn/fix-playlist-audio-issue
Fix MusicController constantly trying to start a track
2017-12-05 01:11:13 +09:00
Dean Herbert
b4641142a8 Update framework once more 2017-12-05 01:00:06 +09:00
Dean Herbert
caee6c1cf1 Use Restart instead of Start 2017-12-04 21:40:26 +09:00
Dean Herbert
7649a31157 Update framework 2017-12-04 20:32:50 +09:00
Dean Herbert
a83add8540 Tidy up events 2017-12-04 20:30:56 +09:00
Aergwyn
12665fb8cf remove unnecessary declaration + revert accidental formatting 2017-12-04 12:11:28 +01:00
Aergwyn
011223048b fix crash if any amount of maps were restored from main menu
also fixes preview not playing if an entire set is restored
2017-12-04 11:47:27 +01:00
Dean Herbert
22656233d3
Merge branch 'master' into fix-playlist-audio-issue 2017-12-04 19:24:03 +09:00
Dean Herbert
58777a9674
Merge pull request #1636 from smoogipoo/editor-composer
Implement structure for Editor HitObject composition
2017-12-04 13:05:27 +09:00
Dean Herbert
d75db5046b
Merge branch 'master' into editor-composer 2017-12-04 12:41:40 +09:00
Dean Herbert
23c0bec678
Merge pull request #1653 from smoogipoo/osuscreen-exit
Add OnKeyDown override to OsuScreen
2017-12-04 11:51:36 +09:00
smoogipoo
7cfe694a3f Update framework 2017-12-04 11:37:19 +09:00
smoogipoo
5f9de399e4 Add keydown override 2017-12-04 11:30:25 +09:00
Aergwyn
14096c90cc removed looping if only one song is in the list (temporarily)
It had one problem in relation to SongSelect disabling it when left and in general that topic belongs to another PR.
2017-12-03 16:41:21 +01:00
Aergwyn
9d13bf3602 remove redundant expression 2017-12-03 14:35:23 +01:00
Aergwyn
dfa7448716 use ?: expression 2017-12-03 14:25:12 +01:00