2326 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
smoogipooo	cd1717c42f	More bindables!	2017-03-10 13:49:51 +09:00
smoogipooo	f44fa56646	Merge branch 'general_hud' of https://github.com/smoogipooo/osu into general_hud ... Conflicts: osu.Game.Modes.Osu/OsuRuleset.cs	2017-03-10 13:42:50 +09:00
smoogipooo	2d6e667c7c	Renaming + use IEnumerable.	2017-03-10 13:40:44 +09:00
Dean Herbert	2813484f2e	Merge branch 'master' into general_hud	2017-03-10 13:25:26 +09:00
Dean Herbert	e6f4fe9e61	Merge pull request #458 from Lahvuun/master ... Options sidebar flickering fix.	2017-03-10 13:20:07 +09:00
Dean Herbert	9e223bd77b	Merge pull request #459 from Jorolf/rulesetAndPlayModeRemake ... Added Descriptions to Rulesets + PlayModes list	2017-03-10 13:18:43 +09:00
smoogipooo	4015b87965	General fixes.	2017-03-10 13:09:50 +09:00
smoogipooo	75f004eeb9	Merge branch 'general_hud' of https://github.com/smoogipooo/osu into general_hud	2017-03-10 13:03:26 +09:00
smoogipooo	7c1a3067e6	Oops o_o.	2017-03-10 13:03:13 +09:00
Dan Balasescu	70d91e16d5	Merge branch 'master' into general_hud	2017-03-10 12:49:37 +09:00
smoogipooo	617ceb8001	Rename to StandardComboCounter, add HealthDisplay abstraction.	2017-03-10 12:47:00 +09:00
smoogipooo	31f6cbd8cf	Rename ScoreOverlay -> HUDOverlay, move to osu.Game, make it not overridable by rulesets.	2017-03-10 12:14:13 +09:00
Dean Herbert	69776d436f	Merge pull request #460 from smoogipooo/remove_custom_combocounters ... Remove custom combo counters.	2017-03-10 11:43:00 +09:00
Dean Herbert	2b64de9dd8	Fix using statements.	2017-03-10 11:37:53 +09:00
smoogipooo	fa9110ce6e	Remove custom combo counters.	2017-03-10 11:04:46 +09:00
Jorolf	9dd835e256	didn't see this was unnecessary after my changes	2017-03-09 21:43:11 +01:00
Jorolf	d9a4a677fd	Added Descriptions to Rulesets + PlayModes list	2017-03-09 21:37:03 +01:00
Lahvuun	427a0dd0f5	Options sidebar flickering fix.	2017-03-09 22:29:39 +02:00
Dean Herbert	a266add670	Merge pull request #450 from huoyaoyuan/modselect ... Modselect refactor	2017-03-09 18:16:16 +09:00
Huo Yaoyuan	9007409072	Follow appveyor's code style check.	2017-03-09 16:44:45 +08:00
Dean Herbert	115ebd4773	Merge branch 'master' into modselect	2017-03-09 17:31:25 +09:00
Dean Herbert	ca4c524fae	Merge pull request #456 from peppy/general-fixes ... Update framework.	2017-03-09 17:30:51 +09:00
Huo Yaoyuan	1b182b1361	Fix typo.	2017-03-09 15:55:40 +08:00
Dean Herbert	30de7aa59c	Remove duplicate reference to nunit.	2017-03-09 16:15:33 +09:00
Dean Herbert	dad6060149	Fix warnings not covered by resharper locally.	2017-03-09 16:07:34 +09:00
Dean Herbert	1b532b0741	Fix second mono regression.	2017-03-09 15:53:16 +09:00
Dean Herbert	d7497330b2	Reduce warning/suggestion count to zero.	2017-03-09 15:52:40 +09:00
Dean Herbert	a048e666d7	Fix autoproperty which doesn't work on mono.	2017-03-09 14:26:09 +09:00
Dean Herbert	da751804b6	Reduce error count.	2017-03-09 14:24:16 +09:00
Dean Herbert	149bf7b5fc	Bring dotsettings up-to-date.	2017-03-09 14:03:26 +09:00
Dean Herbert	01c379da19	User invariant culture sorting.	2017-03-09 14:02:20 +09:00
Dean Herbert	3eece390cb	Abstract constructors -> protected.	2017-03-09 14:01:08 +09:00
Dean Herbert	0976e205d8	Remove redundant parentheses.	2017-03-09 14:00:17 +09:00
Dean Herbert	dc5ac6e88f	Add missing access modifiers.	2017-03-09 13:55:29 +09:00
Dean Herbert	9772f2a042	Update framework.	2017-03-09 13:50:33 +09:00
Dean Herbert	0c4c1689b6	Merge branch 'master' into modselect	2017-03-09 12:51:40 +09:00
Dean Herbert	488cc87985	Merge pull request #454 from peppy/ci-improvements ... CI improvements.	2017-03-08 16:06:20 +09:00
Dean Herbert	2821451d5b	Remove unused file.	2017-03-08 16:01:54 +09:00
Dean Herbert	954827aaf3	Update resources.	2017-03-08 15:56:51 +09:00
Dean Herbert	d06bbd5e20	Add appveyor.yml.	2017-03-08 15:53:09 +09:00
Dean Herbert	5a42035f88	Update license headers.	2017-03-08 15:50:52 +09:00
Dean Herbert	b810a43bba	Framework update.	2017-03-08 15:47:40 +09:00
Dean Herbert	abb653a763	Merge pull request #451 from peppy/replay ... Make playfield scaling optional.	2017-03-08 11:55:14 +09:00
Dean Herbert	123c8f3489	Add comment.	2017-03-08 11:54:52 +09:00
Huo Yaoyuan	b3b813c0ae	Follow current mod layout.	2017-03-07 20:05:50 +08:00
Huo Yaoyuan	b19405c987	Allow null in mod list to generate a placeholder ModButton.	2017-03-07 19:52:51 +08:00
Dean Herbert	02cab41d34	Move InputManager to a higher and more implicit level. ... Also makes KeyCounterCollection work with replays.	2017-03-07 19:30:48 +09:00
Huo Yaoyuan	ffd79bee06	Remove inherited mods in incompatible list and add between Auto and NoFail.	2017-03-07 16:27:55 +08:00
Huo Yaoyuan	8979b28496	Remove usages of the 'new' keyword.	2017-03-07 16:17:51 +08:00
Huo Yaoyuan	b56d6c767b	Merge branch 'master' into modselect	2017-03-07 16:10:53 +08:00