Commit Graph

107 Commits

Author SHA1 Message Date
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
9b3f2fdd24 Change RelativePositionAxes default on osu! logo to be both 2019-02-20 19:34:55 +09:00
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
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
7b1c1f3728 Move toolbar showing and overlay activation to OsuGame
Now exposed through IOsuScreen.
2019-01-28 15:42:06 +09:00
50a384e19c Fix game not exiting 2019-01-24 20:13:19 +09:00
8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
3953f829c8 Add letterbox/screen scaling support 2019-01-04 13:36:02 +09:00
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
e7a5816d27 Use GetAsync for all samples 2018-08-27 17:30:16 +09:00
c30861186b Merge branch 'master' into disallow-beatmap-change 2018-06-06 20:26:17 +09:00
ff60f69f47 Explicitly construct local beatmaps rather than using GetBoundCopy 2018-06-06 20:19:30 +09:00
72cc53aded Rename GameBeatmap -> BindableBeatmap 2018-06-06 20:16:20 +09:00
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
55921efffb Rewrite much state logic 2018-06-06 16:17:51 +09:00
6be382aab6 Merge branch 'master' into overlay-activation 2018-06-06 10:07:22 +09:00
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
9ea6ab28ea Fix intro potentially starting out-of-sync due to logo's outward animation 2018-05-30 20:22:31 +09:00
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
8004b8af4d Privatise the OsuGame beatmap, add local beatmap to OsuTestCase 2018-05-23 17:38:02 +09:00
b7e3ea348b expose two Bindables with split logic instead of one with mixed logic 2018-05-21 15:53:55 +02:00
1482bca147 Rename for better understanding
ShowOverlays -> AllowOverlays
ShowOverlaysOnEnter -> HideOverlaysOnEnter
2018-05-21 09:42:29 +02:00
2d82c0b5cd Fix logical regression 2018-04-23 16:41:15 +09:00
2c9b2aa0e7 Fix intro setting beatmap in background thread causing race conditions 2018-04-22 02:46:20 +09:00
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
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
6ff63c2f0c Move deletion to ArchiveModelImportManager 2018-02-15 14:22:39 +09:00
d8f84fcca3 Give ArchiveReader a filename 2018-02-15 14:22:39 +09:00
620e125fad Fix cursor being displayed on intro/disclaimer 2018-01-12 19:34:55 +09:00
512e4d2c9f Rewrite the way that cursor overrides are done game-wide 2018-01-12 18:13:17 +09:00
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
71a94d6b44 Add a bindable Enabled flag to NotificationManager
Also better handles delays before notifications are displayed.
2017-12-25 20:53:23 +09:00
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
9344502b71 More warning fixes 2017-11-14 18:05:07 +09:00
bd7a6a90f5 Remove unused fields 2017-11-14 17:43:19 +09:00
49a5af60e2 Fix multiple order-of-execution issues with osu! logo
Also sets better defaults.
2017-11-13 18:43:16 +09:00
6d56b3c2df Hide triangles during outro 2017-11-09 17:52:38 +09:00
e3a868744e Merge branch 'master' into intro-v2 2017-11-09 17:48:42 +09:00
4874371dbf Rename methods back 2017-11-09 17:38:20 +09:00
cabb22b6d1 Merge branch 'single-osu-logo' into intro-v2 2017-11-08 16:43:07 +09:00
c2d4a213b1 Rename logo-related methods 2017-11-08 16:34:03 +09:00
90fec5f370 Merge branch 'master' into single-osu-logo 2017-11-08 14:37:20 +09:00
41fcecf759 Add intro in to actual game 2017-11-08 14:31:11 +09:00
552a361a24 Merge remote-tracking branch 'upstream/master' into intro-v2 2017-11-08 11:08:42 +09:00
1afe2c18be Fix osu! deleting beatmaps on startup if MenuMusic is disabled 2017-11-04 19:42:28 +03:00
2f205d1f63 Merge branch 'single-osu-logo' into intro-v2 2017-11-03 15:37:24 +09:00
8f78d84ad6 Make intro resume slower 2017-11-02 21:52:23 +09:00