6a80a21078
Tidy up escape handling
2018-06-29 21:06:38 +09:00
e6158bc348
Merge remote-tracking branch 'upstream/master' into disallow-beatmap-change
2018-06-07 16:35:07 +09:00
f491a18d40
Fix notifications not showing at main osu! logo on menu
2018-06-07 01:49:34 +09:00
c30861186b
Merge branch 'master' into disallow-beatmap-change
2018-06-06 20:26:17 +09:00
ff60f69f47
Explicitly construct local beatmaps rather than using GetBoundCopy
2018-06-06 20:19:30 +09:00
72cc53aded
Rename GameBeatmap -> BindableBeatmap
2018-06-06 20:16:20 +09:00
4086ff7313
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
# osu.Game/Screens/Menu/Intro.cs
# osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
9306fec498
Fix missing null checks
2018-06-06 18:21:03 +09:00
55921efffb
Rewrite much state logic
2018-06-06 16:17:51 +09:00
6be382aab6
Merge branch 'master' into overlay-activation
2018-06-06 10:07:22 +09:00
566470e852
Merge branch 'master' into better-loading-logo
2018-06-04 20:06:22 +09:00
4b604bf055
Merge branch 'master' into disallow-beatmap-change
2018-06-04 10:53:04 +09:00
3795a55808
Fix menu flashes not extending to the edge of screen during parallax
2018-06-03 22:26:47 +09:00
f0095193b3
Merge branch 'master' into overlay-activation
2018-06-03 11:52:33 +02:00
707af02097
apply feedback
...
-don't directly set AllowOverlay Bindable
this should be done specifically where needed
-remove AllowOverlay Bindable from ButtonSystem
-remove unnecessary xmldoc
2018-06-03 11:31:04 +02:00
7487c82ec1
Stop the logo from beating
2018-05-31 17:14:47 +09:00
9df173b339
Merge branch 'master' into better-loading-logo
2018-05-31 15:59:04 +09:00
e48b17fb0d
Unindent
2018-05-31 15:17:59 +09:00
9ea6ab28ea
Fix intro potentially starting out-of-sync due to logo's outward animation
2018-05-30 20:22:31 +09:00
0caf15166e
Remove unnecessary FinishTransforms
2018-05-30 20:05:31 +09:00
0dafcf00b7
Fix some discrepancies with the main menu logo transitions
2018-05-30 19:50:00 +09:00
2b3a630270
add OverlayActivation enum
...
+ fix Toolbar being toggleable when it shouldn't be able to
+ allow opening overlays in MenuState.Initial again
2018-05-28 13:43:47 +02:00
8004b8af4d
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
2018-05-23 17:38:02 +09:00
76fbc656a1
fix disclaimer allowing notifications
2018-05-22 17:53:36 +02:00
ef40ca8805
Merge branch 'master' into respect-showoverlay-bindable
2018-05-22 19:00:42 +09:00
99163ca8ba
Merge branch 'master' into fix-main-menu-escape
2018-05-22 18:17:51 +09:00
cee8d21542
hide overlays when going back to initial menu state
2018-05-21 17:24:57 +02:00
d109522bf7
Fix escape not working to go backwards in menus before finally exiting the game
...
Resolves #2596 .
2018-05-21 23:09:00 +09:00
b7e3ea348b
expose two Bindables with split logic instead of one with mixed logic
2018-05-21 15:53:55 +02:00
1482bca147
Rename for better understanding
...
ShowOverlays -> AllowOverlays
ShowOverlaysOnEnter -> HideOverlaysOnEnter
2018-05-21 09:42:29 +02:00
17d1759c37
Get rid of multiple blank lines in a row
2018-05-18 01:01:54 +03:00
81d7e8a393
Resolve merge conflict
2018-05-18 00:25:47 +03:00
1a78ac3d10
Add Multiplayer screen.
2018-05-15 21:14:10 -03:00
f2f2fb8c73
Use both OnKeyDown and GlobalAction.Back
2018-05-14 22:09:09 +03:00
e802b722f0
Revert "Handle mouse back button using OnMouseDown override instead of using GlobalAction"
...
This reverts commit 44bbb8700e
2018-05-14 20:27:05 +03:00
f14948c022
Merge branch 'master' into exit-hold-confirmation
2018-05-14 18:13:40 +09:00
a86843ccc9
Remove unused usings caused by multiplayer folder restructuring.
2018-05-10 20:49:42 -03:00
bc9ac8f72a
Move multiplayer screens to osu.Game/Screens/Multi/Screens
2018-05-10 20:47:25 -03:00
c35760fdef
Rename osu.Game/Screens/Multiplayer to Multi.
2018-05-10 20:39:05 -03:00
5df9f126d1
Implement a hold-to-confirm screen when exiting game using escape key
2018-05-10 17:07:19 +09:00
44bbb8700e
Handle mouse back button using OnMouseDown override instead of using GlobalAction
2018-05-08 00:22:11 +03:00
804b59ee80
Handle GlobalAction.Back
2018-04-29 20:15:09 +03:00
2d82c0b5cd
Fix logical regression
2018-04-23 16:41:15 +09:00
2c9b2aa0e7
Fix intro setting beatmap in background thread causing race conditions
2018-04-22 02:46:20 +09:00
3ece54e1c3
make buttons only accept input when expanded
...
both other states are "inactive"/invisible so should never accept keyboard input
2018-04-14 00:08:54 +02:00
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
3f3f57e51e
Use cached vertexbatch add delegate
2018-03-22 15:13:38 +09:00
e0b74a357a
Fix osu! logo making hover beat sounds when not visible
2018-03-22 03:31:14 +09:00
78d73d4c11
Additional fixes for flow ordering after framework changes
2018-03-06 17:20:58 +09:00
148551afa2
osu!-side changes in-line with framework layout changes
2018-03-06 14:12:37 +09:00
