1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 09:02:56 +08:00
Commit Graph

17489 Commits

Author SHA1 Message Date
Dean Herbert
650a5c993a Add test 2019-03-25 20:31:55 +09:00
Dean Herbert
57b3b7b54b Add back resume overlay 2019-03-25 20:31:55 +09:00
Dean Herbert
a694626cc6 Add proper resume request logic 2019-03-25 20:31:55 +09:00
Dean Herbert
8ad4009c33 osu! resume overlay 2019-03-25 20:31:55 +09:00
Dean Herbert
bc16a82494 Move osu! cursor to its own class 2019-03-25 14:19: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
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
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
Dan Balasescu
b4954c5a7f
Merge branch 'master' into pause-logic-simplification 2019-03-22 15:11:34 +09:00
Dan Balasescu
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
Dan Balasescu
e09c107f38
Merge branch 'master' into better-dummy-api 2019-03-22 14:51:11 +09:00
Dan Balasescu
118ddb7ba6
Merge pull request #4508 from peppy/upgrade-nuget-packages
Bring nuget packages up to date
2019-03-22 14:51:03 +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
Dan Balasescu
a95b3c8685
Merge pull request #4505 from peppy/fix-random-select-crash
Fix random select crashing
2019-03-22 14:36:20 +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
Dan Balasescu
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
Dan Balasescu
c383705fe6
Merge branch 'master' into fix-song-select-bindable-issues 2019-03-22 13:57:13 +09:00
Dan Balasescu
4fa6afdb1f
Merge pull request #4497 from peppy/fix-editor-cursor
Fix gameplay cursor showing in editor
2019-03-22 13:14:07 +09:00
Dan Balasescu
e40f77cbeb
Merge branch 'master' into fix-editor-cursor 2019-03-22 12:36:36 +09:00
Dean Herbert
dc004910d7 Fix AccountCreationOverlay tests and better complete dummy api's behaviour 2019-03-22 11:55:35 +09: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
aa1dfdd663 Extract logic shared between tests 2019-03-21 16:33:34 +09:00
Dean Herbert
b17c5c0bb3 Add more tests for exitability 2019-03-21 16:12:14 +09:00
Dean Herbert
15f9a6b9df Merge remote-tracking branch 'upstream/master' into pause-logic-simplification 2019-03-21 16:04:18 +09:00
Dean Herbert
6058f994e1
Merge pull request #4500 from peppy/update-framework
Update framework
2019-03-20 23:59:45 +09:00
Dean Herbert
c555019692 Update framework 2019-03-20 22:50:50 +09:00
Dean Herbert
42cb80e068
Merge pull request #4466 from nyquillerium/visual-settings-container
Move user blurring logic into UserDimContainer
2019-03-20 22:22:11 +09:00
Dean Herbert
67a65b80fc
Merge branch 'master' into visual-settings-container 2019-03-20 20:48:30 +09:00
Dean Herbert
6a7ab6a001 Do less import work in [SetUp] step 2019-03-20 20:47:25 +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
David Zhao
2ff7aa6c2e Remove handle positional input 2019-03-20 19:49:37 +09:00
David Zhao
bc6e8ce7b4 Merge branch 'visual-settings-container' of https://github.com/nyquillerium/osu into visual-settings-container 2019-03-20 19:48:57 +09:00