4550 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	18b7c8e783	Merge pull request #730 from smoogipooo/mania-notes ... Mania notes	2017-05-11 18:16:33 +09:00
smoogipooo	5dd83067ee	Fix line endings.	2017-05-11 17:41:00 +09:00
smoogipooo	6cc54773e8	Fix taiko right background not scaling with the playfield as intended.	2017-05-11 17:18:22 +09:00
Dean Herbert	6fd95e0c52	Fix post-merge breakage	2017-05-11 17:16:01 +09:00
Dean Herbert	bc54b3c85f	Merge branch 'master' into mania-notes	2017-05-11 17:13:29 +09:00
Dean Herbert	b0e522345c	Combine DrawableHitObject classes into one	2017-05-11 17:07:46 +09:00
smoogipooo	5f30a89f76	General refactoring + renaming of TimingSectionContainer.	2017-05-11 16:09:48 +09:00
smoogipooo	c0c33c09ab	Fix merge error.	2017-05-11 16:08:54 +09:00
Dean Herbert	ec67b617ae	Add OptionsHeader class ... Makes search textbox anchor correctly. Also improves visual styling.	2017-05-11 16:06:18 +09:00
Dean Herbert	057d0cd523	Merge pull request #733 from smoogipooo/hitrenderer-improvements ... Hitrenderer improvements	2017-05-11 15:16:45 +09:00
smoogipooo	5365dff698	Merge branch 'hitrenderer-improvements' into mania-timing-sections	2017-05-11 15:05:26 +09:00
smoogipooo	3118dad52b	Subtract out playfield/hitrenderer/drawablehitobject changes.	2017-05-11 15:05:21 +09:00
smoogipooo	a762f820c6	Fix possible nullrefs.	2017-05-11 14:50:18 +09:00
smoogipooo	2d2d1beddd	More concrete method to determine if all hit objects have been judged. ... Covers the case where nested hit objects are involved.	2017-05-11 14:48:08 +09:00
smoogipooo	6445bea864	Make Playfield.HitObjects internal to playfields. ... Because not all playfields will be using this.	2017-05-11 14:44:11 +09:00
smoogipooo	da4be2f9d6	Move notes above judgement area but below keys.	2017-05-11 14:32:31 +09:00
smoogipooo	623912b40a	Fix playfield position.	2017-05-11 14:32:13 +09:00
smoogipooo	f6677125af	Merge branch 'mania-notes' into mania-timing-sections	2017-05-11 14:11:58 +09:00
smoogipooo	a6b71f8ccb	Resharper fixes.	2017-05-11 14:11:52 +09:00
Dean Herbert	df48204403	Fix OptionsOverlay stealing focus itself.	2017-05-11 13:56:21 +09:00
smoogipooo	cdf827df8e	CI fixes.	2017-05-11 13:55:52 +09:00
Dean Herbert	7d8af5f1da	Use SearchTextBox ... Correctly handle focus.	2017-05-11 13:23:31 +09:00
smoogipooo	94585672b6	Merge remote-tracking branch 'origin/master' into mania-notes	2017-05-11 13:01:00 +09:00
Dean Herbert	6c5490e31c	Merge remote-tracking branch 'upstream/master' into new-option-search	2017-05-11 12:59:19 +09:00
Dean Herbert	ab58acad81	Merge pull request #732 from peppy/general-fixes ... Update framework	2017-05-11 12:57:12 +09:00
smoogipooo	7fcbf2d8d4	Add t=0 display to notes.	2017-05-11 12:57:07 +09:00
smoogipooo	8160f36a48	Fix notes scrolling from end of map -> start of map.	2017-05-11 12:56:51 +09:00
smoogipooo	b10df74079	Full rewrite of timing section code, partially working for now.	2017-05-11 12:33:19 +09:00
smoogipooo	185e98aa14	Add basic column conversion to ManiaBeatmapConverter.	2017-05-11 12:32:30 +09:00
Dan Balasescu	78ed48d5ef	Merge branch 'master' into general-fixes	2017-05-11 12:29:10 +09:00
Dean Herbert	672c22178a	Merge pull request #724 from huoyaoyuan/metadata ... WorkingBeatmap enhancement	2017-05-11 12:28:15 +09:00
Dean Herbert	70ef503403	Merge branch 'master' into metadata	2017-05-11 12:23:00 +09:00
Dean Herbert	262b42efe3	Merge branch 'master' into new-option-search	2017-05-11 12:20:58 +09:00
Dean Herbert	fe47451dbc	Merge (fix conflicting framework)	2017-05-11 11:17:44 +09:00
EVAST9919	ea0add2354	Fixed update condition	2017-05-11 02:34:57 +03:00
EVAST9919	c0acc1799b	Now progress testcase has it's own clock	2017-05-11 01:49:57 +03:00
EVAST9919	d55c97a08a	Stop progress as soon as we at 100%	2017-05-11 01:48:46 +03:00
smoogipooo	62656b98df	Internalize HitObjects to playfields, since some playfields may not use that container.	2017-05-10 20:39:13 +09:00
smoogipooo	ba998035a8	More concrete way to determine whether all hit objects have been judged.	2017-05-10 20:37:59 +09:00
smoogipooo	4614904409	Update framework.	2017-05-10 17:38:59 +09:00
smoogipooo	2867606913	Whoops wrong project.	2017-05-10 17:35:00 +09:00
smoogipooo	3b533de8ac	Add xmldoc to HitWindows.cs.	2017-05-10 17:29:54 +09:00
smoogipooo	11c47454ad	Update framework.	2017-05-10 17:13:33 +09:00
EVAST9919	5b469eff69	Fixes	2017-05-10 10:33:02 +03:00
smoogipooo	bcc8a94e36	Construct mania playfield with proper column count.	2017-05-10 16:32:11 +09:00
EVAST9919	d8f9e71b84	Applied suggested changes	2017-05-10 10:14:44 +03:00
smoogipooo	2edc39ae16	Add timing sections.	2017-05-10 15:09:29 +09:00
Dean Herbert	2e7812956a	Update framework.	2017-05-10 14:15:11 +09:00
EVAST9919	7b17e331c4	cleanups	2017-05-10 03:45:31 +03:00
EVAST9919	113df86304	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-10 03:23:51 +03:00