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

8891 Commits

Author SHA1 Message Date
Dean Herbert
e1982e9863
Merge branch 'master' into mania-auto-generation-fixes 2017-11-28 22:35:21 +09:00
Dan Balasescu
36d1b8a021
Merge pull request #1613 from peppy/center-osu-direct
Vertically centre the panels in osu!direct
2017-11-28 22:34:52 +09:00
Dean Herbert
66fa108696 Vertically centre the panels in osu!direct 2017-11-28 22:25:20 +09:00
smoogipoo
f807d26cae Use ranked property of mods rather than checking for individual mods 2017-11-28 21:46:13 +09:00
smoogipoo
7db7fb91dd Ignore ruleset testcases from CI 2017-11-28 21:45:24 +09:00
smoogipoo
a9cc156d7a Merge remote-tracking branch 'origin/master' into performance-calculator 2017-11-28 21:38:26 +09:00
Dan Balasescu
f38e3b35d0
Merge pull request #1610 from peppy/catch-absolute-widths
Catcher absolute sizing improvements
2017-11-28 21:37:27 +09:00
Dean Herbert
23b4d2163c Fix spelling and grammar 2017-11-28 21:30:03 +09:00
Dean Herbert
2bb61e51ac Add catcher scale based on CircleSize 2017-11-28 19:43:26 +09:00
smoogipoo
00f9f97850 Fix compile errors (rider didn't warn me about these) 2017-11-28 19:13:10 +09:00
smoogipoo
375f2710d4 Rename file 2017-11-28 19:09:17 +09:00
smoogipoo
cc9e06e161 Remove unused elements 2017-11-28 19:07:10 +09:00
smoogipoo
eaf2b1d94d Remove line that shouldn't have been added yet 2017-11-28 19:06:46 +09:00
smoogipoo
567e378bbb CI fixes 2017-11-28 19:02:39 +09:00
smoogipoo
f8c296877b Add testcase for mania beatmap conversion (currently ignored) 2017-11-28 18:59:20 +09:00
Dean Herbert
b11de50df2 Cleanups 2017-11-28 18:42:50 +09:00
Dean Herbert
5ae9b4c791 Make CatchStacker testcase more useful 2017-11-28 18:39:54 +09:00
Dean Herbert
b517523f4a Add back CatcherArea to simplify layout 2017-11-28 18:39:45 +09:00
Dean Herbert
8f3fd7092e CatchBaseHit -> CatchHitObject
Also moves default scale to CatchHitObject.
2017-11-28 18:37:41 +09:00
Dean Herbert
2deb33ac41 Add basic fruit scaling support 2017-11-28 18:34:40 +09:00
Dean Herbert
bd88df2722 Add note about sequential execution of ConvertHitObject 2017-11-28 18:33:41 +09:00
smoogipoo
b97cab4f29 Make ManiaFramedReplayInputHandler properly account for special keys
These are interleaved into the playfield, so we have to use the playfield's columns' actions.
2017-11-28 15:27:20 +09:00
smoogipoo
84702211ec Rewrite mania auto generator to properly account for overlapping objects 2017-11-28 15:17:02 +09:00
Dan Balasescu
58c88196ae
Merge pull request #1607 from peppy/fix-chat-height-precision
Remove precision limitation on chat height to allow pixel-perfect dragging
2017-11-28 13:07:21 +09:00
Dean Herbert
473eba9776 Remove precision limitation on chat height to allow pixel-perfect dragging 2017-11-28 12:09:44 +09:00
Santeri
e9277d8cb1 last directive error... 2017-11-28 00:27:58 +02:00
Santeri
49949bf698 fix minor param/directive errors 2017-11-28 00:20:44 +02:00
Santeri
86de6f8252 derives from trianglebutton rather than osubutton 2017-11-28 00:09:58 +02:00
Santeri
0a8fa2e6de Merge branch 'master' into header-button-should-derive 2017-11-27 23:16:42 +02:00
Santeri Nogelainen
96f782e75a fix object reference issue maybe? 2017-11-27 13:51:56 +02:00
Santeri Nogelainen
bf8d15108e headerbutton now derives from osubutton 2017-11-27 13:39:01 +02:00
Dean Herbert
f54cbc2b2f
Merge pull request #1597 from peppy/new-sounds-and-more
Add new UI and menu samples
2017-11-27 19:53:37 +09:00
Dean Herbert
3a01bfc1ef Remove unnecessary new prefix 2017-11-27 18:53:19 +09:00
Dean Herbert
8ebfe7f0f4
Merge branch 'master' into new-sounds-and-more 2017-11-27 18:49:07 +09:00
Dean Herbert
5947af13b7
Merge pull request #1602 from smoogipoo/fix-mania-conversion
Fix possible invalid cast when generating mania patterns
2017-11-27 18:47:13 +09:00
smoogipoo
2c53be7853 Fix possible invalid cast when generating mania patterns 2017-11-27 18:39:13 +09:00
Dean Herbert
bf5ea027ef Add xmldoc to TriangleButton 2017-11-27 18:26:20 +09:00
Dean Herbert
96d42b3e5b Fix redundant string interpolation 2017-11-27 18:20:13 +09:00
Dean Herbert
51372d7cda Remove HandleInput override from TriangleButton 2017-11-27 18:19:06 +09:00
Dean Herbert
760f7d02d9 Remove AlwaysPresent (not actually required) 2017-11-27 18:12:52 +09:00
Dean Herbert
cbd7e1ca0d Update submodules 2017-11-27 18:06:53 +09:00
Dean Herbert
7877f42763 Merge remote-tracking branch 'upstream/master' into new-sounds-and-more 2017-11-27 17:59:24 +09:00
Dan Balasescu
90e1f16645
Merge pull request #1594 from peppy/global-track-volume-reduction
Add a global reduction of audio track volume
2017-11-27 17:16:21 +09:00
FreezyLemon
82a9b57277 Removed unnecessary "using" statement 2017-11-27 08:58:09 +01:00
FreezyLemon
b4513497d6 Added a textContainer reference to MetadataSection so casting is no longer required for setting new text 2017-11-27 08:52:26 +01:00
FreezyLemon
507da0dfb7 Renamed addTextAsync to setTextAsync 2017-11-27 08:48:47 +01:00
FreezyLemon
ac0942df86 Removed unnecessary private method to update the metadata 2017-11-27 08:48:12 +01:00
FreezyLemon
d49ee295d9 Removed unnecessary schedule and null checks 2017-11-27 08:47:36 +01:00
FreezyLemon
b34e724b8d Changed MetadataSection so that the Text setter loads the new text in async before displaying it. 2017-11-27 08:18:09 +01:00
Dean Herbert
3e0f282d52
Merge branch 'master' into global-track-volume-reduction 2017-11-27 12:27:01 +09:00