h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-21 13:22:57 +08:00
Code Issues Releases Wiki Activity
53,404 Commits 5 Branches 664 Tags 368 MiB
7c680afc3c
Commit Graph

159 Commits

Author SHA1 Message Date
Lucas A
a5f758b977 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-07 18:27:14 +02:00
Lucas A
3ecfa9dcdb Invert partialy activity logic introduced in latest commit 2019-05-07 18:26:34 +02:00
Lucas A
59b8da5c77 Move OsuScreen activity logic to setUserActivity() 2019-05-06 18:37:21 +02:00
Lucas A
a50bbf7f42 Make appveyor happy. 2019-05-05 21:32:23 +02:00
Lucas A
88b8afbb6a Make UserPanel show current user activity when 
user status is online.
 2019-05-05 20:51:55 +02:00
Lucas A
fa986bb5e9 Rework OsuScreen user activity logic 2019-05-05 20:26:56 +02:00
Lucas A
5d4aa5a12e Add ScreenStatus property to change the OsuScreen's status + Renamed old ScreenStatus property to InitialScreenStatus 2019-05-02 20:51:19 +02:00
Lucas A
84b41b3886 Split out setUserStatus() logic to multiple lines. + 
Make UserStatusDoNotDisturb inherit from UserStatus
 2019-05-02 19:44:07 +02:00
Lucas A
a3541339f5 Handle the restoring of the screen status when the user status is changed back to online after having being set to DND / offline via the login overlay 2019-04-30 21:40:44 +02:00
Dean Herbert
6fdcd98caa Don't play screen "back" sample when retrying 2019-04-25 14:15:07 +09:00
Lucas A
5887008fb3
Merge branch 'master' into user-status-wiring 2019-04-15 11:43:53 +02:00
Lucas A
69dda0ffd4 OsuScreens can now set a per screen user status 
which defaults to UserStatusOnline
 2019-04-12 22:36:01 +02:00
smoogipoo
0222424aef Make mods IReadOnlyList<Mod> gamewide 
Prevents potential multiple evaluations of enumerable.
 2019-04-10 17:20:36 +09:00
smoogipoo
4310f07a5c Rename SelectedMods -> Mods 2019-04-10 12:03:57 +09:00
smoogipoo
ad124bfeec Reimplement select mod track adjustments 2019-04-09 12:59:32 +09:00
smoogipoo
c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00
smoogipoo
ca9f172a96 Use var 2019-04-09 12:58:10 +09:00
smoogipoo
93b6cc00df Fix OsuScreenDependencies using the incorrect parent 2019-04-09 12:56:23 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
Jamie Taylor
9b3f2fdd24
Change RelativePositionAxes default on osu! logo to be both 2019-02-20 19:34:55 +09:00
Dan Balasescu
c3ae4d7b14
Improve comment 
Co-Authored-By: peppy <pe@ppy.sh>
 2019-02-13 11:34:48 +09:00
Dean Herbert
e01f342ab0 wip 2019-02-02 17:11:25 +09:00
Dean Herbert
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
Dean Herbert
f85518b175 Don't expose padding 2019-01-31 18:16:28 +09:00
Dean Herbert
b48bb5b792 Move parallax logic out of BackgroundScreenStack 2019-01-31 18:10:33 +09:00
Dean Herbert
beab367e6d Add null checks/allowances 2019-01-31 11:00:33 +09:00
smoogipoo
b5d187c4af Fix post-merge errors 2019-01-29 21:27:32 +09:00
smoogipoo
91302ea0bc Merge remote-tracking branch 'origin/master' into iscreen 
# Conflicts:
#	osu.Game/Screens/Multi/Match/MatchSubScreen.cs
#	osu.Game/Screens/Multi/Multiplayer.cs
#	osu.Game/Screens/Multi/MultiplayerSubScreen.cs
#	osu.Game/Screens/OsuScreen.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
 2019-01-29 21:21:36 +09:00
smoogipoo
7b1c1f3728 Move toolbar showing and overlay activation to OsuGame 
Now exposed through IOsuScreen.
 2019-01-28 15:42:06 +09:00
smoogipoo
117703374e Fix logo animations 2019-01-25 21:02:35 +09:00
smoogipoo
f0e0088f43 Create a custom background stack to fix various background issues 2019-01-25 15:36:22 +09:00
Dean Herbert
787d4da153 Combine constant 2019-01-25 14:10:59 +09:00
smoogipoo
8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
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
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