Dan Balasescu
c30861186b
Merge branch 'master' into disallow-beatmap-change
2018-06-06 20:26:17 +09:00
smoogipoo
e77084bec4
Give OsuScreen a mutable BindableBeatmap
2018-06-06 20:19:53 +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
55921efffb
Rewrite much state logic
2018-06-06 16:17:51 +09:00
Dean Herbert
d1fd09ed47
Rename variables
2018-06-06 15:49:27 +09:00
Dean Herbert
6be382aab6
Merge branch 'master' into overlay-activation
2018-06-06 10:07:22 +09:00
Dean Herbert
4b604bf055
Merge branch 'master' into disallow-beatmap-change
2018-06-04 10:53:04 +09:00
Aergwyn
2afe0feb24
remove white space
...
I think
2018-06-03 12:02:43 +02: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
6d6b186fb2
Fix delayed logo animations playing even if screen has already been exited
2018-05-30 19:25:39 +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
a3470f9ec3
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game/Overlays/Music/PlaylistOverlay.cs
# osu.Game/Screens/OsuScreen.cs
2018-05-28 18:01:15 +09:00
Dean Herbert
02c37ebc1f
Move screen titles to OsuScreen
2018-05-28 13:30:24 +09:00
Dean Herbert
7961c56239
Merge remote-tracking branch 'FreezyLemon/master' into smoogipoo-disallow-beatmap-change
2018-05-25 10:55:01 +09:00
Aergwyn
0c0f86fe26
fix incorrect default values keeping overlays in wrong state
2018-05-23 16:25:10 +02:00
smoogipoo
8004b8af4d
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
2018-05-23 17:38:02 +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
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
Roman Kapustin
44bbb8700e
Handle mouse back button using OnMouseDown override instead of using GlobalAction
2018-05-08 00:22:11 +03:00
Roman Kapustin
b08b24b6da
Introduce OsuScreen.AllowBackButton property
2018-05-04 21:18:48 +03:00
TocoToucan
804b59ee80
Handle GlobalAction.Back
2018-04-29 20:15:09 +03:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
Dean Herbert
dd6cf1379e
Reduce parallax effect during gameplay
...
This also cleans up some shared code in OsuScreen.
2018-02-28 11:42:47 +09: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
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
smoogipoo
5f9de399e4
Add keydown override
2017-12-04 11:30:25 +09:00
Dean Herbert
07d6a70028
New sound effects with better names
2017-11-26 17:17:46 +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
11077546d1
Load logo async
2017-11-13 09:50:37 +09:00
Dean Herbert
4874371dbf
Rename methods back
2017-11-09 17:38:20 +09:00
Dean Herbert
c2d4a213b1
Rename logo-related methods
2017-11-08 16:34:03 +09:00
Dean Herbert
a8bacd1ed4
Remove unnecessary private method /shrug
2017-11-08 14:46:47 +09:00
Dean Herbert
6a206c616b
Update in line with framework changes
2017-11-03 14:34:12 +09:00
Dean Herbert
b8b05fe8d2
Make the osu! logo shared game-wide
...
There should only ever be one osu! logo. It is now passed around between screens in a superfluous manner.
2017-11-02 20:38:02 +09:00
Dean Herbert
6fa02ce9bb
Use internal less
...
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
2017-11-01 17:10:54 +09:00
Dean Herbert
09dd0cabd6
Move beatmap/ruleset change restrictions to OsuGame
...
Allows test cases to more freely exist
2017-08-22 15:59:32 +09:00
Huo Yaoyuan
df3f75b842
Merge branch 'master' into fixes
2017-07-31 17:51:34 +08:00
Dean Herbert
fce580d717
Reshuffle namespaces
2017-07-26 13:22:46 +09:00
Huo Yaoyuan
c2e5788ed1
Make OsuScreen.Ruleset protected.
2017-07-24 21:47:31 +08:00
Dean Herbert
d0dea33faa
Make Beatmap (bindable) non-nullable.
2017-07-19 15:16:53 +09:00
Dean Herbert
f168ee660c
Move dummy to BeatmapDatabase
2017-07-19 15:16:43 +09:00
Dean Herbert
3289d93f22
Give the dummy beatmap a background
2017-07-19 15:16:42 +09:00
Dean Herbert
21984ba764
Move DummyWorkingBeatmap to a more global level (OsuScreen)
2017-07-19 15:16:39 +09:00
Dean Herbert
04e99d1369
Only apply disable rules when in a screen stack.
2017-07-12 13:40:17 +09:00
Dean Herbert
9bbcc0526d
Disable beatmap changes in specified screens
2017-07-11 18:39:10 +09:00
Dean Herbert
ee96d39b93
Shuffle sound samples around and make more conformant
2017-06-28 10:19:04 -07:00
Dean Herbert
61fb5d6ac8
Add issue URL to comment
2017-05-31 11:04:18 +09:00
Dean Herbert
b61452024a
Add comment
2017-05-31 11:02:26 +09:00
MrTheMake
0603be5937
Unregister OnBeatmapChanged() when exiting song selection
2017-05-23 15:30:15 +02:00
MrTheMake
5ef7451dba
Improved LEFTand RIGHT key behaviour
2017-05-22 01:53:36 +02:00
Dean Herbert
cf239f4d9c
Move chat into main content
...
Also changes the way parallax is applied to OsuScreens game-wide.
2017-05-12 19:03:21 +09:00
Dean Herbert
5aa90df819
Allow OsuScreens to decide whether ruleset switching should be allowed.
...
Tidies up ToolbarModeSelector a lot by using DI.
2017-04-21 16:03:59 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset.
2017-04-18 16:05:58 +09:00
Huo Yaoyuan
9b1e010dcc
Fix filename mismatch.
2017-04-06 16:05:41 +08:00
