Commit Graph

11064 Commits

Author SHA1 Message Date
9e37a122e1 Merge branch 'master' into fix-sensitivityslider 2017-12-07 21:01:53 +09:00
805c61d032 Merge pull request #1603 from santerinogelainen/header-button-should-derive
Fix beatmap overlay buttons not conforming to design
2017-12-07 20:56:15 +09:00
d52b84df46 Move KeyboardStep assignment to ctor 2017-12-07 20:53:28 +09:00
46cd6fdb45 Merge remote-tracking branch 'origin/master' into fix-sensitivityslider 2017-12-07 20:49:48 +09:00
24b3b10942 Move drawable assignment to load, remove depth overrides 2017-12-07 20:44:55 +09:00
8c89354b36 Remove extra whitespace 2017-12-07 20:44:38 +09:00
d36982b1d9 Merge branch 'master' into header-button-should-derive 2017-12-07 20:04:41 +09:00
f2eef6621a Merge branch 'master' into fix-missing-metadata 2017-12-07 19:23:51 +09:00
f4f1291919 Removed "wiki:" prefix from wiki links (links are visible on tooltips so this is unnecessary now) 2017-12-07 11:23:31 +01:00
8a88040ef5 Added tooltip to links 2017-12-07 11:12:21 +01:00
bd11124e6d Removed unnecessary copy (pass-by-reference anyways) 2017-12-07 11:12:12 +01:00
f3f3d1d0fc Various test fixes 2017-12-07 11:11:43 +01:00
fe2cc4daad Merge pull request #1663 from peppy/input-revamp
Apply changes in line with framework input adjustments
2017-12-07 18:47:40 +09:00
13d0524542 Update framework 2017-12-07 18:37:54 +09:00
1b971c01e6 Fixed a bug where links would be out of order in their List which would cause the game to crash 2017-12-07 10:31:44 +01:00
ec8b5c2465 Permitted nulls in ChatOverlay.load() so that in testing, no "OsuGame" instance is required. Also added null checks to the links' on click actions 2017-12-07 10:31:02 +01:00
006ac44e11 Fixed up style in the ChatDisplay test 2017-12-07 10:29:54 +01:00
65afbd5c1b Added new test case for URL parsing / link display in chat 2017-12-07 10:29:33 +01:00
541c25e995 Renamed ChatLinkSpriteText to ChatLink for convenience 2017-12-07 10:28:12 +01:00
7bf25bdd4d Changed it so the ":" character does not appear after usernames when the displayed message is an action (e.g. /np). Just makes more sense imo 2017-12-07 10:23:57 +01:00
c35c8263b9 Merge remote-tracking branch 'upstream/master' into input-revamp 2017-12-07 18:07:26 +09:00
2a0b37e192 Merge pull request #1638 from Aergwyn/fix-beatmap-carousel-lag
Fix lagging beatmap carousel because of storyboard-loading
2017-12-07 18:04:38 +09:00
2a1a9b9f1f Fix post-merge issue 2017-12-07 17:26:39 +09:00
bdf283a4e1 A bit more cleanup 2017-12-07 15:55:38 +09:00
09f54b06ac Just don't serialize Author altogether for now 2017-12-07 15:55:22 +09:00
0ba8988580 Don't serialize Author + add SerializableAttributes 2017-12-07 15:32:39 +09:00
44ee11e75f Merge branch 'master' into fix-beatmap-carousel-lag 2017-12-07 15:30:50 +09:00
e573db04d4 Don't serialize HitObject.Kiai 2017-12-07 14:42:36 +09:00
f5f7658e90 Don't serialize TotalBreakTime 2017-12-07 14:40:28 +09:00
245b5f759f Underscore + lowercase all keys 2017-12-07 14:37:12 +09:00
a78441bc5a Apply changes in line with framework input adjustments 2017-12-07 13:16:59 +09:00
dfc10d42e8 Merge remote-tracking branch 'origin/master' into beatmap-serialization 2017-12-07 12:49:27 +09:00
d026587a91 Add flag to explicitly serialize the type version 2017-12-07 12:49:16 +09:00
9e51480aa3 Cleanup TypedListConverter a bit 2017-12-07 12:27:30 +09:00
f1dbcc4f1a Remove misleading comments 2017-12-07 12:23:53 +09:00
feef4b1890 Add license header 2017-12-07 12:18:00 +09:00
fcfdbc8e07 Don't show the migrate button on deployed builds for now 2017-12-07 12:02:48 +09:00
b0684cb194 Add storyboard test case but disable for now 2017-12-07 12:02:34 +09:00
851c20aff0 Add a few comments 2017-12-07 11:17:32 +09:00
499ecb4edd Add parity checking OsuJsonDecoder test cases 2017-12-07 11:11:38 +09:00
ea2c67ca5f Fix incorrect serialization condition 2017-12-07 11:10:46 +09:00
9597f9d46b Resharper cleanup 2017-12-07 11:10:20 +09:00
0e3b001b13 Make maps with storyboards decode correctly with OsuJsonDecoder 2017-12-07 10:37:51 +09:00
de6d1cc647 Merge pull request #1660 from peppy/shader-precompile
Add shader precompile step
2017-12-07 04:25:15 +09:00
9c4ca46786 Merge branch 'master' into shader-precompile 2017-12-07 04:15:24 +09:00
a8db3a9484 Add progress notification to migration 2017-12-07 04:09:03 +09:00
41b607c165 Dont serialize hitobject sample properties copied from the control point 2017-12-07 03:40:43 +09:00
9787788081 Revert unintended change 2017-12-07 03:39:43 +09:00
4232a54b32 Make TypedListConverter not reconstruct serializers 2017-12-07 03:04:56 +09:00
b6b26cfe25 Add basic method to migrate beatmaps to the new JSON format 2017-12-07 03:04:36 +09:00