Commit Graph

24294 Commits

Author SHA1 Message Date
976cff9af6 Merge remote-tracking branch 'upstream/master' into catch
# Conflicts:
#	osu.Desktop.Tests/Visual/TestCaseScrollingPlayfield.cs
2017-08-09 15:08:43 +09:00
2715324a76 Fix possible incorrect reversing behavior for horizontal playfields. 2017-08-09 14:50:52 +09:00
c70f96a9cd Add basic documentation and split out classes. 2017-08-09 14:50:10 +09:00
f70c00423a Missed one. 2017-08-09 14:25:49 +09:00
346aebebc0 Fix origins not being set correctly when reverting from reversed playfield. 2017-08-09 14:24:48 +09:00
a20753abc6 Applied suggested changes. 2017-08-09 14:24:47 +09:00
431a9649a4 Remove unused using. 2017-08-09 13:38:12 +09:00
723e27353c HitRenderer -> RulesetContainer 2017-08-09 13:28:29 +09:00
f21b370f4e Add variant for rulesets with more than one possible key layout 2017-08-09 13:23:23 +09:00
7c0e7ebcd0 Give HitRenderer a reference to Ruleset
Used to get correct bindings for a mode (ActionMappingInputManager).
2017-08-09 13:05:52 +09:00
1c5584f068 Make ScrollingPlayfield store a list of SpeedAdjustments instead of a Container.
Because they're removed from the container when they're not alive, and any further adding methods fail.
2017-08-09 12:45:50 +09:00
eee6404986 Store bindings to database 2017-08-09 12:37:47 +09:00
dfb47b571a Make HitRenderer's Playfield public so it can be used in testing. 2017-08-09 12:24:38 +09:00
b88f37de45 Add custom actions for Catch
Reworks input management for rulesets
2017-08-09 11:50:34 +09:00
7d7cfe5d92 Merge branch 'master' of git://github.com/ppy/osu into ranks-section 2017-08-08 23:13:25 +02:00
1c2329f111 generalize the hover code 2017-08-08 23:11:46 +02:00
3d4db427ff Pass RuleSet to ScoreStore, compute and store MD5 for legacy replays compatibility 2017-08-08 17:17:53 +02:00
cae21869d0 Use CompositeDrawable for HitObjectContainer. Removes a looooooot of generics 👍. 2017-08-08 17:37:11 +09:00
25202b522d Fix not setting Origin + Anchors properly when reversing. 2017-08-08 14:10:26 +09:00
e54abe8d0a Fix not removing queued hit objects. 2017-08-08 13:23:46 +09:00
a95aa90adc Allow DrawableHitObjects to be removed from a Playfield
(cherry picked from commit 3926238be9)
2017-08-08 13:02:51 +09:00
ee7bb1b4f5 Don't set RelativePositionAxes when setting ScrollingAxes
(cherry picked from commit debe13629f)
2017-08-08 13:02:23 +09:00
c5ce86b9f3 Add reversing capability to ScrollingPlayfield. 2017-08-08 12:59:50 +09:00
bd2ef4dc6b Line endings + license headers. 2017-08-07 18:03:44 +09:00
62ee613da3 Merge remote-tracking branch 'origin/master' into timingchange-improvements 2017-08-07 17:35:53 +09:00
f3c05fe232 CI fixes. 2017-08-07 17:34:57 +09:00
9c0a0b1e2c Rewrite/add comments. 2017-08-07 17:27:50 +09:00
933740664c SpeedAdjustedHitRenderer -> ScrollingHitRenderer for consistent naming. 2017-08-07 16:43:54 +09:00
fc252f8888 Remove exception (this is set in SpeedAdjustmentContainer). 2017-08-07 16:24:51 +09:00
a3efca9c35 Reduce implementation overhead in actually positioning hitobjects and making them scroll. 2017-08-07 16:02:38 +09:00
068dfcb19a Default CreateSpeedAdjustmentContainer implementation. 2017-08-07 15:22:31 +09:00
c6447e40f9 Reduce implementation overhead for nested playfields (e.g. playfield + columns). 2017-08-07 14:56:26 +09:00
2ce30474ca Merge branch 'master' into spriteicon-invalidation-fix 2017-08-07 14:49:09 +09:00
376f99c1e3 Make VisibleTimeRange transform work again. 2017-08-07 14:32:55 +09:00
d0906d8232 Adjust xmldocs to conform to TransformableExtensions. 2017-08-07 14:20:56 +09:00
2221797273 Add transform sequence support to IHasAccentColour. 2017-08-07 14:12:05 +09:00
e1dfe364b2 Fix lifetime performance regression. 2017-08-07 14:07:49 +09:00
ce7d391f06 These method calls are impure. 2017-08-07 13:37:07 +09:00
953cf5af58 Fix SpriteIcon invalidation causing game breakness. 2017-08-07 13:26:54 +09:00
eb190d83bd Adjust CS multiplier to match stable 2017-08-07 10:43:33 +09:00
8941c8658c Use nested containers for shadow 2017-08-07 09:50:04 +09:00
de3b65e1fa Fix StoredBookmarks not being serialized 2017-08-07 09:45:44 +09:00
6f93aa6131 Fix incomplete comment 2017-08-07 09:01:47 +09:00
e75f438c29 Add difficulty application mods
Also fixes circular references when using IJsonSerializable.
2017-08-07 08:54:54 +09:00
224de9cc1e Implement NoFail mod 2017-08-07 08:54:54 +09:00
3416925233 Fix alignment of icons on mod buttons 2017-08-07 08:54:53 +09:00
d7fede96ef Fix shadow on SpriteIcon being a bit off 2017-08-07 08:54:53 +09:00
8843d97895 Remove depth setting in SectionsContainer and profile. 2017-08-05 18:01:10 +08:00
b1d25ed388 Implement ScrollingPlayfield, now containing ScrollingHitObjectContainer (prev. SpeedAdjustmentCollection).
Also removing a lot of mania code relating to gravity mod for now.
2017-08-04 23:07:08 +09:00
54503eef71 Rename *ScrollingDrawableTimingSection -> *ScrollingContainer, move LinearScrollingContainer to osu.Game, make SpeedAdjustmentContainer non-abstract. 2017-08-04 22:50:29 +09:30