RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,844 Commits 3 Branches 650 Tags 350 MiB
Commit Graph

8844 Commits

Author SHA1 Message Date
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
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
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
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 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
Dean Herbert 7957e55710
Merge branch 'master' into editor-composer 2017-12-03 14:47:07 +09:00
Dean Herbert 5a6f59bed0
Merge pull request #1640 from peppy/catch-hyperdash 
osu!catch hyperdash
 2017-12-03 14:38:22 +09:00
smoogipoo 2852337b04 Remove unused using 2017-12-02 20:35:47 +09:00
smoogipoo cd20d6df16 Apply suggested changes 2017-12-02 20:31:15 +09:00
smoogipoo c14d68e685 Use OsuColour for radio buttons 2017-12-02 20:30:18 +09:00
smoogipoo a80059032c Remove PlayfieldOverlay 2017-12-02 20:24:10 +09:00
Dan Balasescu 66f3cc747d
Merge branch 'master' into catch-hyperdash 2017-12-02 20:18:21 +09:00
smoogipoo 5a7c4772bd Remove PlayfieldUnderlay for now 2017-12-02 19:53:20 +09:00
Dean Herbert 6faa0f62b3
Merge pull request #1643 from gtensha/master 
Fix filename casing to compile on Linux
 2017-12-02 02:21:49 +09:00
gtensha de94082b1e Fix filename casing to compile on Linux 2017-12-01 18:10:39 +01:00
Dean Herbert f547b3bde5
Merge pull request #1630 from Aergwyn/fix-set-hidden-crash 
Fix crash when all beatmaps in a set are hidden
 2017-12-01 23:48:30 +09:00
Dean Herbert 70b29b8b62
Merge branch 'master' into fix-set-hidden-crash 2017-12-01 23:35:48 +09:00
Dean Herbert 33572a7326
Merge pull request #1633 from peppy/fix-track-disposal 
Fix DisposeTrack not working as expected
 2017-12-01 23:35:28 +09:00
Dean Herbert ee75f90ab3 Update framework 2017-12-01 23:17:54 +09:00
Dean Herbert 7532795935 Lock during validity checks 2017-12-01 22:43:49 +09:00
Dean Herbert 87b6181a19 Merge remote-tracking branch 'upstream/master' into fix-track-disposal 2017-12-01 22:36:20 +09:00
Dean Herbert 8c3ae9430b Add difficulty scaling considerations to hyperdash initialisation 2017-12-01 20:39:58 +09:00
Dean Herbert 997cdfaee4 Add missing licence header 2017-12-01 20:31:54 +09:00
Dean Herbert 912d5edcf6
Merge branch 'master' into catch-hyperdash 2017-12-01 20:16:37 +09:00
Dean Herbert 79e1bf3394 Remove unused testcase 2017-12-01 20:14:42 +09:00
Dean Herbert e75d73ac1c Change hyperdash colour again 2017-12-01 20:13:46 +09:00
Dean Herbert bf606522c1 Make hyperdash testcase easier to win again 2017-12-01 20:13:32 +09:00
Dean Herbert 273793f185 Add comments 2017-12-01 20:08:49 +09:00
Dean Herbert 25207c51b5 Add directionality 2017-12-01 20:07:28 +09:00
Dean Herbert 445bb70ef5 Add hyperdash visual testing to TestCaseCatcherArea 
Also tidies up hyperdash state logic
 2017-12-01 19:58:00 +09:00
Dean Herbert 07081f400c Make hyperdash testcase easier to win 2017-12-01 19:33:20 +09:00
Dean Herbert 51cae24a26 Add basic hyperdash movement 
Doesn't restrict direction yet. Also improves readability of fruit catch detection.
 2017-12-01 19:33:13 +09:00
Dean Herbert 442b234a86
Merge pull request #1631 from smoogipoo/csharp-7 
Migrate to C# 7
 2017-12-01 18:47:37 +09:00
smoogipoo 5be00cb0ec Add todo 2017-12-01 18:40:55 +09:00
smoogipoo 0b95e36675 Fix RelativeChildSize error temporarily 2017-12-01 18:00:20 +09:00
Dean Herbert 881745d756 Initial implementation of hyperdash calculation 2017-12-01 17:59:36 +09:00
Dean Herbert 19051dd529 Update framework 2017-12-01 16:44:49 +09:00
smoogipoo a73dfd692b Merge LangVer.props and osu.Game.props 2017-12-01 13:53:32 +09:00
smoogipoo edb9b19079 Make JoinNullCheckWithAssignment a hint 2017-12-01 13:53:18 +09:00