Dan Balasescu
|
7ab24e35f9
|
Merge branch 'master' into gameplay-paused-no-update
|
2019-03-29 10:53:32 +09:00 |
|
Dan Balasescu
|
71c4fefe69
|
Merge pull request #4531 from peppy/testability-improvements
Add ManualInputManager to screen tests
|
2019-03-29 10:51:31 +09:00 |
|
Dan Balasescu
|
4c038e7f67
|
Merge branch 'master' into testability-improvements
|
2019-03-29 10:23:12 +09:00 |
|
Dan Balasescu
|
fc41a7015a
|
Merge pull request #4528 from peppy/drawable-clear-safety
Add safety against accidental clearing of DrawableHitObject children
|
2019-03-29 10:23:00 +09:00 |
|
Dan Balasescu
|
900c00ba59
|
Merge branch 'master' into drawable-clear-safety
|
2019-03-29 10:14:41 +09:00 |
|
Dan Balasescu
|
f134b9c886
|
Merge pull request #4547 from peppy/fix-slider-ball-positional
Fix slider ball not always receiving position in time
|
2019-03-28 15:13:06 +09:00 |
|
Dean Herbert
|
8f5e769425
|
Fix slider ball not always receiving position in time
|
2019-03-28 12:42:28 +09:00 |
|
Dean Herbert
|
fc59e6dec5
|
Merge pull request #4494 from Joehuu/clean-overlays-code-1
Remove specified depths of overlays
|
2019-03-28 11:27:36 +09:00 |
|
Dean Herbert
|
23b5271ce4
|
Merge branch 'master' into clean-overlays-code-1
|
2019-03-28 11:17:29 +09:00 |
|
Dean Herbert
|
d756a5d987
|
Merge pull request #4532 from peppy/update-framework
Update framework
|
2019-03-28 10:50:20 +09:00 |
|
Joseph Madamba
|
cdf79ffe39
|
Merge branch 'master' into clean-overlays-code-1
|
2019-03-27 10:32:13 -07:00 |
|
Dean Herbert
|
842231e820
|
Merge pull request #4541 from nyquillerium/background-test-fix
Fix TestCaseBackgroundScreenBeatmap getting stuck
|
2019-03-27 20:27:32 +09:00 |
|
David Zhao
|
2c059efbab
|
Rename to BlockLoad
|
2019-03-27 17:34:58 +09:00 |
|
David Zhao
|
be62cd9d72
|
Fix TestCaseBackgroundsScreenBeatmap
|
2019-03-27 14:33:50 +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 |
|
Dean Herbert
|
83076e32c7
|
Fix TestWorkingBeatmap not running for times below zero
|
2019-03-26 16:35:34 +09:00 |
|
Dean Herbert
|
b4d785c76c
|
Don't update gameplay loop while paused
|
2019-03-26 13:36:17 +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 |
|
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 |
|
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 |
|
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 |
|
Dan Balasescu
|
ddc0177821
|
Merge pull request #4513 from peppy/update-framework
Update framework
|
2019-03-23 02:40:42 +09:00 |
|
Dean Herbert
|
9a11a08acc
|
Update textbox usages
|
2019-03-23 02:00:27 +09:00 |
|
Dean Herbert
|
97675f6495
|
Update framework
|
2019-03-23 00:55:31 +09:00 |
|
Dean Herbert
|
db89796752
|
Merge remote-tracking branch 'upstream/master' into multi-background-stack
|
2019-03-22 16:05:39 +09:00 |
|
Dean Herbert
|
670c25d5e8
|
Refactor test
|
2019-03-22 16:03:08 +09:00 |
|
Dean Herbert
|
123dbb2c5c
|
Merge pull request #4487 from peppy/pause-logic-simplification
Simplify and centralise pause logic
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
|
2019-03-22 15:28:16 +09:00 |
|
David Zhao
|
c43b1afa30
|
Use is loaded instead
|
2019-03-22 15:23:18 +09:00 |
|
David Zhao
|
8fb4de101f
|
Wait for screen current
|
2019-03-22 15:20:06 +09:00 |
|