7682 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
smoogipoo	5ccfc1918e	Hook up more bindables for hitobjects/hitsounds	2017-10-12 17:51:01 +09:00
smoogipoo	db672becbc	Implement waveform checkbox	2017-10-12 17:50:51 +09:00
smoogipoo	3c35a7a6ae	graph -> waveform	2017-10-12 17:37:40 +09:00
smoogipoo	4586877239	Implement magnification buttons	2017-10-12 17:31:21 +09:00
smoogipoo	de8f9325a3	Implement TimelineButton and use for the magnification buttons	2017-10-12 16:10:33 +09:00
smoogipoo	2844764e3c	Hit Objects/Hit Sounds -> Hitobjects/Hitsounds	2017-10-12 15:37:45 +09:00
smoogipoo	e12fa49436	Integrate timeline into Compose	2017-10-12 15:37:00 +09:00
smoogipoo	6fbf52c3eb	Remove unused usings	2017-10-12 15:32:18 +09:00
smoogipoo	df6409308a	Merge remote-tracking branch 'origin/master' into editor-waveform-timeline ... # Conflicts: # osu-framework	2017-10-12 15:32:11 +09:00
Thomas Müller	6a91175c0f	Merge pull request #1354 from Tom94/vscode-build ... Improve VSCode build / debug tasks	2017-10-11 10:48:06 +02:00
Dean Herbert	a6c54034fe	Update framework	2017-10-11 17:38:21 +09:00
Dan Balasescu	e4398eb54b	Merge branch 'master' into vscode-build	2017-10-11 17:18:44 +09:00
Dan Balasescu	310db20c74	Merge pull request #1352 from peppy/import-test-fix ... Improve resilience of beatmap import test	2017-10-11 17:18:32 +09:00
Thomas Müller	f55b980793	Add launch task for visual tests in release mode	2017-10-11 10:12:36 +02:00
Thomas Müller	4922896636	Mark release build task as "build"	2017-10-11 10:12:31 +02:00
Thomas Müller	76cf0e55a6	Fix capitalization of launch tasks	2017-10-11 10:12:21 +02:00
Dan Balasescu	6cc7e26f7c	Merge branch 'master' into import-test-fix	2017-10-11 17:08:29 +09:00
Dean Herbert	e83cb91185	Merge pull request #1353 from huoyaoyuan/fix ... Ignore filename case in BeatmapManager	2017-10-11 16:07:39 +09:00
Huo Yaoyuan	cf7f3411fc	Ignore filename case in BeatmapManager. Fixes #1295.	2017-10-11 15:01:02 +08:00
Dean Herbert	bf6ab77b0e	Always use live queries to ensure waiting asserts actually get dynamic data	2017-10-11 13:37:24 +09:00
Dean Herbert	c55ae5049f	Merge branch 'master' into import-test-fix	2017-10-11 13:11:55 +09:00
Dean Herbert	6542079385	Merge pull request #1342 from smoogipoo/fix-storyboard-exception ... Fix trimming too early in OsuLegacyDecoder crashing storyboards	2017-10-11 13:04:41 +09:00
Dean Herbert	b6cfc49b06	Improve resilience of beatmap import test ... Fixes this happening https://ci.appveyor.com/project/peppy/osu/build/master-4694/tests	2017-10-11 12:41:43 +09:00
Dean Herbert	71fc5c4da2	Merge branch 'master' into fix-storyboard-exception	2017-10-11 12:26:34 +09:00
Dean Herbert	4c8fe5f678	Merge pull request #1348 from smoogipoo/iconbutton-refactor ... Refactor + improve IconButton	2017-10-11 12:14:59 +09:00
Dean Herbert	6de100d446	Merge branch 'master' into iconbutton-refactor	2017-10-11 12:05:38 +09:00
Dean Herbert	bb2b5fa86d	Merge pull request #1329 from huoyaoyuan/spm-counter ... Implement SPM counter on osu! spinners	2017-10-11 11:39:36 +09:00
Dean Herbert	2b309be3c2	Merge remote-tracking branch 'upstream/master' into spm-counter	2017-10-11 11:23:09 +09:00
Dean Herbert	e76961a932	Remove unnecessary bool	2017-10-11 11:23:02 +09:00
Dean Herbert	1fc16693d6	Formatting	2017-10-11 11:20:44 +09:00
Dan Balasescu	78c160af87	Merge pull request #1343 from peppy/hidden-judgements ... Add a bool to specify whether judgements should be visible for certain DrawableHitObjects	2017-10-10 19:25:29 +09:00
smoogipoo	b8d2a04fe1	Only split beatmap lines twice	2017-10-10 19:24:24 +09:00
smoogipoo	ad344eb719	Use IsNullOrWhiteSpace instead of trimming	2017-10-10 19:21:38 +09:00
smoogipoo	8cea875f5f	Remove unused using	2017-10-10 18:35:30 +09:00
smoogipoo	c2f3c0e6df	Add TestCaseIconButton to demonstrate IconButton usages	2017-10-10 18:32:09 +09:00
smoogipoo	071b1b049c	Fix properties not being set leading to colours not being set	2017-10-10 18:31:56 +09:00
smoogipoo	44141a38b8	Make it possible to change colours before load()	2017-10-10 18:04:41 +09:00
Dan Balasescu	d8b7f4efa7	Merge branch 'master' into hidden-judgements	2017-10-10 17:59:34 +09:00
Dan Balasescu	cd870b5acd	Merge pull request #1347 from peppy/fix-tests-namespace ... Move mania tests to correct namespace	2017-10-10 17:58:36 +09:00
smoogipoo	bbd1a7059e	xmldoc + hook up IconColour	2017-10-10 17:25:39 +09:00
smoogipoo	d7fb59ee0e	Expose colours of IconButton	2017-10-10 17:20:23 +09:00
Dean Herbert	b306eaca6e	Move mania tests to correct namespace	2017-10-10 16:50:46 +09:00
smoogipoo	9cb9151811	Move origin + anchor outside of ctor	2017-10-10 16:00:11 +09:00
smoogipoo	1cf8c0284a	Re-namespace a few classes	2017-10-10 15:22:39 +09:00
smoogipoo	166194e6b6	Further logic simplification	2017-10-10 15:09:26 +09:00
smoogipoo	074a1db4a1	Implement scrolling and better zoom	2017-10-10 12:45:27 +09:00
Dean Herbert	d5892cf54e	Add a bool to specify whether judgements should be visible for certain DrawableHitObjects	2017-10-09 20:17:05 +09:00
Huo Yaoyuan	994959fd77	Merge branch 'master' into spm-counter	2017-10-09 19:05:30 +08:00
smoogipoo	29c2a29798	Fix trimming too early in OsuLegacyDecoder crashing storyboards	2017-10-09 18:47:12 +09:00
smoogipoo	cb58a1371e	Merge branch 'editor-waveform' into editor-waveform-timeline ... # Conflicts: # osu.Game/osu.Game.csproj	2017-10-09 18:10:52 +09:00