Commit Graph

76 Commits

Author SHA1 Message Date
ee8b678989 Fix volume controls handling mouse wheel at a higher level than anything else game-wide. 2016-10-26 18:45:48 +09:00
9021042d93 Fix CircularContainer usage. 2016-10-22 18:40:04 +09:00
28a41dcca6 Fix FlowContainers. 2016-10-22 18:05:46 +09:00
cdef75c98b Fix AutoSize references. 2016-10-22 17:50:42 +09:00
68476eafb9 Use DrawSize instead of Size whereever Size was previously read due to framework changes.
Note, that this was just stupid replacement. Many components will likely want to actually read Size and not DrawSize. We may want to do a pass over this at some point, but for now everything is working like this. (Old behavior.)
2016-10-18 18:53:31 +02:00
53076f6446 Modify osu! logo to use new CircularContainer. 2016-10-16 19:26:56 +02:00
b3e531b98c Remove implementation of WedgedBox and use Shear transformation instead. 2016-10-16 14:10:24 +02:00
7751a85e14 Update framework. 2016-10-16 14:10:06 +02:00
1d8ff5fe46 Use circular hover region for osu! logo. 2016-10-15 15:31:16 +02:00
254cc87578 Use name ToggleVisibility. 2016-10-14 05:02:13 +08:00
1c97edaac2 Base class for overlays. 2016-10-13 23:04:57 +08:00
c93a440d3b Make Options:IStateful. 2016-10-13 22:27:37 +08:00
aa96d98822 Merge branch 'master' into limit-game-access
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs
	osu.Game/GameModes/Menu/ButtonSystem.cs
	osu.Game/Online/Chat/Display/ChatLine.cs
	osu.Game/OsuGame.cs
	osu.Game/Overlays/ToolbarButton.cs
2016-10-12 20:44:33 +09:00
29d223dc41 Update framework and simplify some references. 2016-10-12 19:52:49 +09:00
b2c31d3047 Updates post-master-merge. 2016-10-12 16:01:23 +09:00
4052a665bf Remove all non-load Game access. 2016-10-12 15:47:08 +09:00
af76dc09d3 Move direction declaration to usage. 2016-10-12 15:33:04 +09:00
f737090c6b Make CentreTarget public. 2016-10-12 15:28:28 +09:00
79b62d4373 Merge remote-tracking branch 'refs/remotes/upstream/master'
Conflicts:
	osu-framework
	osu.Desktop.VisualTests/Program.cs
2016-10-12 15:20:23 +09:00
c0ea061bd4 Update framework; amend ToolbarButton to use padding and Children initialiser. 2016-10-12 12:24:07 +09:00
9ed0748d73 No need to enforce scheduling of task anymore. 2016-10-09 15:40:32 +02:00
25de055802 Merge branch 'master' into stateful-drawables
Conflicts:
	osu.Game/GameModes/Menu/Intro.cs
2016-10-09 22:08:32 +09:00
bcb5a02221 Don't rely on return value of Container.Add. 2016-10-09 20:06:20 +09:00
99c8f618af Don't rely on return value of Container.Add. 2016-10-09 11:55:52 +02:00
926c46dbd4 Code formatting and slight changes to transitions. 2016-10-08 23:27:53 +09:00
9594b7193c Standardise drawable state access and split large nested classes out of MainMenu.ButtonSystem 2016-10-08 23:27:46 +09:00
1e9e52aecc osuLogo handles less keys. 2016-10-08 19:23:21 +09:00
0c793dfe69 Use own Scheduler instead of Game.Scheduler. 2016-10-08 11:33:24 +02:00
93f326bb9b Fix welcome sound being played twice. 2016-10-08 15:54:08 +09:00
243d2cdec5 Block window closing while intro is playing. 2016-10-08 15:54:07 +09:00
08728b84d1 Make sure intro can't be exited unless the main menu has displayed once. 2016-10-08 15:54:06 +09:00
c5228b63cb Unify and smiplify exit logic. Now only OsuGame calls the final Exit. 2016-10-08 15:54:05 +09:00
c5ac851ba9 Add the ability to exit the game using escape. 2016-10-08 15:54:05 +09:00
b2d899feb5 Add basic intro sequence. 2016-10-08 15:54:04 +09:00
d1dfa120d1 Move BackgroundModes to their own files. 2016-10-08 15:53:57 +09:00
d6042bd689 Add intro and begin to create central logic nest. 2016-10-08 15:53:56 +09:00
a23ca25e7d Remove unusable "tests" button from main menu system. 2016-10-08 15:53:54 +09:00
75c97a62e3 Add main menu music back. 2016-10-08 15:53:53 +09:00
c0f25a2683 Improve white-boxed game modes. 2016-10-05 20:08:58 +09:00
4eb310c3a5 Remove unused button state. 2016-10-05 20:07:15 +09:00
03aea04a00 Add BackgroundMode stack. 2016-10-05 20:06:55 +09:00
11403a922a Make Home, Settings and PlayMode buttons work. 2016-10-04 17:15:03 +09:00
ddcd5ec286 Add basic layout for toolbar. 2016-10-03 20:39:32 +09:00
ac16bffe49 Bring framework and resources up-to-date. 2016-10-01 19:05:26 +09:00
af91341704 Remove unused variable. 2016-10-01 17:03:47 +09:00
5afb038025 Use explicit cast to OsuGame rather than in-between derived classes.
# Conflicts:
#	osu.Game/GameModes/Menu/MainMenu.cs
2016-10-01 17:02:57 +09:00
40e5a449bf Add parallax to ButtonSystem. 2016-10-01 17:02:20 +09:00
4ad618abc9 Adjust scale and outwards transition of ButtonSystem. 2016-10-01 17:02:01 +09:00
463f606004 Add delay for exit process. 2016-09-30 13:31:05 +09:00
357c94ed8a Add OsuGameMode. Standardise naming of classes. 2016-09-30 13:30:55 +09:00