1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 22:52:55 +08:00
Commit Graph

6434 Commits

Author SHA1 Message Date
smoogipooo
346aebebc0 Fix origins not being set correctly when reverting from reversed playfield. 2017-08-09 14:24:48 +09:00
smoogipooo
a20753abc6 Applied suggested changes. 2017-08-09 14:24:47 +09:00
Dean Herbert
59c9eb7d8d Merge remote-tracking branch 'upstream/master' into timingchange-improvements 2017-08-09 14:02:32 +09:00
Dan Balasescu
50b7fdce1c Merge pull request #1088 from peppy/catch-catcher
osu!catch: Catcher and basic structure
2017-08-09 14:00:33 +09:00
smoogipooo
431a9649a4 Remove unused using. 2017-08-09 13:38:12 +09:00
smoogipooo
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
smoogipooo
dfb47b571a Make HitRenderer's Playfield public so it can be used in testing. 2017-08-09 12:24:38 +09:00
Dan Balasescu
7345ad40db Merge branch 'master' into timingchange-improvements 2017-08-09 10:53:25 +09:00
Dean Herbert
d9f5035d44 Merge branch 'master' into catch-catcher 2017-08-09 09:03:07 +09:00
Dean Herbert
66ef6eb026 Merge pull request #1092 from jorolf/fix-test-argument
fix "--tests" argument for visual tests
2017-08-09 09:02:49 +09:00
Dean Herbert
1c7fe02d1b Update framework 2017-08-09 08:56:45 +09:00
Dean Herbert
482626adc2 Don't crash on spinners 2017-08-09 08:54:19 +09:00
Dean Herbert
881bf48c6e Merge branch 'master' into fix-test-argument 2017-08-09 08:52:56 +09:00
Jorolf
56caa6ef10 fix tests argument 2017-08-09 01:49:50 +02:00
Dean Herbert
ae4460e680 Merge pull request #1091 from ppy/smoogipooo-patch-1
Remove incorrect duplicate code in mania pattern generation.
2017-08-09 07:52:35 +09:00
Dan Balasescu
21d44b1e99 Remove correct duplicate code.
Already present on line 51.
2017-08-09 06:24:08 +09:00
Dan Balasescu
98c652c0f9 Merge pull request #1089 from johnneijzen/Small-Mistakes-Fix
Update HitObjectPatternGenerator.cs
2017-08-09 06:13:16 +09:00
John Neijzen
9e17549d7f Update HitObjectPatternGenerator.cs 2017-08-08 22:56:27 +08:00
smoogipooo
cae21869d0 Use CompositeDrawable for HitObjectContainer. Removes a looooooot of generics 👍. 2017-08-08 17:37:11 +09:00
smoogipooo
9e01b47a09 Convert to local object. 2017-08-08 14:15:08 +09:00
smoogipooo
25202b522d Fix not setting Origin + Anchors properly when reversing. 2017-08-08 14:10:26 +09:00
smoogipooo
80c95d5b26 Update framework. 2017-08-08 13:24:15 +09:00
smoogipooo
e54abe8d0a Fix not removing queued hit objects. 2017-08-08 13:23:46 +09:00
Dean Herbert
a95aa90adc Allow DrawableHitObjects to be removed from a Playfield
(cherry picked from commit 3926238be9)
2017-08-08 13:02:51 +09:00
Dean Herbert
ee7bb1b4f5 Don't set RelativePositionAxes when setting ScrollingAxes
(cherry picked from commit debe13629f)
2017-08-08 13:02:23 +09:00
smoogipooo
c5ce86b9f3 Add reversing capability to ScrollingPlayfield. 2017-08-08 12:59:50 +09:00
Dean Herbert
70585a279d Comment out unused variables for now 2017-08-08 07:48:03 +09:00
Dean Herbert
4d1dd70cfb Licence headers 2017-08-08 07:32:23 +09:00
Dean Herbert
825e854aff Merge branch 'master' into catch-catcher 2017-08-08 07:28:55 +09:00
Dean Herbert
fe625f711a Update framework 2017-08-08 07:22:03 +09:00
Dean Herbert
fc30c471ed Update resources 2017-08-08 07:18:31 +09:00
smoogipooo
bcd1b61529 Use OsuTestCase. 2017-08-07 18:11:45 +09:00
smoogipooo
bd2ef4dc6b Line endings + license headers. 2017-08-07 18:03:44 +09:00
smoogipooo
12f9793fec Fix mania bar lines not working. 2017-08-07 17:46:22 +09:00
smoogipooo
62ee613da3 Merge remote-tracking branch 'origin/master' into timingchange-improvements 2017-08-07 17:35:53 +09:00
smoogipooo
f3c05fe232 CI fixes. 2017-08-07 17:34:57 +09:00
smoogipooo
9c0a0b1e2c Rewrite/add comments. 2017-08-07 17:27:50 +09:00
smoogipooo
933740664c SpeedAdjustedHitRenderer -> ScrollingHitRenderer for consistent naming. 2017-08-07 16:43:54 +09:00
smoogipooo
0d3797b497 Remove TestCaseScrollingHitObjects, replace with TestCaseScrollingPlayfield. 2017-08-07 16:25:19 +09:00
smoogipooo
fc252f8888 Remove exception (this is set in SpeedAdjustmentContainer). 2017-08-07 16:24:51 +09:00
smoogipooo
a3efca9c35 Reduce implementation overhead in actually positioning hitobjects and making them scroll. 2017-08-07 16:02:38 +09:00
Dean Herbert
725a69d973 Begin conversion 2017-08-07 16:02:14 +09:00
smoogipooo
068dfcb19a Default CreateSpeedAdjustmentContainer implementation. 2017-08-07 15:22:31 +09:00
Dean Herbert
b71caca131 Expand abilities of catcher 2017-08-07 15:09:31 +09:00
Dean Herbert
d5c6693990 Merge pull request #1085 from smoogipooo/spriteicon-invalidation-fix
Fix SpriteIcon invalidation causing game breakness.
2017-08-07 15:04:05 +09:00
smoogipooo
c6447e40f9 Reduce implementation overhead for nested playfields (e.g. playfield + columns). 2017-08-07 14:56:26 +09:00
Dean Herbert
2ce30474ca Merge branch 'master' into spriteicon-invalidation-fix 2017-08-07 14:49:09 +09:00
Dean Herbert
25bc281f00 Merge pull request #1086 from smoogipooo/add-accent-sequence
Add transform sequence support to IHasAccentColour.
2017-08-07 14:48:59 +09:00
smoogipooo
376f99c1e3 Make VisibleTimeRange transform work again. 2017-08-07 14:32:55 +09:00
smoogipooo
d0906d8232 Adjust xmldocs to conform to TransformableExtensions. 2017-08-07 14:20:56 +09:00