1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-07 20:52:56 +08:00
Commit Graph

17722 Commits

Author SHA1 Message Date
smoogipoo
2dc5447928 Merge remote-tracking branch 'origin/master' into ctb-pp 2019-03-27 14:01:02 +09:00
Dan Balasescu
4e8945a2aa
Merge pull request #4538 from peppy/fix-test-working-clock
Fix TestWorkingBeatmap not running for times below zero
2019-03-27 12:04:05 +09:00
David Zhao
43c6a8d2e5 use a property instead 2019-03-27 11:44:50 +09:00
David Zhao
efeed71517 Add comment 2019-03-27 11:37:16 +09:00
David Zhao
384eee3395 Remove DI requirement for the Facade in PlayerLoader 2019-03-27 11:32:26 +09:00
Dean Herbert
3fcbc2eab3 Fix key counter getting overridden 2019-03-27 10:31:21 +09:00
Dean Herbert
6ac49fed75 Remove broken frame 2019-03-26 17:40:22 +09:00
David Zhao
3fe52be77f Better tests, add documentation 2019-03-26 17:22:36 +09:00
Dean Herbert
7cfc2f7dcb Add back adjustment container 2019-03-26 17:11:14 +09:00
Dean Herbert
15821c7511 Fix cursor adding 2019-03-26 17:04:14 +09:00
Dean Herbert
a88f23e555 Convert remaining two flags to ctor parameters 2019-03-26 16:53:44 +09:00
Dean Herbert
4c77899738 Add storyboard ordering test 2019-03-26 16:37:52 +09:00
Dean Herbert
92184adef5 Add stable sorting of storyboard elements 2019-03-26 16:37:52 +09:00
Dean Herbert
83076e32c7 Fix TestWorkingBeatmap not running for times below zero 2019-03-26 16:35:34 +09:00
Dean Herbert
83863d35c3 Remove AllowLeadIn flag 2019-03-26 16:35:00 +09:00
Dean Herbert
8658de5108 Rename KeyCounterCollection -> KeyCounterDisplay
Also fix not working
2019-03-26 13:52:48 +09:00
Dean Herbert
2951d3e0e4 Apply CI fixes 2019-03-26 13:50:30 +09:00
Dean Herbert
fbc97edc55 Add base cursor class to retrieve true visibility state 2019-03-26 13:41:30 +09:00
Dean Herbert
b4d785c76c Don't update gameplay loop while paused 2019-03-26 13:36:17 +09:00
Dean Herbert
ed3746e166 Make PlayfieldAdjustmentContainer universal 2019-03-26 13:32:44 +09:00
Dean Herbert
e512d88899 Apply required refactor 2019-03-26 13:29:26 +09:00
Dean Herbert
5d166a011d Update framework 2019-03-26 13:28:59 +09:00
Dean Herbert
868367511e Add ManualInputManager to screen tests
Also sanitises content init order (ctor for content; bdl for other)
2019-03-26 13:26:55 +09:00
David Zhao
be9ac39f54 Cleanup 2019-03-26 11:11:27 +09:00
David Zhao
35bf262d19 Merge remote-tracking branch 'upstream/master' into facade-container 2019-03-26 11:11:13 +09:00
David Zhao
a0f6718145 Better tests and implementation 2019-03-26 10:48:29 +09:00
Dean Herbert
fa7a0a0742
Merge branch 'master' into drawable-clear-safety 2019-03-25 13:58:57 +09:00
Dean Herbert
a63bcff5cc
Merge pull request #4525 from LeNitrous/skinnable-scaling-container-background
Make the scaling background customisable to current skin background

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-03-25 13:49:52 +09:00
Dean Herbert
39df8cce19 Fix incorrect usage of InternalChildren
Could cause overwriting of components added by base DrawableHitObjcet class (such as samples)
2019-03-25 13:48:55 +09:00
Dean Herbert
5b83e97e9d
Fix typo 2019-03-25 13:38:50 +09:00
Dean Herbert
c97116c91a Add safety against DrawableHitObject implementations clearing children 2019-03-25 13:34:22 +09:00
Dean Herbert
fcc91efc1a
Merge branch 'master' into skinnable-scaling-container-background 2019-03-25 13:33:39 +09:00
Dean Herbert
cd1b171df7 Refactor async load logic (not required due to stack presence) 2019-03-25 13:28:51 +09:00
Dean Herbert
1155dba195
Merge pull request #4451 from nyquillerium/multi-background-stack
Centralise BackgroundScreenStack handling

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-03-25 13:12:01 +09:00
Dean Herbert
e705eb586d Revert unintentional change 2019-03-25 12:51:54 +09:00
Dean Herbert
9a6576c0a1 Merge remote-tracking branch 'upstream/master' into multi-background-stack 2019-03-25 12:40:31 +09:00
Dean Herbert
371166955e Apply a few minor refactors 2019-03-25 12:39:40 +09:00
Dan Balasescu
129a799084
Merge pull request #4522 from peppy/testcase-folders
Add grouping of visual tests
2019-03-25 11:50:49 +09:00
LeNitrous
fee260fa03 remove empty argument list 2019-03-25 06:05:57 +08:00
LeNitrous
01ce8f161e make scaling container background use BackgroundScreenStack with BackgroundScreenDefault 2019-03-25 05:49:57 +08:00
Dean Herbert
a1c5eda05b Add grouping of visual tests 2019-03-25 01:02:36 +09:00
Dean Herbert
9bf48863b0 Fix DrawableRuleset drawable creation method's name 2019-03-25 00:00:29 +09:00
David Zhao
5169f7a43c Change default for null screen parallax, apply reviews 2019-03-24 16:21:43 +09:00
Nathan Alo
06fd735190
Merge pull request #2 from ppy/master
merge from upstream-master
2019-03-24 15:02:28 +08:00
David Zhao
d37968d88d Add better test for facade containers 2019-03-24 15:18:38 +09:00
Dean Herbert
8c8c761e02
Merge pull request #4169 from Scotsoo/menu-globalaction-select
Add support for key bindings in gameplay menus

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-03-24 12:29:50 +09:00
Dean Herbert
11b474e194 Handle released for safety 2019-03-24 12:19:09 +09:00
Dean Herbert
1e0027e4f2 Fix test 2019-03-24 12:09:18 +09:00
Dean Herbert
0d72104235 Refactor for formatting sanity 2019-03-24 12:03:06 +09:00
Dean Herbert
8ad19fc2d4 Merge branch 'master' into menu-globalaction-select 2019-03-24 11:58:52 +09:00