Dean Herbert
|
3b1f83da1d
|
Merge remote-tracking branch 'upstream/master' into correct-preview-loop
|
2019-03-29 10:31:15 +09:00 |
|
Dan Balasescu
|
900c00ba59
|
Merge branch 'master' into drawable-clear-safety
|
2019-03-29 10:14:41 +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
|
83076e32c7
|
Fix TestWorkingBeatmap not running for times below zero
|
2019-03-26 16:35:34 +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
|
fa7a0a0742
|
Merge branch 'master' into drawable-clear-safety
|
2019-03-25 13:58:57 +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
|
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 |
|
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 |
|
David Zhao
|
5169f7a43c
|
Change default for null screen parallax, apply reviews
|
2019-03-24 16:21:43 +09:00 |
|
Dean Herbert
|
11b474e194
|
Handle released for safety
|
2019-03-24 12:19:09 +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 |
|
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 |
|
Dan Balasescu
|
b4954c5a7f
|
Merge branch 'master' into pause-logic-simplification
|
2019-03-22 15:11:34 +09:00 |
|
Dan Balasescu
|
e09c107f38
|
Merge branch 'master' into better-dummy-api
|
2019-03-22 14:51:11 +09:00 |
|
Dean Herbert
|
9e6cdd7bd5
|
Combine conditionals and clarify comment
|
2019-03-22 14:42:51 +09:00 |
|
Dean Herbert
|
5b8fd6822e
|
Move storyboard logic region down
|
2019-03-22 14:39:20 +09:00 |
|
Dan Balasescu
|
a9975e845c
|
Merge branch 'master' into upgrade-nuget-packages
|
2019-03-22 14:37:58 +09:00 |
|
Dean Herbert
|
59d0996c8d
|
Cleanup other instance of same function
|
2019-03-22 14:31:54 +09:00 |
|
smoogipoo
|
860999ad29
|
Cleanup
|
2019-03-22 14:20:53 +09:00 |
|
Dan Balasescu
|
5de99f3f5b
|
Merge branch 'master' into fix-random-select-crash
|
2019-03-22 14:11:06 +09:00 |
|
David Zhao
|
dcae86e39a
|
Add a new test for OsuScreenStack, fix parallax
|
2019-03-22 14:10:38 +09:00 |
|
Dean Herbert
|
dc004910d7
|
Fix AccountCreationOverlay tests and better complete dummy api's behaviour
|
2019-03-22 11:55:35 +09:00 |
|
Joseph Madamba
|
d5272a83cf
|
Rename "urgent" to "topMost"
|
2019-03-21 11:16:10 -07:00 |
|
Dean Herbert
|
d6f17a5ecd
|
Bring nuget packages up to date
|
2019-03-22 02:41:21 +09:00 |
|
Dean Herbert
|
37010f97d7
|
Fix random select crashing
Closes #3383.
|
2019-03-21 21:02:54 +09:00 |
|
Dean Herbert
|
a10e43410a
|
Fix song select potentially starting play before the carousel (and bindables) have been initialised
|
2019-03-21 20:52:34 +09:00 |
|
Dean Herbert
|
4789aa81cb
|
Add an explicit flag for tracking song select's bindable binding
Not required (this change does not affect logic) but improves clarity.
|
2019-03-21 20:52:15 +09:00 |
|
Dean Herbert
|
96dba6a20d
|
Move nested method to bottom of class
|
2019-03-21 20:51:21 +09:00 |
|
Dean Herbert
|
e2503888a4
|
Expose carousel's loaded flag
|
2019-03-21 20:51:06 +09:00 |
|
Dean Herbert
|
15f9a6b9df
|
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
|
2019-03-21 16:04:18 +09:00 |
|
David Zhao
|
ee0d7b6c6d
|
Merge remote-tracking branch 'upstream/master' into multi-background-stack
|
2019-03-21 15:35:14 +09:00 |
|
Dean Herbert
|
c555019692
|
Update framework
|
2019-03-20 22:50:50 +09:00 |
|
Dean Herbert
|
67a65b80fc
|
Merge branch 'master' into visual-settings-container
|
2019-03-20 20:48:30 +09:00 |
|
Dean Herbert
|
298c98871d
|
Actually add the background
|
2019-03-20 20:18:08 +09:00 |
|
Dean Herbert
|
ba89bfee0c
|
Define explicit method to add background
Also cleans up some redundant/misplaced comments.
|
2019-03-20 20:16:45 +09:00 |
|
Dean Herbert
|
8865d53992
|
Reword comment
|
2019-03-20 20:04:07 +09:00 |
|
David Zhao
|
2e9d823af4
|
Add comment regarding HandlePositionalInput
|
2019-03-20 19:59:54 +09:00 |
|