1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 01:27:35 +08:00
Commit Graph

4171 Commits

Author SHA1 Message Date
Dan Balasescu
5024a74192 Update ManiaPlayfield.cs 2017-05-03 20:11:24 +09:00
smoogipooo
8aa6bb636c Reset column key when it can't be set. 2017-05-03 19:43:20 +09:00
smoogipooo
8d82a52942 Add revert to normal special style after all steps. 2017-05-03 19:38:27 +09:00
smoogipooo
14e4714f08 Rewrite a lot of ManiaPlayfield/Column to support left/right special styles and arbitrary number of columns. 2017-05-03 19:38:15 +09:00
smoogipooo
06e014708a Defer virtual method to load(). 2017-05-03 15:57:15 +09:00
Dan Balasescu
d21c3358b9 Less array explicivity. 2017-05-03 13:03:46 +09:00
smoogipooo
7de36b7aa2 CI cleanups. 2017-05-03 12:58:46 +09:00
smoogipooo
71acf1c57d Move classes out of test case. 2017-05-03 12:37:47 +09:00
smoogipooo
b4052a099f Create ManiaPlayfield, support up to 9 columns, improve testcase automation. 2017-05-03 12:30:03 +09:00
smoogipooo
27e16b8cfd Merge remote-tracking branch 'origin/master' into mania-stage 2017-05-03 10:50:10 +09:00
Dean Herbert
c8e5f8bd95 Merge pull request #696 from smoogipooo/custom-drawings-flags
Custom drawings flags
2017-05-03 09:41:01 +09:00
Dean Herbert
8825277656 Merge branch 'master' into custom-drawings-flags 2017-05-03 09:36:51 +09:00
Dan Balasescu
087f22e7ca Merge pull request #698 from peppy/music-controller-fixes
Music controller fixes
2017-05-02 18:04:53 +09:00
smoogipooo
8e88d86639 Fix naming confusion. 2017-05-02 18:00:37 +09:00
smoogipooo
f1f7a26dbd Fix incorrect inheritance. 2017-05-02 17:58:59 +09:00
Dean Herbert
a993790a66 Ensure all searchable terms are non-null non-empty. 2017-05-02 17:54:07 +09:00
smoogipooo
9ca8295149 Oops. 2017-05-02 17:09:16 +09:00
smoogipooo
40d2fee1dc Split up adding of local store from the ctor. 2017-05-02 16:55:04 +09:00
smoogipooo
e2620e2840 Make Team not inherit Country. 2017-05-02 16:54:43 +09:00
Dean Herbert
46ae8bc86b Use value because we need to. 2017-05-02 16:49:27 +09:00
Dean Herbert
f1d0b77d10 Base the music controller transform direction on relative indices in playlist. 2017-05-02 16:40:29 +09:00
smoogipooo
ee0a5409bb CI fixes. 2017-05-02 16:33:48 +09:00
smoogipooo
9eaf6b3ccb Merge branch 'master' into custom-drawings-flags
# Conflicts:
#	osu-framework
2017-05-02 16:29:54 +09:00
Dean Herbert
beb98c14b6 Fix layout not being invalidated when re-filtering playlist display. 2017-05-02 16:26:11 +09:00
Dean Herbert
57e63b9934 Merge pull request #697 from peppy/general-fixes
Update framework with new DI changes.
2017-05-02 15:41:29 +09:00
Dean Herbert
d06b3c898f Update framework with new DI changes. 2017-05-02 15:32:47 +09:00
smoogipooo
91e000fd44 Back to sanity. 2017-05-02 14:21:22 +09:00
smoogipooo
f17046abaf Add ability to load Drawings flags from osu/Drawings/Flags. 2017-05-02 13:28:35 +09:00
smoogipooo
e856abe59a Let's not use Country for drawings-specific stuff... 2017-05-02 13:02:14 +09:00
Dan Balasescu
3604c3562a Merge pull request #694 from peppy/general-fixes
Set a sane default transform direction.
2017-05-02 11:51:19 +09:00
Dean Herbert
50909eaa39 Update framework (upstream testcase fix). 2017-05-02 11:44:37 +09:00
Dean Herbert
6074cb5979 Make playlist filtering work.
Also standardises searchable terms in beatmap metadata.
2017-05-02 10:45:55 +09:00
Dean Herbert
b07af21202 Update framework. 2017-05-02 10:03:21 +09:00
Dan Balasescu
8caba36230 Merge branch 'master' into general-fixes 2017-05-02 09:50:35 +09:00
Dean Herbert
668566e73c Merge pull request #695 from ColdVolcano/intro-improvements
Fix startup crash caused by MenuMusic binding
2017-05-02 09:49:33 +09:00
ColdVolcano
6ce0245c2b Typo 2017-05-01 19:34:08 -05:00
ColdVolcano
1b52445f86 Fix crash when selecting non-existent IDs from database 2017-05-01 19:31:46 -05:00
Dean Herbert
b52781db73 Update README.md 2017-05-01 22:00:36 +09:00
smoogipooo
80ebd04e85 Add keys to columns and add key down transformations. 2017-05-01 20:48:43 +09:00
Dean Herbert
737ad78056 Set a sane default transform direction. 2017-05-01 20:10:19 +09:00
Dean Herbert
703ce259a9 Merge pull request #687 from DrabWeb/playlist
Playlist
2017-05-01 20:01:30 +09:00
Dean Herbert
2437c416b1 Use less usings. 2017-05-01 19:56:01 +09:00
Dean Herbert
2e0eda6b15 Merge branch 'master' into playlist 2017-05-01 19:44:57 +09:00
Dean Herbert
3943e4ae95 Fix comma. 2017-05-01 19:32:31 +09:00
Dean Herbert
c59589eba7 Only retrieve colour once. 2017-05-01 19:32:00 +09:00
smoogipooo
82cbb63af5 Add column generation + put spacing one level up. 2017-05-01 17:24:35 +09:00
Dean Herbert
0f4ef16910 Remove custom word splitting logic, add localisation support. 2017-05-01 17:14:59 +09:00
smoogipooo
4aea18b673 Add initial column design. 2017-05-01 17:00:41 +09:00
Dean Herbert
42a62e14e1 Merge pull request #665 from thomastanck/autoreplay-refactor-squashed
Refactor Auto
2017-05-01 16:57:57 +09:00
Dean Herbert
d00d4cce35 Merge branch 'master' into autoreplay-refactor-squashed 2017-05-01 16:53:46 +09:00