Commit Graph

564 Commits

Author SHA1 Message Date
772bef91fa Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
#	osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
2019-04-08 23:01:12 +09:00
f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
a56e29347f Adjust namespaces 2019-04-02 14:51:28 +09:00
42eaabe24c Fix editor blueprints being misplaced
Regressed with PlayfieldAdjustmentContainer changes.
2019-03-31 01:29:37 +09:00
3e8952b087 Merge pull request #4521 from peppy/hitobject-drawable-representation
Fix DrawableRuleset drawable creation method's name
2019-03-29 14:08:23 +09:00
c72705217a Merge branch 'master' into framed-replay-handler-fixes 2019-03-29 12:59:51 +09:00
14cef94a53 Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation 2019-03-29 12:59:26 +09:00
e5b49b1657 Merge branch 'master' into ctb-pp 2019-03-29 12:24:47 +09:00
785433bb74 Merge branch 'master' into universal-playfield-adjust 2019-03-29 11:25:54 +09:00
7715606188 Merge branch 'master' into sprite-icon-compatibility 2019-03-29 11:15:34 +09:00
8642886ffa Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust 2019-03-29 00:39:51 +09:00
d770dac3bc Fix interpolation nullrefs 2019-03-29 00:35:26 +09:00
70f99400ad Fix many behavioural issues and add tests 2019-03-28 19:28:13 +09:00
09a7950a3b Fix handlers for other rulesets 2019-03-28 15:09:06 +09:00
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
5c8e8a1697 Fix license header 2019-03-27 16:56:15 +09:00
8fcb75809d Add LegacyScoreInfo for statistics preservation/conversion 2019-03-27 16:55:46 +09:00
1a6c2022ea Fix up/adjust counts 2019-03-27 14:53:29 +09:00
2dc5447928 Merge remote-tracking branch 'origin/master' into ctb-pp 2019-03-27 14:01:02 +09:00
ed3746e166 Make PlayfieldAdjustmentContainer universal 2019-03-26 13:32:44 +09:00
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
9bf48863b0 Fix DrawableRuleset drawable creation method's name 2019-03-25 00:00:29 +09:00
6f1610be79 Merge branch 'master' into ruleset-container-refactor 2019-03-20 14:55:58 +09:00
8f0440d14c Ensure RNG max value cannot go below min value 2019-03-20 12:06:37 +09:00
003e36862f Fix JuiceStreams not affecting lastPosition/lastStartTime 2019-03-20 12:06:14 +09:00
7b6d882ce6 Remove double-generic type 2019-03-20 11:29:16 +09:00
3b7a76aa4e Fix typo 2019-03-20 11:22:34 +09:00
baea7230bc Rename RulesetContainer to DrawableRuleset 2019-03-19 23:47:31 +09:00
68f28326a2 Refactor RulesetContainer for readability 2019-03-19 20:21:31 +09:00
6f372e7c07 Merge pull request #4489 from smoogipoo/fix-diffcalc-catcher-size
Fix difficulty calculation using the pre-mod catcher size

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-03-19 16:49:38 +09:00
0fbc049f8d Remove newline 2019-03-19 16:25:34 +09:00
dd60e3f1c4 Fix halfCatchWidth not being reset between runs 2019-03-19 15:59:04 +09:00
57727ac184 Remove preprocess until a later point in time 2019-03-19 15:53:27 +09:00
5d9477e1e4 Fix difficulty calculation using the pre-mod catcher size 2019-03-19 15:35:14 +09:00
5b07cce3cb Invert unintuitive variable 2019-03-19 14:12:10 +09:00
1b696ade50 Refactor to reduce code complexity 2019-03-19 14:10:39 +09:00
a26e237e26 Fix relative position being compared to time 2019-03-18 18:59:38 +09:00
bb8171b88a Fix HR mod being applied to non-fruit objects 2019-03-18 18:36:16 +09:00
c496f6e56b Fix usages of OnLoadComplete 2019-03-17 13:44:20 +09:00
d13423fcdb Fix catch difficulty calculator not providing adjustment mods 2019-03-14 23:06:23 +09:00
489153579a Add xmldoc and clarify struct variables 2019-03-11 14:36:29 +09:00
c6194d5487 Merge branch 'master' into extract-slider-tick-creation 2019-03-08 20:40:03 +09:00
48e54c84c1 Merge branch 'master' into mod-wind 2019-03-08 20:23:02 +09:00
165a353a83 Add extensive commenting about LegacyLastTick usage 2019-03-08 20:12:48 +09:00
355705f0a5 Fix legacy tick handling 2019-03-08 19:57:30 +09:00
1f44dde96b Fix autoplay tests not working 2019-03-07 18:34:56 +09:00
d70b373af9 Merge branch 'master' into mod-wind 2019-03-06 14:04:04 +09:00
c271a3a781 remove ruleset specific mods 2019-03-04 17:36:44 +08:00
679d30d08a Fix comment mentioning 4 frames instead of 1/4 2019-03-03 11:21:39 +00:00
ecc2c28a62 mod rule changes 2019-03-03 16:22:00 +08:00