1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 14:03:22 +08:00
Commit Graph

6405 Commits

Author SHA1 Message Date
smoogipooo
8585561557 Merge branch 'timingchange-improvements' into taiko-timingchanges-2 2017-08-08 14:38:42 +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
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
smoogipooo
068dfcb19a Default CreateSpeedAdjustmentContainer implementation. 2017-08-07 15:22: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
smoogipooo
2221797273 Add transform sequence support to IHasAccentColour. 2017-08-07 14:12:05 +09:00
smoogipooo
e1dfe364b2 Fix lifetime performance regression. 2017-08-07 14:07:49 +09:00
smoogipooo
ce7d391f06 These method calls are impure. 2017-08-07 13:37:07 +09:00
smoogipooo
953cf5af58 Fix SpriteIcon invalidation causing game breakness. 2017-08-07 13:26:54 +09:00
Dean Herbert
b8d67f65af Merge pull request #1084 from ppy/correct-cs-multiplier
Adjust CS multiplier to match stable
2017-08-07 10:53:39 +09:00
Dean Herbert
eb190d83bd Adjust CS multiplier to match stable 2017-08-07 10:43:33 +09:00
Dan Balasescu
c7b59646c0 Merge pull request #1083 from peppy/more-mods
Implement NoFail, HardRock, Easy mods
2017-08-07 10:07:06 +09:00
Dean Herbert
da84f1ce39 Update framework 2017-08-07 09:56:50 +09:00
Dean Herbert
8941c8658c Use nested containers for shadow 2017-08-07 09:50:04 +09:00
Dean Herbert
de3b65e1fa Fix StoredBookmarks not being serialized 2017-08-07 09:45:44 +09:00
Dean Herbert
6f93aa6131 Fix incomplete comment 2017-08-07 09:01:47 +09:00
Dean Herbert
e75f438c29 Add difficulty application mods
Also fixes circular references when using IJsonSerializable.
2017-08-07 08:54:54 +09:00
Dean Herbert
224de9cc1e Implement NoFail mod 2017-08-07 08:54:54 +09:00
Dean Herbert
3416925233 Fix alignment of icons on mod buttons 2017-08-07 08:54:53 +09:00
Dean Herbert
d7fede96ef Fix shadow on SpriteIcon being a bit off 2017-08-07 08:54:53 +09:00
Dean Herbert
c9b0177e09 Merge pull request #1082 from huoyaoyuan/depth
Remove depth setting in SectionsContainer and profile.
2017-08-07 07:28:09 +09:00
Huo Yaoyuan
8843d97895 Remove depth setting in SectionsContainer and profile. 2017-08-05 18:01:10 +08:00
smoogipooo
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
smoogipooo
54503eef71 Rename *ScrollingDrawableTimingSection -> *ScrollingContainer, move LinearScrollingContainer to osu.Game, make SpeedAdjustmentContainer non-abstract. 2017-08-04 22:50:29 +09:30
Dean Herbert
0312103546 Merge pull request #1078 from smoogipooo/taiko-fixes
Taiko fixes
2017-08-04 20:01:33 +09:00
smoogipooo
d42faa02df Update framework. 2017-08-04 20:11:51 +09:30
smoogipooo
4a9f3aa70d Merge remote-tracking branch 'origin/master' into timingchange-improvements 2017-08-04 20:11:24 +09:30
smoogipooo
0f901c99a0 Implement SpeedAdjustedPlayfield and a new HitRenderer derivation. 2017-08-04 20:11:18 +09:30
Dean Herbert
fa7ef8ed52 Merge remote-tracking branch 'upstream/master' into taiko-fixes
# Conflicts:
#	osu.Desktop.Tests/Visual/TestCaseTaikoHitObjects.cs
#	osu.Desktop.Tests/Visual/TestCaseTaikoPlayfield.cs
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
2017-08-04 18:04:23 +09:00
Dean Herbert
5cf8121d29 Merge pull request #1025 from huoyaoyuan/fixes
Implement Ctrl+Enter for Auto in song select.
2017-08-04 17:48:47 +09:00