Dean Herbert
|
250fb33fbc
|
Merge branch 'master' into ranks-section
|
2017-08-22 12:46:28 +09:00 |
|
Dean Herbert
|
7903f49d27
|
Merge branch 'master' into action-key-counter
|
2017-08-21 17:47:19 +09:00 |
|
Dean Herbert
|
52dadad1e1
|
Merge branch 'master' into fix-taiko-barlines
|
2017-08-21 16:46:25 +09:00 |
|
Dean Herbert
|
ea450fecf5
|
Merge branch 'master' into action-key-counter
|
2017-08-21 16:25:44 +09:00 |
|
smoogipooo
|
6e0d2182cb
|
CI.
|
2017-08-21 16:24:16 +09:00 |
|
smoogipooo
|
5d13efa76d
|
Remove the concept of "queued hit objects", add a default speed adjustment.
|
2017-08-21 16:17:00 +09:00 |
|
smoogipooo
|
7a5708ce92
|
Further support for null judgements.
|
2017-08-21 15:35:16 +09:00 |
|
Dean Herbert
|
a63923a497
|
Remove type check for now
|
2017-08-21 12:50:48 +09:00 |
|
Dean Herbert
|
16e96888ab
|
Update KeyCounterCollection to support action-based buttons
|
2017-08-21 12:39:22 +09:00 |
|
smoogipooo
|
6a7b410bc3
|
Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147
|
2017-08-21 11:58:54 +09:00 |
|
Dean Herbert
|
bc7621607a
|
Merge upstream/master in.
|
2017-08-18 22:20:45 +09:00 |
|
smoogipooo
|
90885a31ae
|
Round 2 of CI fixes.
|
2017-08-18 15:09:54 +09:00 |
|
smoogipooo
|
a47b6526a2
|
Fix CI issues.
|
2017-08-18 14:40:36 +09:00 |
|
Dan Balasescu
|
68303accef
|
Merge branch 'master' into make-rulesetinfo-iequatable
|
2017-08-18 14:28:42 +09:00 |
|
Dean Herbert
|
7c9d6c9c83
|
Initial refactoring of key binding logic
|
2017-08-14 20:19:25 +09:00 |
|
Shane Woolcock
|
d19c8f56be
|
Make RulesetInfo implement IEquatable since EqualityComparer was sometimes giving false negatives and causing Bindable observers to fire
|
2017-08-13 15:03:01 +09:30 |
|
MillhioreF
|
e42c279229
|
More generic catching for broken hitobject strings
|
2017-08-10 01:50:20 -05:00 |
|
MillhioreF
|
c16dbc05aa
|
Add new error for malformed (too many variables) hit objects during import
|
2017-08-09 23:41:22 -05:00 |
|
jorolf
|
934c2a1dc8
|
Merge branch 'master' into ranks-section
|
2017-08-09 18:47:25 +02:00 |
|
smoogipooo
|
d83c218e08
|
Remove various scrolling container optimisations (removing when not alive).
|
2017-08-09 16:19:09 +09:00 |
|
Dean Herbert
|
976cff9af6
|
Merge remote-tracking branch 'upstream/master' into catch
# Conflicts:
# osu.Desktop.Tests/Visual/TestCaseScrollingPlayfield.cs
|
2017-08-09 15:08:43 +09:00 |
|
smoogipooo
|
2715324a76
|
Fix possible incorrect reversing behavior for horizontal playfields.
|
2017-08-09 14:50:52 +09:00 |
|
smoogipooo
|
f70c00423a
|
Missed one.
|
2017-08-09 14:25:49 +09:00 |
|
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 |
|
smoogipooo
|
431a9649a4
|
Remove unused using.
|
2017-08-09 13:38:12 +09:00 |
|
Dean Herbert
|
723e27353c
|
HitRenderer -> RulesetContainer
|
2017-08-09 13:28:29 +09:00 |
|
Dean Herbert
|
7c0e7ebcd0
|
Give HitRenderer a reference to Ruleset
Used to get correct bindings for a mode (ActionMappingInputManager).
|
2017-08-09 13:05:52 +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 |
|
Dean Herbert
|
b88f37de45
|
Add custom actions for Catch
Reworks input management for rulesets
|
2017-08-09 11:50:34 +09:00 |
|
Jorolf
|
7d7cfe5d92
|
Merge branch 'master' of git://github.com/ppy/osu into ranks-section
|
2017-08-08 23:13:25 +02:00 |
|
smoogipooo
|
cae21869d0
|
Use CompositeDrawable for HitObjectContainer. Removes a looooooot of generics 👍.
|
2017-08-08 17:37:11 +09:00 |
|
smoogipooo
|
25202b522d
|
Fix not setting Origin + Anchors properly when reversing.
|
2017-08-08 14:10:26 +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
|
bd2ef4dc6b
|
Line endings + license headers.
|
2017-08-07 18:03:44 +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
|
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 |
|
smoogipooo
|
c6447e40f9
|
Reduce implementation overhead for nested playfields (e.g. playfield + columns).
|
2017-08-07 14:56:26 +09:00 |
|
smoogipooo
|
376f99c1e3
|
Make VisibleTimeRange transform work again.
|
2017-08-07 14:32:55 +09:00 |
|
smoogipooo
|
e1dfe364b2
|
Fix lifetime performance regression.
|
2017-08-07 14:07:49 +09:00 |
|
Dean Herbert
|
eb190d83bd
|
Adjust CS multiplier to match stable
|
2017-08-07 10:43:33 +09:00 |
|