Commit Graph

1263 Commits

Author SHA1 Message Date
1e369628a5 Fix incorrect type specification 2019-03-29 11:38:45 +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
772f0cac8a Merge branch 'master' into gameplay-cursor-last-state 2019-03-29 11:01:13 +09:00
8642886ffa Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust 2019-03-29 00:39:51 +09:00
176b4ecc38 Merge branch 'master' into sprite-icon-compatibility 2019-03-28 23:47:44 +09:00
8f5e769425 Fix slider ball not always receiving position in time 2019-03-28 12:42:28 +09:00
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
7cfc2f7dcb Add back adjustment container 2019-03-26 17:11:14 +09:00
2951d3e0e4 Apply CI fixes 2019-03-26 13:50:30 +09:00
fbc97edc55 Add base cursor class to retrieve true visibility state 2019-03-26 13:41:30 +09:00
ed3746e166 Make PlayfieldAdjustmentContainer universal 2019-03-26 13:32:44 +09:00
7254b765b0 Fix gameplay cursor showing in editor 2019-03-20 19:26:24 +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
5cc670cd19 Prevent ApplyTransformsAt from propogating to SliderBall children 2019-03-14 19:17:28 +09:00
1617e2a729 Merge branch 'master' into mania-judgemetns 2019-03-13 18:17:42 +09:00
527b77b07d Make all inheritors of drawablejudgement use new method 2019-03-12 19:52:44 +09:00
63fea65c0c Clarify repeat index 2019-03-11 14:53:21 +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
28a1baa07e Merge branch 'extract-slider-tick-creation' of https://github.com/peppy/osu into extract-slider-tick-creation 2019-03-08 20:13:58 +09:00
93a999396e LegacyFinalTick -> LegacyLastTick to match existing variable 2019-03-08 20:13:11 +09:00
165a353a83 Add extensive commenting about LegacyLastTick usage 2019-03-08 20:12:48 +09:00
f59b9e933e Merge branch 'master' into extract-slider-tick-creation 2019-03-08 20:00:12 +09:00
355705f0a5 Fix legacy tick handling 2019-03-08 19:57:30 +09:00
973f29b765 Apply review 2019-03-08 15:14:57 +09:00
2c98ba1c0c Split out consumption and creation into two separate code paths 2019-03-08 14:59:45 +09:00
3ccc76e18f Merge remote-tracking branch 'upstream/master' into cursor-in-playfield 2019-03-08 14:50:46 +09:00
551380dd42 Extract slider tick creation so it can be shared with osu!catch 2019-03-08 14:46:26 +09:00
d1c18c52ab Merge branch 'master' into fix-cursor-in-scale-container 2019-03-08 12:43:57 +09:00
101009c92e Merge branch 'master' into fix-autoplay-tests 2019-03-08 12:14:40 +09:00
340997f505 Rename remaining usage of PathWidth naming convention 2019-03-07 20:21:59 +09:00
5ab9f45a8f Merge branch 'drawnode-changes' 2019-03-07 20:10:42 +09:00
1f44dde96b Fix autoplay tests not working 2019-03-07 18:34:56 +09:00
04d756524d Adjust with shader changes 2019-03-07 18:30:18 +09:00
e430b8a640 Merge remote-tracking branch 'nekodex/master' into drawnode-changes 2019-03-07 18:15:12 +09:00
b3e046c4d1 Rename PathWidth to PathRadius 2019-03-07 17:39:19 +09:00
62716851a1 Revert some unnecessary changes 2019-03-06 17:41:54 +09:00
7aa30ca3f6 Change method of cursor creation 2019-03-06 17:41:54 +09:00
18826b3a59 Adjust cursor scale for its new surroundings 2019-03-06 17:41:54 +09:00
acf518c208 Move cursor inside playfield 2019-03-06 17:41:54 +09:00
5411c63093 Fix menu cursor not displaying outside of gameplay scaling area 2019-03-06 17:14:08 +09:00
d70b373af9 Merge branch 'master' into mod-wind 2019-03-06 14:04:04 +09:00
fc0b297232 Fix menu cursor not displaying outside of gameplay scaling area 2019-03-05 18:06:24 +09:00
0322bd8812 Make config nullable, removing testcase code 2019-03-05 14:40:27 +09:00
78596dfe80 Merge remote-tracking branch 'origin/master' into move-osu-settings
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
#	osu.Game.Rulesets.Osu.Tests/TestCaseSlider.cs
2019-03-05 13:25:03 +09:00