1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 01:33:21 +08:00
Commit Graph

46 Commits

Author SHA1 Message Date
Dean Herbert
a18b2bd5f0 Hook everything up 2017-08-20 22:21:16 +09:00
Thomas Müller
7e1df7907f Remove now unnecessary usings 2017-08-19 17:43:02 +02:00
Thomas Müller
9bebb9f5b0 Remove now unused SliderBar class 2017-08-19 16:09:32 +02:00
Dean Herbert
bc7621607a Merge upstream/master in. 2017-08-18 22:20:45 +09:00
smoogipooo
cceeb864d5 Fix hitobjects in TestCaseHitObjects not receiving actions. 2017-08-17 12:16:33 +09:00
Thomas Müller
55b159b976 Remove unnecessary usings 2017-08-17 07:26:24 +09:00
Thomas Müller
8c05a40fbf Use SliderStep instead of TestCaseSliderBar
This greatly simplifies TestCaseKeyCounter and TestCaseHitObject and allows more future automation.
2017-08-17 07:26:24 +09:00
Dean Herbert
7e1fc47b76 Fix forgotten rename 2017-08-16 17:43:01 +09:00
Dean Herbert
54698f2d8f Use IntAction instead of new 2017-08-16 17:27:09 +09:00
Dean Herbert
dc82a88bb8 Improve namespaces of key bindings 2017-08-16 17:24:01 +09:00
Dean Herbert
89987229de Merge remote-tracking branch 'origin/is-alive' into key-config-settings 2017-08-16 15:49:43 +09:00
Dean Herbert
9c75df884f Add initial implementation of KeyConfiguration overlay 2017-08-16 00:17:33 +09:00
Dean Herbert
97ac8e1a64 Update usages of IsAlive/IsLoaded in line with framework changes 2017-08-15 13:57:48 +09:00
Dean Herbert
4da76cd98e Initial key configuration UI implementation 2017-08-14 22:31:35 +09:00
Dean Herbert
66fa84a451 Make settings more modular 2017-08-14 13:09:59 +09:00
smoogipooo
0c1b68d711 Fix up TestCaseTaikoPlayfield. 2017-08-09 16:46:22 +09:00
smoogipooo
88cefa77bd Make TestCaseTaikoPlayfield work again. 2017-08-09 16:19:20 +09:00
smoogipooo
ef29d9c093 Merge remote-tracking branch 'origin/master' into taiko-timingchanges-2
# Conflicts:
#	osu.Game.Rulesets.Taiko/UI/TaikoRulesetContainer.cs
2017-08-09 16:18:27 +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
e6c100da27 Fix CI. 2017-08-09 14:51:00 +09:00
smoogipooo
ea073c02b3 Showcase both horizontal and vertical styles in TestCaseScrollingPlayfield. 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
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
Dean Herbert
b88f37de45 Add custom actions for Catch
Reworks input management for rulesets
2017-08-09 11:50:34 +09:00
Dean Herbert
41fa961571 Merge remote-tracking branch 'smoogipooo/timingchange-improvements' into catch 2017-08-09 09:30:47 +09:00
smoogipooo
a95ee7494f Initial conversion of taiko to use ScrollingPlayfield. 2017-08-08 16:01:18 +09:00
smoogipooo
9e01b47a09 Convert to local object. 2017-08-08 14:15:08 +09:00
Dean Herbert
e00ea2db04 Merge remote-tracking branch 'smoogipooo/timingchange-improvements' into catch 2017-08-08 13:24:43 +09:00
smoogipooo
c5ce86b9f3 Add reversing capability to ScrollingPlayfield. 2017-08-08 12:59:50 +09:00
Dean Herbert
bbeb14f99d Merge remote-tracking branch 'smoogipooo/timingchange-improvements' into catch 2017-08-08 07:37:31 +09:00
Dean Herbert
4d1dd70cfb Licence headers 2017-08-08 07:32:23 +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
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
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
a3efca9c35 Reduce implementation overhead in actually positioning hitobjects and making them scroll. 2017-08-07 16:02:38 +09:00
Dean Herbert
b71caca131 Expand abilities of catcher 2017-08-07 15:09:31 +09: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
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
104c25266d Add missing licence headers 2017-08-04 15:48:42 +09:00
Dean Herbert
f8448b8b19 Update to support new framework VisualTests structure 2017-08-04 15:37:31 +09:00