Dean Herbert
c025158735
Give VisibleState a default rather than nullable
2018-07-06 17:53:06 +09:00
Dean Herbert
5fc17bacf3
Add "Select" action
...
Allows progressing forwards in the interface
2018-07-03 18:39:15 +09:00
Dean Herbert
2aae528e1c
Improve code quality of main menu button system
2018-07-03 18:23:41 +09:00
Dean Herbert
6a80a21078
Tidy up escape handling
2018-06-29 21:06:38 +09:00
Dean Herbert
e6158bc348
Merge remote-tracking branch 'upstream/master' into disallow-beatmap-change
2018-06-07 16:35:07 +09:00
Dean Herbert
f491a18d40
Fix notifications not showing at main osu! logo on menu
2018-06-07 01:49:34 +09:00
Dan Balasescu
c30861186b
Merge branch 'master' into disallow-beatmap-change
2018-06-06 20:26:17 +09:00
smoogipoo
ff60f69f47
Explicitly construct local beatmaps rather than using GetBoundCopy
2018-06-06 20:19:30 +09:00
smoogipoo
72cc53aded
Rename GameBeatmap -> BindableBeatmap
2018-06-06 20:16:20 +09:00
smoogipoo
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
Dean Herbert
9306fec498
Fix missing null checks
2018-06-06 18:21:03 +09:00
Dean Herbert
55921efffb
Rewrite much state logic
2018-06-06 16:17:51 +09:00
Dean Herbert
6be382aab6
Merge branch 'master' into overlay-activation
2018-06-06 10:07:22 +09:00
Dan Balasescu
566470e852
Merge branch 'master' into better-loading-logo
2018-06-04 20:06:22 +09:00
Dean Herbert
4b604bf055
Merge branch 'master' into disallow-beatmap-change
2018-06-04 10:53:04 +09:00
Dean Herbert
3795a55808
Fix menu flashes not extending to the edge of screen during parallax
2018-06-03 22:26:47 +09:00
Aergwyn
f0095193b3
Merge branch 'master' into overlay-activation
2018-06-03 11:52:33 +02:00
Aergwyn
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
Dean Herbert
7487c82ec1
Stop the logo from beating
2018-05-31 17:14:47 +09:00
Dean Herbert
9df173b339
Merge branch 'master' into better-loading-logo
2018-05-31 15:59:04 +09:00
smoogipoo
e48b17fb0d
Unindent
2018-05-31 15:17:59 +09:00
Dean Herbert
9ea6ab28ea
Fix intro potentially starting out-of-sync due to logo's outward animation
2018-05-30 20:22:31 +09:00
Dean Herbert
0caf15166e
Remove unnecessary FinishTransforms
2018-05-30 20:05:31 +09:00
Dean Herbert
0dafcf00b7
Fix some discrepancies with the main menu logo transitions
2018-05-30 19:50:00 +09:00
Aergwyn
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
smoogipoo
8004b8af4d
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
2018-05-23 17:38:02 +09:00
Aergwyn
76fbc656a1
fix disclaimer allowing notifications
2018-05-22 17:53:36 +02:00
Dean Herbert
ef40ca8805
Merge branch 'master' into respect-showoverlay-bindable
2018-05-22 19:00:42 +09:00
Dan Balasescu
99163ca8ba
Merge branch 'master' into fix-main-menu-escape
2018-05-22 18:17:51 +09:00
Aergwyn
cee8d21542
hide overlays when going back to initial menu state
2018-05-21 17:24:57 +02:00
Dean Herbert
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
Aergwyn
b7e3ea348b
expose two Bindables with split logic instead of one with mixed logic
2018-05-21 15:53:55 +02:00
Aergwyn
1482bca147
Rename for better understanding
...
ShowOverlays -> AllowOverlays
ShowOverlaysOnEnter -> HideOverlaysOnEnter
2018-05-21 09:42:29 +02:00
Roman Kapustin
17d1759c37
Get rid of multiple blank lines in a row
2018-05-18 01:01:54 +03:00
Roman Kapustin
81d7e8a393
Resolve merge conflict
2018-05-18 00:25:47 +03:00
DrabWeb
1a78ac3d10
Add Multiplayer screen.
2018-05-15 21:14:10 -03:00
Roman Kapustin
f2f2fb8c73
Use both OnKeyDown and GlobalAction.Back
2018-05-14 22:09:09 +03:00
Roman Kapustin
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
Dean Herbert
f14948c022
Merge branch 'master' into exit-hold-confirmation
2018-05-14 18:13:40 +09:00
DrabWeb
a86843ccc9
Remove unused usings caused by multiplayer folder restructuring.
2018-05-10 20:49:42 -03:00
DrabWeb
bc9ac8f72a
Move multiplayer screens to osu.Game/Screens/Multi/Screens
2018-05-10 20:47:25 -03:00
DrabWeb
c35760fdef
Rename osu.Game/Screens/Multiplayer to Multi.
2018-05-10 20:39:05 -03:00
Dean Herbert
5df9f126d1
Implement a hold-to-confirm screen when exiting game using escape key
2018-05-10 17:07:19 +09:00
Roman Kapustin
44bbb8700e
Handle mouse back button using OnMouseDown override instead of using GlobalAction
2018-05-08 00:22:11 +03:00
TocoToucan
804b59ee80
Handle GlobalAction.Back
2018-04-29 20:15:09 +03:00
Dean Herbert
2d82c0b5cd
Fix logical regression
2018-04-23 16:41:15 +09:00
Dean Herbert
2c9b2aa0e7
Fix intro setting beatmap in background thread causing race conditions
2018-04-22 02:46:20 +09:00
FreezyLemon
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
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
smoogipoo
3f3f57e51e
Use cached vertexbatch add delegate
2018-03-22 15:13:38 +09:00
Dean Herbert
e0b74a357a
Fix osu! logo making hover beat sounds when not visible
2018-03-22 03:31:14 +09:00
smoogipoo
78d73d4c11
Additional fixes for flow ordering after framework changes
2018-03-06 17:20:58 +09:00
smoogipoo
148551afa2
osu!-side changes in-line with framework layout changes
2018-03-06 14:12:37 +09:00
Dean Herbert
6dc9411a90
Don't use BufferedContainer for OsuLogo
...
Minor performance improvement. Not sure why this was done but it's not required any more.
2018-03-01 16:01:42 +09:00
Dean Herbert
d340509b1d
Move ArchiveReaders to a more global namespace
...
Also moves delete and action logic to a shared implementation
2018-02-15 14:22:39 +09:00
Dean Herbert
6ff63c2f0c
Move deletion to ArchiveModelImportManager
2018-02-15 14:22:39 +09:00
Dean Herbert
d8f84fcca3
Give ArchiveReader a filename
2018-02-15 14:22:39 +09:00
Dean Herbert
5e1cd8ddc4
Apply conditionals directly rather than using an in-between property
2018-01-16 20:34:40 +09:00
Dean Herbert
e7a0a02466
Don't limit keyboard input based on menu button scale
2018-01-16 20:34:40 +09:00
Dean Herbert
9b33499fe7
Merge remote-tracking branch 'upstream/master' into RefactorInputQueues
2018-01-16 20:04:34 +09:00
TocoToucan
c3ca40dcff
Local functions related CI fixes
2018-01-15 23:27:00 +03:00
TocoToucan
3c11978cfa
Use local functions
2018-01-15 21:42:17 +03:00
Dean Herbert
0796d33e66
Merge branch 'master' into fix-skipbutton-ordering
2018-01-15 15:54:18 +09:00
Aergwyn
ae1adfd2f2
remove unnecessary empty lines
...
codefactor.io \(o.o)/
also one unnecessary semicolon
2018-01-12 19:30:34 +01:00
smoogipoo
620e125fad
Fix cursor being displayed on intro/disclaimer
2018-01-12 19:34:55 +09:00
smoogipoo
512e4d2c9f
Rewrite the way that cursor overrides are done game-wide
2018-01-12 18:13:17 +09:00
TocoToucan
ae032cbf23
Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties
2018-01-07 23:40:00 +03:00
Dean Herbert
37d393bca0
Update licence headers
2018-01-05 20:21:19 +09:00
Dean Herbert
71a94d6b44
Add a bindable Enabled flag to NotificationManager
...
Also better handles delays before notifications are displayed.
2017-12-25 20:53:23 +09:00
Dean Herbert
ae48b85827
Don't play logo select sample when actions are playing their own
2017-11-26 17:17:47 +09:00
Dean Herbert
07d6a70028
New sound effects with better names
2017-11-26 17:17:46 +09:00
Dean Herbert
aff217cd03
Fix early access to beatmap in LogoVisualisation
...
Missed this one..
2017-11-21 19:47:12 +09:00
Dean Herbert
66f72baa39
Avoid LogoVisualisation accessing the track before it's loaded
2017-11-21 12:42:28 +09:00
Dean Herbert
4f6263ef86
Make many internal classes and methods public
...
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
Dean Herbert
60778593c3
Make pressing space twice at main menu a bit smoother
2017-11-18 22:24:51 +09:00
Dean Herbert
c2d1de34fc
Fix logo not always returning to the correct state when rapidly changing menus
...
Fixes #1005 for real
2017-11-18 11:19:15 +09:00
Dean Herbert
322dd1bd05
Rename variables to make more sense
2017-11-18 10:35:17 +09:00
Dean Herbert
f6ea5b0590
Remove duplicated code
2017-11-18 10:34:17 +09:00
Dean Herbert
8bd59ff0b3
Fix osu! logo occasionally being in the wrong state on entering the main menu
2017-11-17 17:40:10 +09:00
smoogipoo
9344502b71
More warning fixes
2017-11-14 18:05:07 +09:00
smoogipoo
bd7a6a90f5
Remove unused fields
2017-11-14 17:43:19 +09:00
Dean Herbert
49a5af60e2
Fix multiple order-of-execution issues with osu! logo
...
Also sets better defaults.
2017-11-13 18:43:16 +09:00
Dean Herbert
9e82fc21ac
Improve transition when exiting song select
...
Reduces the delay before the main menu appears, but also synchronises the full main menu appearance animation with the logo's apperance.
2017-11-10 01:10:44 +09:00
Dean Herbert
724540ceaa
Fix toolbar not appearing at main menu
2017-11-09 20:38:34 +09:00
Dean Herbert
598e1652dc
Adjust timings
2017-11-09 18:12:33 +09:00
Dean Herbert
6d56b3c2df
Hide triangles during outro
2017-11-09 17:52:38 +09:00
Dean Herbert
e3a868744e
Merge branch 'master' into intro-v2
2017-11-09 17:48:42 +09:00
Dean Herbert
4874371dbf
Rename methods back
2017-11-09 17:38:20 +09:00
Dean Herbert
e2005c4431
Add comment explaining necessity of AlwaysPresent for now
2017-11-08 20:36:18 +09:00
Dean Herbert
df6c808d28
Adjust animation to designer-san's liking
2017-11-08 17:04:36 +09:00
Dean Herbert
cabb22b6d1
Merge branch 'single-osu-logo' into intro-v2
2017-11-08 16:43:07 +09:00
Dean Herbert
c2d4a213b1
Rename logo-related methods
2017-11-08 16:34:03 +09:00
Dean Herbert
7ad498cb29
Remove unused puzzle pieces
2017-11-08 14:45:01 +09:00
Dean Herbert
90fec5f370
Merge branch 'master' into single-osu-logo
2017-11-08 14:37:20 +09:00
Dean Herbert
41fcecf759
Add intro in to actual game
2017-11-08 14:31:11 +09:00
Dean Herbert
d8d7165164
Add a test case which starts the game
2017-11-08 13:52:44 +09:00
Dean Herbert
713d730d10
Simplify restart process and defaults initialisation
2017-11-08 13:32:03 +09:00
Dean Herbert
1771e003f7
Simplify more
2017-11-08 12:13:30 +09:00
Dean Herbert
419f041291
Fix text alignment
2017-11-08 12:12:27 +09:00
Dean Herbert
f83c095269
Simplify more
2017-11-08 12:10:32 +09:00
