8127 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thomas Müller	882e4b68bb	Merge branch 'master' into remove-ratio-adjust	2017-10-12 12:05:41 +02:00
Thomas Müller	78a4045154	Merge pull request #1362 from peppy/fix-spm-queue ... Fix potential read from empty queue in SPM counter	2017-10-12 12:05:24 +02:00
Thomas Müller	d9bf465b9c	Update framework	2017-10-12 11:49:10 +02:00
Dan Balasescu	753383a740	Merge branch 'master' into remove-ratio-adjust	2017-10-12 18:48:32 +09:00
smoogipoo	ab62390336	Make TimelineButtons combined take up the full height of the timeline	2017-10-12 18:32:39 +09:00
Dean Herbert	1b031ca328	Fix potential read from empty queue in SPM counter	2017-10-12 18:28:26 +09:00
smoogipoo	a6901c0a27	Change TimelineButton icon colour to white when hovered	2017-10-12 18:17:36 +09:00
smoogipoo	a5817e6e75	Add a way to change the IconButton icon colour	2017-10-12 18:17:23 +09:00
smoogipoo	f08f7a4ecb	Merge remote-tracking branch 'smoogipoo/editor-waveform' into editor-waveform-timeline	2017-10-12 17:52:40 +09:00
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
Dan Balasescu	18c67dd936	Merge branch 'master' into editor-waveform	2017-10-12 17:32:42 +09:00
smoogipoo	4586877239	Implement magnification buttons	2017-10-12 17:31:21 +09:00
Dan Balasescu	818cbc0082	Merge pull request #1341 from peppy/fix-medal-overlay ... Fix visual regressions in MedalOverlay	2017-10-12 17:05:17 +09:00
smoogipoo	622659336d	Merge + update framework	2017-10-12 17:02:39 +09:00
Dean Herbert	881eeaa650	Update framework	2017-10-12 16:57:05 +09:00
Dean Herbert	00f7007036	Merge remote-tracking branch 'upstream/master' into fix-medal-overlay	2017-10-12 16:56:40 +09:00
Thomas Müller	78f2037d84	Remove now obsolete RatioAdjust	2017-10-12 09:42:06 +02: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
Dean Herbert	4a4c01f221	Fix CI problems	2017-10-11 21:25:15 +09:00
EVAST9919	82b333740d	Apply suggestions	2017-10-11 15:20:23 +03:00
EVAST9919	db38438a1e	Merge remote-tracking branch 'refs/remotes/ppy/master' into user_overlay_tooltip	2017-10-11 15:12:17 +03:00
Dean Herbert	744d548738	Add missing licence header	2017-10-11 20:28:10 +09:00
Dean Herbert	0b282a49bd	Add tiny droplet support	2017-10-11 20:11:29 +09:00
Dean Herbert	1a88ffe862	Merge remote-tracking branch 'upstream/master' into catch-improvements	2017-10-11 19:10:18 +09:00
Dean Herbert	1b732c799a	Make all juice nested objects from ticks	2017-10-11 19:10:07 +09:00
Dean Herbert	1f1bdc6162	Make juice streams interactive (and correctly positioned)	2017-10-11 18:18:06 +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