1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 09:17:52 +08:00
Commit Graph

75 Commits

Author SHA1 Message Date
smoogipoo
d07a724970 Only allow replay screen changes in menu + songselect 2018-11-30 18:25:54 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Dean Herbert
03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
smoogipoo
e7a5816d27 Use GetAsync for all samples 2018-08-27 17:30:16 +09:00
Dean Herbert
5fc17bacf3 Add "Select" action
Allows progressing forwards in the interface
2018-07-03 18:39:15 +09:00
Dan Balasescu
e5947cc969
Merge branch 'master' into non-null-ruleset 2018-07-02 15:32:55 +09:00
smoogipoo
4070c1a888 Merge remote-tracking branch 'origin/master' into non-null-ruleset
# Conflicts:
#	osu.Game/Screens/Select/FilterControl.cs
2018-07-02 15:05:34 +09:00
Dan Balasescu
2c19790a97
Merge branch 'master' into fix-background-screen-crash 2018-07-02 15:01:59 +09:00
Dean Herbert
b9b1e77172
Merge branch 'master' into allow-back-in-player 2018-06-29 21:54:18 +09:00
Dean Herbert
6a80a21078 Tidy up escape handling 2018-06-29 21:06:38 +09:00
Dean Herbert
4bcc05a7fc Remove null checks on ruleset
Add a default ruleset to `OsuTestCase` to cover testing scenarios.
2018-06-26 18:24:34 +09:00
Dean Herbert
b0a1b25983 Privatise game ruleset and access via DI
Also decouples the bindable at SongSelect, where it is debounced in line with the carousel being updated.
2018-06-26 16:32:32 +09:00
Dean Herbert
b95042e370 Fix background screens not supporting early-exit condition
Closes #2681.
2018-06-20 12:43:48 +09:00
smoogipoo
18fc63bac2 Add back removed using 2018-06-06 20:32:37 +09:00
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