2220 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	ecdbcb20cf	Fix error-level inspections.	2017-03-07 13:52:47 +09:00
Dean Herbert	3e4cd0dc7c	Merge remote-tracking branch 'upstream/master' into less-mods-enum ... # Conflicts: # osu.Game.Modes.Mania/ManiaMod.cs # osu.Game.Modes.Osu/OsuMod.cs # osu.Game/Modes/Mod.cs	2017-03-07 13:42:50 +09:00
Dean Herbert	688388333b	Merge pull request #449 from peppy/increase-ci-strictness ... Raise warnings on unnecessary using statements.	2017-03-07 13:37:54 +09:00
Dean Herbert	1751532a01	Fix a few regressions.	2017-03-07 13:30:36 +09:00
Dean Herbert	0199181cce	Update framework.	2017-03-07 13:17:55 +09:00
Dean Herbert	0cad5d7d41	Fix most warnings.	2017-03-07 13:05:57 +09:00
Dean Herbert	9106c45858	Fix remaining errors.	2017-03-07 10:42:59 +09:00
Dean Herbert	2198fab7f3	Update framework.	2017-03-07 10:19:02 +09:00
Dean Herbert	39ff68a812	Add missing IncompatibleMods.	2017-03-07 09:16:47 +09:00
Thomas Müller	9b92e99ce9	Merge branch 'master' into increase-ci-strictness	2017-03-06 21:44:39 +01:00
Thomas Müller	f0126e8c76	Merge pull request #446 from peppy/options-footer ... Options footer	2017-03-06 21:44:19 +01:00
Thomas Müller	6e9c4a4251	Merge branch 'master' into options-footer	2017-03-06 20:01:51 +01:00
Thomas Müller	1fdf865c88	Update framework	2017-03-06 20:01:36 +01:00
Thomas Müller	2d7d499f3d	Merge pull request #447 from peppy/general-fixes ... General fixes	2017-03-06 20:01:08 +01:00
Thomas Müller	9fd16be2d4	Refactor IsDebug	2017-03-06 19:59:29 +01:00
Dean Herbert	b55a579d15	Fix typo.	2017-03-06 23:00:21 +09:00
Dean Herbert	57cbecba83	Required changes for framework merge (https://github.com/ppy/osu-framework/pull/554).	2017-03-06 22:08:02 +09:00
Dean Herbert	dcc7386609	Add option toggle for debug cached setting.	2017-03-06 22:07:46 +09:00
Dean Herbert	f5c27d99a4	Add error handling to import process (resolves await warning).	2017-03-06 19:59:40 +09:00
Dean Herbert	c24a4f57d9	Raise errors on unnecessary using statements.	2017-03-06 19:15:47 +09:00
Dean Herbert	1e48b0a037	Ensure AssemblyName is never null (seems to be on CI server).	2017-03-06 19:00:15 +09:00
Dean Herbert	88f3dc0e02	Fix a few naming issues.	2017-03-06 18:49:23 +09:00
Dean Herbert	12a3b1414f	Add sane defaults for abstract Mod class and remove remaining use of enum.	2017-03-06 18:29:19 +09:00
Dean Herbert	45f500920c	Don't use Mods enum for handling incompatible mods.	2017-03-06 18:29:17 +09:00
Dean Herbert	463c887879	Fix WaveOverlayContainer staying visible when hidden.	2017-03-06 17:32:13 +09:00
Dean Herbert	9908c1905d	Add keyboard shortcuts at song select for mod/random/options.	2017-03-06 17:32:12 +09:00
Dean Herbert	5ec2db6558	Fix crash on opening options before intro has played.	2017-03-06 17:32:10 +09:00
Dean Herbert	b5aff9df5f	Add options footer.	2017-03-06 17:30:46 +09:00
Dean Herbert	0ee38571a6	Move version-related properties to OsuGameBase.	2017-03-06 17:30:44 +09:00
Dean Herbert	e356758a7d	Don't expicitly set origin of TextAwesome.	2017-03-06 17:06:48 +09:00
Dean Herbert	a7d7abe70e	Merge pull request #440 from Tom94/update-frameworrk ... Update framework	2017-03-05 12:02:52 +09:00
Dean Herbert	fdfaaca45b	Update framework #2.	2017-03-05 11:49:47 +09:00
Thomas Müller	73fef85b12	Remove unnecessary usings	2017-03-04 19:43:59 +01:00
Thomas Müller	a14bdf8624	Use Color4Extensions from Framework and remove redundant Name	2017-03-04 19:42:37 +01:00
Dean Herbert	65699eb39d	Fix missing .config files from nuspec. ... These are required to correctly redirect dll dependencies.	2017-03-05 02:48:44 +09:00
Dean Herbert	7db319d384	Merge pull request #431 from Jorolf/moarOptions ... SelectRandom doesnt select hidden groups now	2017-03-05 01:28:14 +09:00
Jorolf	7eebee36ab	Merge branch 'master' into moarOptions	2017-03-04 16:11:27 +01:00
Dean Herbert	adad248ae3	Merge pull request #435 from Tom94/update-flow ... Update usage of FillDirection	2017-03-04 23:44:43 +09:00
Thomas Müller	a3f1cb2232	Merge branch 'master' into update-flow	2017-03-04 15:35:53 +01:00
Thomas Müller	fd3b998f35	Merge pull request #437 from smoogipooo/tournament_drawings ... Fix unnecessarily throwing exception if there's no last drawings resu…	2017-03-04 15:35:39 +01:00
Jorolf	5c5066e1ae	renamed local groups	2017-03-04 15:30:14 +01:00
Dean Herbert	e12d89529c	Merge remote-tracking branch 'upstream/master' into update-flow	2017-03-04 23:28:39 +09:00
smoogipooo	112545f135	Fix unnecessarily throwing exception if there's no last drawings results file.	2017-03-04 23:24:32 +09:00
Dean Herbert	00fdffe9c8	Update framework (and fix non-conforming anchors in FillFlowContainers).	2017-03-04 23:24:13 +09:00
Dean Herbert	84d84f6539	Merge pull request #434 from Tom94/song-select-refactorr ... Song select refactor	2017-03-04 22:14:35 +09:00
Dean Herbert	9fe41fe177	Update framework.	2017-03-04 22:10:56 +09:00
Dean Herbert	389635c7ed	Avoid panel state changes when performing a sort.	2017-03-04 22:05:16 +09:00
Dean Herbert	8f3621ca24	Make selectGroup a private method.	2017-03-04 22:05:02 +09:00
Thomas Müller	a2317e5a1e	Update usage of FillDirection	2017-03-04 11:00:17 +01:00
Thomas Müller	a2b79de672	Add comments to CarouselContainer	2017-03-04 09:34:39 +01:00