|
|
fee260fa03
|
remove empty argument list
|
2019-03-25 06:05:57 +08:00 |
|
|
|
01ce8f161e
|
make scaling container background use BackgroundScreenStack with BackgroundScreenDefault
|
2019-03-25 05:49:57 +08:00 |
|
|
|
06fd735190
|
Merge pull request #2 from ppy/master
merge from upstream-master
|
2019-03-24 15:02:28 +08:00 |
|
|
|
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 |
|
|
|
11b474e194
|
Handle released for safety
|
2019-03-24 12:19:09 +09:00 |
|
|
|
1e0027e4f2
|
Fix test
|
2019-03-24 12:09:18 +09:00 |
|
|
|
0d72104235
|
Refactor for formatting sanity
|
2019-03-24 12:03:06 +09:00 |
|
|
|
8ad19fc2d4
|
Merge branch 'master' into menu-globalaction-select
|
2019-03-24 11:58:52 +09:00 |
|
|
|
ddc0177821
|
Merge pull request #4513 from peppy/update-framework
Update framework
|
2019-03-23 02:40:42 +09:00 |
|
|
|
9a11a08acc
|
Update textbox usages
|
2019-03-23 02:00:27 +09:00 |
|
|
|
97675f6495
|
Update framework
|
2019-03-23 00:55:31 +09:00 |
|
|
|
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 |
|
|
|
b4954c5a7f
|
Merge branch 'master' into pause-logic-simplification
|
2019-03-22 15:11:34 +09:00 |
|
|
|
9d32b97b81
|
Merge pull request #4511 from peppy/better-dummy-api
Fix AccountCreationOverlay tests and better complete dummy api's behaviour
|
2019-03-22 15:11:29 +09:00 |
|
|
|
e09c107f38
|
Merge branch 'master' into better-dummy-api
|
2019-03-22 14:51:11 +09:00 |
|
|
|
118ddb7ba6
|
Merge pull request #4508 from peppy/upgrade-nuget-packages
Bring nuget packages up to date
|
2019-03-22 14:51:03 +09:00 |
|
|
|
9e6cdd7bd5
|
Combine conditionals and clarify comment
|
2019-03-22 14:42:51 +09:00 |
|
|
|
5b8fd6822e
|
Move storyboard logic region down
|
2019-03-22 14:39:20 +09:00 |
|
|
|
a9975e845c
|
Merge branch 'master' into upgrade-nuget-packages
|
2019-03-22 14:37:58 +09:00 |
|
|
|
a95b3c8685
|
Merge pull request #4505 from peppy/fix-random-select-crash
Fix random select crashing
|
2019-03-22 14:36:20 +09:00 |
|
|
|
59d0996c8d
|
Cleanup other instance of same function
|
2019-03-22 14:31:54 +09:00 |
|
|
|
860999ad29
|
Cleanup
|
2019-03-22 14:20:53 +09:00 |
|
|
|
5de99f3f5b
|
Merge branch 'master' into fix-random-select-crash
|
2019-03-22 14:11:06 +09:00 |
|
|
|
5e909096c3
|
Merge pull request #4504 from peppy/fix-song-select-bindable-issues
Fix song select bindable crashes
|
2019-03-22 14:10:26 +09:00 |
|
|
|
c383705fe6
|
Merge branch 'master' into fix-song-select-bindable-issues
|
2019-03-22 13:57:13 +09:00 |
|
|
|
4fa6afdb1f
|
Merge pull request #4497 from peppy/fix-editor-cursor
Fix gameplay cursor showing in editor
|
2019-03-22 13:14:07 +09:00 |
|
|
|
e40f77cbeb
|
Merge branch 'master' into fix-editor-cursor
|
2019-03-22 12:36:36 +09:00 |
|
|
|
dc004910d7
|
Fix AccountCreationOverlay tests and better complete dummy api's behaviour
|
2019-03-22 11:55:35 +09:00 |
|
|
|
d6f17a5ecd
|
Bring nuget packages up to date
|
2019-03-22 02:41:21 +09:00 |
|
|
|
37010f97d7
|
Fix random select crashing
Closes #3383.
|
2019-03-21 21:02:54 +09:00 |
|
|
|
a10e43410a
|
Fix song select potentially starting play before the carousel (and bindables) have been initialised
|
2019-03-21 20:52:34 +09:00 |
|
|
|
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 |
|
|
|
96dba6a20d
|
Move nested method to bottom of class
|
2019-03-21 20:51:21 +09:00 |
|
|
|
e2503888a4
|
Expose carousel's loaded flag
|
2019-03-21 20:51:06 +09:00 |
|
|
|
aa1dfdd663
|
Extract logic shared between tests
|
2019-03-21 16:33:34 +09:00 |
|
|
|
b17c5c0bb3
|
Add more tests for exitability
|
2019-03-21 16:12:14 +09:00 |
|
|
|
15f9a6b9df
|
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
|
2019-03-21 16:04:18 +09:00 |
|
|
|
6058f994e1
|
Merge pull request #4500 from peppy/update-framework
Update framework
|
2019-03-20 23:59:45 +09:00 |
|
|
|
c555019692
|
Update framework
|
2019-03-20 22:50:50 +09:00 |
|
|
|
42cb80e068
|
Merge pull request #4466 from nyquillerium/visual-settings-container
Move user blurring logic into UserDimContainer
|
2019-03-20 22:22:11 +09:00 |
|
|
|
67a65b80fc
|
Merge branch 'master' into visual-settings-container
|
2019-03-20 20:48:30 +09:00 |
|
|
|
6a7ab6a001
|
Do less import work in [SetUp] step
|
2019-03-20 20:47:25 +09:00 |
|
|
|
298c98871d
|
Actually add the background
|
2019-03-20 20:18:08 +09:00 |
|
|
|
ba89bfee0c
|
Define explicit method to add background
Also cleans up some redundant/misplaced comments.
|
2019-03-20 20:16:45 +09:00 |
|
|
|
8865d53992
|
Reword comment
|
2019-03-20 20:04:07 +09:00 |
|
|
|
2e9d823af4
|
Add comment regarding HandlePositionalInput
|
2019-03-20 19:59:54 +09:00 |
|
|
|
2ff7aa6c2e
|
Remove handle positional input
|
2019-03-20 19:49:37 +09:00 |
|
|
|
bc6e8ce7b4
|
Merge branch 'visual-settings-container' of https://github.com/nyquillerium/osu into visual-settings-container
|
2019-03-20 19:48:57 +09:00 |
|
|
|
01f795b046
|
Make restart public rather than reimplementing
|
2019-03-20 19:45:04 +09:00 |
|
|
|
8543e8c36f
|
Put loadcomplete next to other protected overrides
|
2019-03-20 19:42:39 +09:00 |
|
