1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-13 03:57:24 +08:00
Commit Graph

4210 Commits

Author SHA1 Message Date
EVAST9919
95f6c999bd Adjust scale and CI fixes 2017-05-04 17:59:01 +03:00
EVAST9919
66c858030a Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor 2017-05-04 17:35:41 +03:00
EVAST9919
475eb6fe5f Cleanup 2017-05-04 17:29:52 +03:00
EVAST9919
57c4232416 Added testcase 2017-05-04 11:58:37 +03:00
Dean Herbert
b98ae5d7c3 Merge pull request #704 from smoogipooo/mania-stage
Mania playfield
2017-05-04 17:02:42 +09:00
Dean Herbert
efa60ee287 Merge branch 'master' into mania-stage 2017-05-04 16:58:16 +09:00
smoogipooo
72b2467e74 Throw exception if SpecialColumnPosition is set after IsLoaded. 2017-05-04 15:18:20 +09:00
smoogipooo
e307b6d563 Make SpecialColumnPosition only have an effect during load(). 2017-05-04 15:12:32 +09:00
smoogipooo
a2bdd020e5 ColumnStyle -> ColumnPosition. 2017-05-04 14:54:31 +09:00
EVAST9919
6063231e40 float value fix 2017-05-03 16:58:10 +03:00
EVAST9919
26985dbc62 Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor 2017-05-03 16:22:40 +03:00
Dean Herbert
f5981b1ab9 Merge pull request #699 from peppy/options-implementation
Confine mouse mode and more
2017-05-03 22:02:58 +09:00
Dean Herbert
19f6d58723 Merge remote-tracking branch 'upstream/master' into options-implementation 2017-05-03 21:54:27 +09:00
Dean Herbert
c39b314ac2 Update framework. 2017-05-03 21:29:42 +09:00
Dean Herbert
330dd458bd Trim whitespace. 2017-05-03 20:49:52 +09:00
Dean Herbert
489f586887 Add FPS display toggling.
Kinda temporary but better than nothing.
2017-05-03 20:34:53 +09:00
Dan Balasescu
5574a8770b Merge branch 'master' into mania-stage 2017-05-03 20:19:00 +09:00
Dan Balasescu
5024a74192 Update ManiaPlayfield.cs 2017-05-03 20:11:24 +09:00
EVAST9919
5f2f1d2763 CI fixes 2017-05-03 14:01:43 +03:00
EVAST9919
9e35eb8d97 Fixes 2017-05-03 13:53:45 +03: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
EVAST9919
e7a8619f01 ModIcon refactor 2017-05-03 09:48:10 +03:00
EVAST9919
898d9495ff line fix 2017-05-03 08:27:47 +03:00
EVAST9919
f49cc124ed Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor 2017-05-03 08:26:54 +03:00
EVAST9919
6ea3629c9a Adjust the size 2017-05-03 08:23:52 +03: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
Dean Herbert
8da5686007 Merge pull request #703 from smoogipooo/taiko-fixes
Fix taiko auto replay generation not working.
2017-05-03 11:30:02 +09:00
smoogipooo
4d27e0abb6 Oops i didn't save the solution. 2017-05-03 11:25:54 +09:00
smoogipooo
60c2e2a90a Fix taiko auto replay generation not working. 2017-05-03 11:22:09 +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
EVAST9919
2e30a69b67 removed using 2017-05-02 23:04:36 +03:00
EVAST9919
a955f9cbfd Simplify hiding logic 2017-05-02 22:59:36 +03:00
EVAST9919
37c3133981 Fixes 2017-05-02 22:46:18 +03:00
EVAST9919
7e1efcc20b Added ModsContainer 2017-05-02 22:34:07 +03:00
EVAST9919
00a8dbbacf Added ModType for each mode 2017-05-02 21:36:55 +03:00
Dean Herbert
a036b059e8 Use provided parameters to avoid a second lookup. 2017-05-02 21:40:06 +09:00
Dean Herbert
691742b828 Remove most options which have not yet been implemented. 2017-05-02 19:40:30 +09:00
Dean Herbert
f9de733128 Formatting. 2017-05-02 18:53:33 +09:00
Dean Herbert
d4045ee2c0 We only have one release stream, so let's unlock it. 2017-05-02 18:40:30 +09:00
Dean Herbert
57c2dd1f49 Fix options dropdown labels never being displayed. 2017-05-02 18:35:23 +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