279 Commits

Author	SHA1	Message	Date
Dean Herbert	bfbc26738c	Merged branch master into round_masking	2016-10-17 12:08:31 +09:00
Lunar Dust	8e47d72f93	Reorder ToolbarButton instantiation for consistency ... Might as start good standards now rather than later	2016-10-16 18:42:40 -05:00
Thomas Müller	53076f6446	Modify osu! logo to use new CircularContainer.	2016-10-16 19:26:56 +02:00
Thomas Müller	fec127eb8c	Merge branch 'master' of github.com:ppy/osu into unified_shader ... # Conflicts: # osu-framework # osu.Game/Overlays/Options.cs	2016-10-16 15:17:24 +02:00
Dean Herbert	02dc8dc167	Change the way VolumeControl handles global input.	2016-10-16 21:57:15 +09:00
Thomas Müller	b3e531b98c	Remove implementation of WedgedBox and use Shear transformation instead.	2016-10-16 14:10:24 +02:00
Thomas Müller	7751a85e14	Update framework.	2016-10-16 14:10:06 +02:00
Dean Herbert	620c4e6ab7	Merge remote-tracking branch 'refs/remotes/upstream/master' into general-fixes	2016-10-16 18:24:10 +09:00
Huo Yaoyuan	f4c381f745	Use OverlayContainer in framework.	2016-10-16 17:14:17 +08:00
Dean Herbert	4edefb935c	Improve the initialisation logic of OsuGameBase.	2016-10-16 17:33:53 +09:00
Dean Herbert	7a4bbb6921	Merge pull request #80 from autismpp/logger ... Replace Console.WriteLine with Logger.Log.	2016-10-15 23:02:24 +09:00
Thomas Müller	1d8ff5fe46	Use circular hover region for osu! logo.	2016-10-15 15:31:16 +02:00
autismpp	7276038ca7	Replace Console.WriteLine with Logger.Log.	2016-10-15 06:13:50 +03:00
Dean Herbert	123d92f5b9	Merge pull request #71 from huoyaoyuan/tidy-up ... Strongly type specifications	2016-10-14 18:57:42 +09:00
Huo Yaoyuan	cb54d33c6e	Make converter instance per-convert.	2016-10-14 17:48:07 +08:00
Dean Herbert	c3b745bfef	Merge pull request #57 from UselessToucan/VolumeControl ... VolumeControl: add controls for Effects and Music	2016-10-14 15:50:45 +09:00
TocoToucan	ade925937a	Set text position using Origin property	2016-10-14 09:46:40 +03:00
Dean Herbert	6597b09a55	Merge pull request #79 from peppy/general-fixes ... Update framework version.	2016-10-14 12:54:52 +09:00
Dean Herbert	8c7ff58310	Fix regressions caused by overlay class.	2016-10-14 12:50:03 +09:00
John Leuenhagen	fedfb8a22a	Converted all .cs files to use CRLF line endings.	2016-10-13 23:33:58 -04:00
Dean Herbert	b425d14ea1	Merge pull request #73 from huoyaoyuan/overlay ... Overlay proposals	2016-10-14 10:49:13 +09:00
Huo Yaoyuan	254cc87578	Use name ToggleVisibility.	2016-10-14 05:02:13 +08:00
TocoToucan	8cca8861fa	Fix formatting	2016-10-13 19:11:51 +03:00
TocoToucan	7d27406131	Fix merge conflict in osu.Game/osu.Game.csproj	2016-10-13 18:23:50 +03:00
Huo Yaoyuan	1c97edaac2	Base class for overlays.	2016-10-13 23:04:57 +08:00
TocoToucan	d5cb331eb3	Unsubscribe from ValueChanged events	2016-10-13 17:52:49 +03:00
Drew DeVault	25d08c8e2c	Improve beatmap loading and hydration	2016-10-13 10:29:30 -04:00
Huo Yaoyuan	c93a440d3b	Make Options:IStateful.	2016-10-13 22:27:37 +08:00
Huo Yaoyuan	acd54d1ebc	Single Visibility enum type.	2016-10-13 22:22:27 +08:00
Drew DeVault	fd10e6e582	Copy imported beatmaps into beatmap storage	2016-10-13 10:15:08 -04:00
Huo Yaoyuan	ac66c08991	Make converter per-instance.	2016-10-13 21:55:49 +08:00
Huo Yaoyuan	aad5c6a44d	Use DateTimeOffset for message timestamp.	2016-10-13 21:42:51 +08:00
Huo Yaoyuan	45a9249306	Move implementation of HitRender.Converter to base class using an abstract Converter property.	2016-10-13 21:14:18 +08:00
Huo Yaoyuan	80d5fa7243	Specify HitObjectConvertException.	2016-10-13 20:53:42 +08:00
Dean Herbert	5e3e949fd6	Revert all counter commits. Requires much further review.	2016-10-13 14:45:41 +09:00
Dean Herbert	fde3ab420a	Merge branch 'master' ... Conflicts: osu.Game/osu.Game.csproj	2016-10-13 12:23:36 +09:00
Dean Herbert	edd8f3871e	Add TODO regarding parsing.	2016-10-13 12:19:20 +09:00
Drew DeVault	65e3e13aa2	Fix reference paths in osu.Game.csproj	2016-10-13 12:19:15 +09:00
Drew DeVault	deff5ad61e	Use @strings where appropriate	2016-10-13 12:19:10 +09:00
Drew DeVault	dd86e75ea7	Minor fixes	2016-10-13 12:19:06 +09:00
Drew DeVault	ddac0e8c8f	Update osu-framework	2016-10-13 12:18:23 +09:00
Drew DeVault	45c0bc5428	Import beatmaps into the database via IPC	2016-10-13 12:18:17 +09:00
Drew DeVault	3a163de0f7	Follow changes to osu-framework	2016-10-13 12:18:10 +09:00
Drew DeVault	94f2898f52	Implement beatmap sending/receiving over IPC	2016-10-13 12:18:04 +09:00
Drew DeVault	c7d12bc072	Remove unnecessary setters	2016-10-13 12:17:58 +09:00
Drew DeVault	880399f5a5	Fix casing on private properties	2016-10-13 12:17:52 +09:00
Drew DeVault	dc4bd48f29	Fix casing issues ... Cheers @RemieRichards	2016-10-13 12:17:46 +09:00
Drew DeVault	c39179d299	Add test for hit objects	2016-10-13 12:17:40 +09:00
Drew DeVault	7a4501323b	Decode beatmap colours	2016-10-13 12:17:35 +09:00
Drew DeVault	c0022f3515	Add more tests for legacy decoder	2016-10-13 12:17:31 +09:00