1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 19:32:58 +08:00
Commit Graph

6480 Commits

Author SHA1 Message Date
Jorolf
7f5270b4e1 Merge branch 'ranks-section' of github.com:Jorolf/osu into ranks-section 2017-08-09 18:51:05 +02:00
Jorolf
8631c469fc add license header 2017-08-09 18:50:44 +02:00
jorolf
934c2a1dc8 Merge branch 'master' into ranks-section 2017-08-09 18:47:25 +02:00
Jorolf
274ebbd1f7 remove duplicated code and "simplify" ShowMore logic 2017-08-09 18:45:37 +02:00
Jorolf
9f005488f7 make it work again after merge 2017-08-09 17:32:09 +02:00
Dan Balasescu
bd84e507de Merge pull request #1093 from peppy/catch
Stored bindings, more catch and less HitRenderer
2017-08-09 15:26:54 +09:00
Dean Herbert
459a4cafb1 Remove unnecessary HandleInput 2017-08-09 15:17:05 +09:00
Dean Herbert
3b48a6c668 Fix CI issues 2017-08-09 15:15:41 +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
Dean Herbert
1afe8eba7c Merge pull request #1087 from smoogipooo/timingchange-improvements
Rework scrolling playfields to be a lot more usable.
2017-08-09 14:56:40 +09:00
smoogipooo
e6c100da27 Fix CI. 2017-08-09 14:51:00 +09:00
smoogipooo
2715324a76 Fix possible incorrect reversing behavior for horizontal playfields. 2017-08-09 14:50:52 +09:00
Dean Herbert
c70f96a9cd Add basic documentation and split out classes. 2017-08-09 14:50:10 +09:00
smoogipooo
f70c00423a Missed one. 2017-08-09 14:25:49 +09:00
smoogipooo
ea073c02b3 Showcase both horizontal and vertical styles in TestCaseScrollingPlayfield. 2017-08-09 14:24:48 +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
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
Dean Herbert
723e27353c HitRenderer -> RulesetContainer 2017-08-09 13:28:29 +09:00
Dean Herbert
f21b370f4e Add variant for rulesets with more than one possible key layout 2017-08-09 13:23:23 +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
Dean Herbert
eee6404986 Store bindings to database 2017-08-09 12:37:47 +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
Dan Balasescu
7345ad40db Merge branch 'master' into timingchange-improvements 2017-08-09 10:53:25 +09:00
Dean Herbert
06e5f7de09 Make pulp size private 2017-08-09 10:16:31 +09:00
Dean Herbert
41fa961571 Merge remote-tracking branch 'smoogipooo/timingchange-improvements' into catch 2017-08-09 09:30:47 +09:00
Dean Herbert
da5f2fc6af Merge remote-tracking branch 'origin/catch-catcher' into catch 2017-08-09 09:28:50 +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
Jorolf
7d7cfe5d92 Merge branch 'master' of git://github.com/ppy/osu into ranks-section 2017-08-08 23:13:25 +02:00
Dan Balasescu
98c652c0f9 Merge pull request #1089 from johnneijzen/Small-Mistakes-Fix
Update HitObjectPatternGenerator.cs
2017-08-09 06:13:16 +09:00
Jorolf
1c2329f111 generalize the hover code 2017-08-08 23:11:46 +02: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
Dean Herbert
2203d55d64 fixes 2017-08-08 13:31:55 +09:00
Dean Herbert
e00ea2db04 Merge remote-tracking branch 'smoogipooo/timingchange-improvements' into catch 2017-08-08 13:24:43 +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