Commit Graph

545 Commits

Author SHA1 Message Date
Dean Herbert 785433bb74
Merge branch 'master' into universal-playfield-adjust 2019-03-29 11:25:54 +09:00
Dean Herbert 7715606188
Merge branch 'master' into sprite-icon-compatibility 2019-03-29 11:15:34 +09:00
Dean Herbert 8642886ffa Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust 2019-03-29 00:39:51 +09:00
Dean Herbert de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Dean Herbert ed3746e166 Make PlayfieldAdjustmentContainer universal 2019-03-26 13:32:44 +09:00
Dean Herbert 39df8cce19 Fix incorrect usage of InternalChildren
Could cause overwriting of components added by base DrawableHitObjcet class (such as samples)
2019-03-25 13:48:55 +09:00
Dean Herbert 7b6d882ce6 Remove double-generic type 2019-03-20 11:29:16 +09:00
Dean Herbert 3b7a76aa4e Fix typo 2019-03-20 11:22:34 +09:00
Dean Herbert baea7230bc Rename RulesetContainer to DrawableRuleset 2019-03-19 23:47:31 +09:00
Dean Herbert 68f28326a2 Refactor RulesetContainer for readability 2019-03-19 20:21:31 +09:00
Dean Herbert 1617e2a729
Merge branch 'master' into mania-judgemetns 2019-03-13 18:17:42 +09:00
David Zhao 527b77b07d Make all inheritors of drawablejudgement use new method 2019-03-12 19:52:44 +09:00
Dean Herbert 48e54c84c1
Merge branch 'master' into mod-wind 2019-03-08 20:23:02 +09:00
Dean Herbert 1f44dde96b Fix autoplay tests not working 2019-03-07 18:34:56 +09:00
LeNitrous c271a3a781 remove ruleset specific mods 2019-03-04 17:36:44 +08:00
LeNitrous ecc2c28a62 mod rule changes 2019-03-03 16:22:00 +08:00
Dean Herbert 0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert 42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert 26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
smoogipoo d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
smoogipoo 7e41fbc29b Remove LegacyDifficultyCalculator 2019-02-21 13:12:37 +09:00
Dean Herbert 2c76a039ca
Remove unnecessary folder reference 2019-02-20 10:46:25 +09:00
smoogipoo 5ff890434c Add beatmap argument 2019-02-19 17:57:29 +09:00
smoogipoo c264a9cc74 Fix mods not being populated 2019-02-19 17:46:40 +09:00
smoogipoo 0ef15f5bd5 Update with PopulateAttributes() removal 2019-02-19 17:45:16 +09:00
smoogipoo 7ba0d090fc Fix post-merge errors 2019-02-19 16:40:52 +09:00
smoogipoo 7f4643a83d Adjust naming 2019-02-18 14:55:39 +09:00
smoogipoo 46b979a412 Fix colour changes not being reset 2019-02-18 14:55:20 +09:00
smoogipoo cb17cbcdc4 Fix taiko nullrefing 2019-02-18 14:54:35 +09:00
smoogipoo 25d85b6eb4 Implement new difficulty calculator for Rulesets.Taiko 2019-02-18 14:54:21 +09:00
smoogipoo a8faa942a6 Implement new difficulty calculator structure 2019-02-18 14:49:43 +09:00
smoogipoo aa0bb7ca11 Add taiko difficulty calculator tests 2019-02-15 14:44:26 +09:00
HoLLy ae9d5f999c Use correct DifficultyAttributes where possible 2019-02-06 21:28:42 +01:00
Dean Herbert 2d7c23dd9f Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics 2019-02-04 12:15:53 +09:00
LeNitrous 03e57d0423 fix codefactor warnings and derive ModWindUp and ModWindDown to ModTimeRamp 2019-01-26 20:15:19 +08:00
LeNitrous 0f8c5bcbd7 actually the last whitespace 2019-01-26 13:50:27 +08:00
LeNitrous 73dbf5712d add license headers 2019-01-26 13:43:27 +08:00
LeNitrous 1427c9f576 trim whitespaces 2019-01-26 13:11:08 +08:00
LeNitrous c6e26a92ec add wind up and wind down mods 2019-01-26 12:15:45 +08:00
Dean Herbert 014ea972d9 Merge remote-tracking branch 'origin/master' into samah-ios 2019-01-25 11:51:44 +09:00
Dean Herbert 8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Shane Woolcock a267a1a085 Merge branch 'master' into samah-ios 2019-01-08 17:09:26 +10:30
Dean Herbert 8edec10e5f
Merge branch 'master' into fix-replay-import-statistics 2019-01-08 11:26:12 +09:00
Roman Kapustin 4b5fc85875 Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
Dean Herbert aec3753863 Fix imported replays having excess statistics 2019-01-03 14:01:20 +09:00
Shane Woolcock 32ffcb9865 Merge branch 'master' into samah-ios
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-12-29 20:09:00 +10:30
Shane Woolcock a83bee9461 Add ruleset visual tests 2018-12-29 20:05:37 +10:30
smoogipoo b64932f6db Implement hit windows 2018-12-27 22:39:15 +09:00
Ivan Pavluk d8b409f81f Merge branch 'master' of https://github.com/pavlukivan/osu 2018-12-12 17:18:32 +07:00