RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,267 Commits 3 Branches 659 Tags 362 MiB
Commit Graph

368 Commits

Author SHA1 Message Date
Dean Herbert a1780fddc9 DrawInfo -> DrawColourInfo 2018-09-06 18:02:04 +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
smoogipoo 1b279d383f Use GetAsync on all textures 2018-08-27 17:26:44 +09:00
Dean Herbert 9f3f07df2e Fix notifications appearing too early in load process 2018-08-23 11:21:56 +09:00
Dean Herbert 39aa98d12d Fix logo flying off-screen when exiting game 2018-08-20 14:58:02 +09:00
Dean Herbert 0f37758314 Update framework 2018-07-21 16:21:53 +09:00
Dean Herbert a1a077398c Merge remote-tracking branch 'upstream/master' into peppy-clickable-download-notifications 2018-07-13 21:04:17 +09:00
Dan Balasescu e20cdccf05
Merge branch 'master' into update-disclaimer 2018-07-12 23:41:55 +09:00
Dean Herbert 5df2df9b3a Fix osu! logo handling non-left mouse buttons 2018-07-12 12:36:58 +09:00
Dean Herbert 8bc7c4c9a2 Add TestCase and update disclaimer screen 2018-07-11 16:30:51 +09:00
Dean Herbert 1418d1369f Add the ability to click completed download notifications to select beatmap 
Closes #2731.
 2018-07-11 01:32:10 +09:00
Dean Herbert 0b30e6eb6a Merge remote-tracking branch 'upstream/master' into peppy-improve-button-system 2018-07-06 17:55:02 +09:00
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