1966 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	9a5ac64332	Make HitObjectType more accessible. ... # Conflicts: # osu.Game.Modes.Osu/Objects/OsuHitObjectParser.cs	2017-02-15 01:23:19 +09:00
Thomas Müller	9f96a511a7	Merge pull request #357 from peppy/general-fixes ... General fixes.	2017-02-14 17:22:31 +01:00
Dean Herbert	13ed7db361	Merge branch 'master' into general-fixes	2017-02-15 01:14:25 +09:00
Thomas Müller	7fa9dde24f	Merge pull request #355 from peppy/disable-unimplemented-options ... Visually disable options which aren't yet wired up.	2017-02-14 17:11:01 +01:00
Damnae	ace7a1d009	Fix slider ticks expiring before scoring happens.	2017-02-14 16:12:35 +01:00
Jorolf	e717daa504	Line length is calculated inline	2017-02-14 16:05:57 +01:00
Damnae	9f890139d4	Cache drawable ticks.	2017-02-14 15:16:18 +01:00
Jorolf	1b08f6aca4	Line length is absolute now	2017-02-14 14:24:54 +01:00
Damnae	3e7208c8a4	Add slider ticks.	2017-02-14 11:26:24 +01:00
Dean Herbert	f207da6041	Add/update license headers.	2017-02-14 18:17:35 +09:00
Dean Herbert	ce29f0b0be	Add background layer to VisualTestGame.	2017-02-14 18:09:46 +09:00
Dean Herbert	311563d336	Merge remote-tracking branch 'upstream/master' into general-fixes	2017-02-14 18:06:10 +09:00
Dean Herbert	6fa84f3a81	Merge branch 'master' into disable-unimplemented-options	2017-02-14 08:35:40 +09:00
Dean Herbert	bad501c018	Merge branch 'master' into builder	2017-02-14 08:35:38 +09:00
Dean Herbert	3caa6ee5d2	Update framework.	2017-02-14 08:33:42 +09:00
Jorolf	c1ba53fa09	calculation is now a 'one-liner'	2017-02-13 16:56:15 +01:00
Dean Herbert	4f9d1a6c39	Visually disable options which aren't yet wired up.	2017-02-14 00:36:50 +09:00
Dean Herbert	3136bbeabc	Merge pull request #342 from Damnae/followpoints ... Add follow points.	2017-02-13 22:28:14 +09:00
Dean Herbert	343e48c195	Merge branch 'master' into followpoints	2017-02-13 22:23:57 +09:00
Dean Herbert	5c6e895644	Exclude vshost executables from packages.	2017-02-13 21:33:48 +09:00
Dean Herbert	d73c48c73d	Only show first three segments of version (ignore revision number).	2017-02-13 20:23:47 +09:00
Dean Herbert	85e85d32fc	Add dev build footer.	2017-02-13 20:06:51 +09:00
Dean Herbert	f52e9ddb05	Fix escape key being unnecessarily handled by VersionManager.	2017-02-13 19:08:59 +09:00
Dean Herbert	bc95666736	Merge pull request #339 from Damnae/osb_loading ... Load beatmap data from an optional osb file.	2017-02-13 18:40:08 +09:00
Dean Herbert	11643d2e09	Remove unnecessary methods and local variables.	2017-02-13 18:30:51 +09:00
Dean Herbert	1aeb48b920	Merge remote-tracking branch 'upstream/master' into osb_loading	2017-02-13 18:22:29 +09:00
Dean Herbert	9d5a984e80	Don't build deploy project by default.	2017-02-13 18:00:15 +09:00
Dean Herbert	df03a6cac2	Move deploy to tools folder.	2017-02-13 17:59:35 +09:00
Dean Herbert	c86701f1cc	Merge pull request #353 from Tom94/horizontal-scroll ... Update framework.	2017-02-13 17:54:04 +09:00
Thomas Müller	aaaf7163e0	Update framework.	2017-02-13 17:46:50 +09:00
Dean Herbert	5bd82aae42	Tidy up and format better.	2017-02-13 17:40:41 +09:00
Dean Herbert	05a014958f	Add complete publish automation. ... Uses AppSettings to allow for secret storage.	2017-02-13 16:48:53 +09:00
Dean Herbert	2c95d7c67b	Add ability to bootstrap the releases directory using github release API.	2017-02-13 12:31:55 +09:00
Dean Herbert	cef3454e9b	Formatting and improvements.	2017-02-13 10:06:19 +09:00
Jorolf	1978984006	mode selector line has the correct length now	2017-02-12 17:49:30 +01:00
Dean Herbert	a073b1db0d	very simple build automation.	2017-02-13 01:02:44 +09:00
Dean Herbert	6e0a2ec7da	Merge pull request #351 from peppy/installer-updater ... Minor fixes / framework update.	2017-02-12 20:45:11 +09:00
Dean Herbert	c4446c8074	Update licence year.	2017-02-12 20:39:21 +09:00
Dean Herbert	a32bef55bc	Remove line from license which shouldn't have been included in the first place.	2017-02-12 20:37:37 +09:00
Dean Herbert	0ff054f887	Bump version.	2017-02-12 20:30:35 +09:00
Dean Herbert	0793942f6f	Update framework.	2017-02-12 20:26:42 +09:00
Thomas Müller	e3f35cd66e	Merge branch 'master' into osb_loading	2017-02-12 12:26:25 +01:00
Dean Herbert	01e774b1ec	Don't attempt to install/update on a non-installed version for now.	2017-02-12 20:25:42 +09:00
Thomas Müller	ff6838f88c	Merge pull request #349 from peppy/installer-updater ... Automatic updates.	2017-02-12 12:16:03 +01:00
Dean Herbert	e32ccb6153	Move scene graph init to ctors.	2017-02-12 19:39:54 +09:00
Dean Herbert	5d4be35c5e	Update framework.	2017-02-12 19:20:48 +09:00
Dean Herbert	874af48de6	Merge remote-tracking branch 'upstream/master' into installer-updater	2017-02-12 17:18:04 +09:00
Dean Herbert	f4c6b5cb7f	Merge pull request #348 from ZLima12/warnings-fix ... Prevent warnings as errors	2017-02-12 16:49:59 +09:00
Damnae	daa14bfec8	Replace AddConnections by a HitObjects property.	2017-02-12 08:47:07 +01:00
John Leuenhagen	7ad9cd6b6e	add explicit false values to prevent warnings as errors	2017-02-12 02:32:11 -05:00