30047 Commits

Author	SHA1	Message	Date
Dean Herbert	4edefb935c	Improve the initialisation logic of OsuGameBase.	2016-10-16 17:33:53 +09:00
Adonais Romero González	15c6a563be	Moved ComboResultCounter to right namespace	2016-10-15 22:24:03 -05:00
Adonais Romero González	862dc1d7c7	Tidying code and restricting methods	2016-10-15 19:07:07 -05:00
Adonais Romero González	84dcb63ad2	Changed ComboCounter format... ... ...to improve value management.	2016-10-15 18:06:31 -05:00
Adonais Romero González	10b47859c3	Delay order on StarCounter changed	2016-10-15 18:04:00 -05:00
Adonais Romero González	0ceb72ba42	More refactoring	2016-10-15 15:16:02 -05:00
Adonais Romero González	a15f4cda44	Tidying	2016-10-15 15:03:51 -05:00
Adonais Romero González	c268500f89	Minor variable change	2016-10-15 14:01:11 -05:00
Adonais Romero González	2625d06553	Why calling StopAnimation() on StarCounter's ctor()?	2016-10-15 13:53:39 -05:00
Adonais Romero González	9241287c79	Merge branch 'master' into counters-a	2016-10-15 13:45:55 -05: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
Adonais Romero González	6bd3eaf37d	Changes according to review + Refactor	2016-10-14 18:23:27 -05: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
Adonais Romero González	53cd698b3a	Merge branch 'master' into counters-a	2016-10-13 22:57:24 -05:00
Dean Herbert	6597b09a55	Merge pull request #79 from peppy/general-fixes ... Update framework version.	2016-10-14 12:54:52 +09:00
Adonais Romero González	edbbe8daef	Delete unnecessary class attributes	2016-10-13 22:54:02 -05: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
Adonais Romero González	9ccff6ec48	Tidying up	2016-10-13 19:50:06 -05:00
Adonais Romero González	0deb5b4e22	Removed unneeded vars	2016-10-13 18:07:06 -05:00
Adonais Romero González	69621eb6d3	Star animation delay micro fix	2016-10-13 18:00:36 -05:00
Adonais Romero González	f10a03dcef	Merge with master	2016-10-13 17:20:35 -05:00
Adonais Romero González	ce07a45456	Improved code	2016-10-13 17:13:20 -05: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