1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-25 04:12:53 +08:00
Commit Graph

8976 Commits

Author SHA1 Message Date
Dean Herbert
404e7d62ff
Merge branch 'master' into mania-important-frames 2017-11-29 18:12:57 +09:00
Dan Balasescu
fbddaccaf5
Merge pull request #1623 from peppy/load-player-test-async
Load Player-based TestCases asynchronously
2017-11-29 17:47:58 +09:00
smoogipoo
309eb4edd7 Integrate HitObjectComposer into Compose
Also removes the other rulesets' HitObjectComposers for now.
2017-11-29 17:46:21 +09:00
Dean Herbert
bad970d1d1 Add wait steps to ensure the player is completely loaded before continuing 2017-11-29 17:25:55 +09:00
Dean Herbert
1ea089eb74 Update framework 2017-11-29 17:25:41 +09:00
smoogipoo
f586cbac32 Restructure Compose to use grids and eventually support HitObjectContainer 2017-11-29 16:47:52 +09:00
smoogipoo
2ec24f58c8 Add testcase for editor compose 2017-11-29 16:30:59 +09:00
smoogipoo
8c30fd490c Add HitObjectComposer class 2017-11-29 16:22:11 +09:00
Dean Herbert
f36137192e Merge remote-tracking branch 'upstream/master' into load-player-test-async 2017-11-29 15:53:30 +09:00
smoogipoo
6fd550dc91 Simplify/sanitize construction of ManiaReplayFrame 2017-11-29 15:47:10 +09:00
smoogipoo
1136db1556 Fix mania replays not defining important frames
Resolves https://github.com/ppy/osu/issues/1495 .
2017-11-29 14:20:15 +09:00
Dan Balasescu
ce42aef924
Merge pull request #1619 from peppy/quieter-builds
Hide inspectcode output from appveyor console
2017-11-29 14:07:44 +09:00
Dean Herbert
85201ea30c
Merge branch 'master' into performance-calculator 2017-11-29 13:23:40 +09:00
Dean Herbert
d1afbf8055 Load Player-based TestCases asynchronously 2017-11-29 13:10:33 +09:00
Dean Herbert
8370d76946 Quieten nuget 2017-11-29 12:27:18 +09:00
Aergwyn
3bdf82d8df refactor newly added code to be less redundant 2017-11-28 21:38:11 +01:00
Aergwyn
6a4cc93360 fixes crash if all beatmaps of a set are hidden 2017-11-28 21:26:13 +01:00
Dean Herbert
6f5803b5eb Shallow clone submodules 2017-11-29 02:30:25 +09:00
Dean Herbert
1aa79a2d88 Hide inspectcode output from appveyor console 2017-11-29 01:26:21 +09:00
Santeri
898c49c19d remove unnecessary assignments 2017-11-28 16:14:32 +02:00
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
jorolf
7f068c0c68 correct string mistake 2017-11-27 21:13:01 +01:00