7870 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
TocoToucan	4653470779	Fix RulesetStore preparation	2017-10-10 22:29:16 +03:00
TocoToucan	8b01f8671f	Merge from ppy/master	2017-10-10 21:07:36 +03:00
Dean Herbert	e4f915e5af	Fix scoring simulation not supporting juice	2017-10-10 20:22:57 +09:00
Dean Herbert	03fbf47bc2	Add juicy streams	2017-10-10 20:22:42 +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
TocoToucan	cbae19b604	Fix BeatmapMetadata removing	2017-10-10 00:17:12 +03:00
TocoToucan	ef417c6388	Small DB-related refactoring	2017-10-09 23:30:32 +03:00
TocoToucan	41a90c8b11	Add missing eager loading	2017-10-09 23:28:28 +03:00
EVAST9919	d1f02538cb	Add tooltip to username in the profile overlay	2017-10-09 21:12:04 +03: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
Dean Herbert	26215b4488	Create an abstract base class for drawable catch objects	2017-10-09 19:42:55 +09: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
Dean Herbert	222d0c8694	Fix visual regressions in MedalOverlay	2017-10-09 17:52:48 +09:00
smoogipoo	b97b575b27	Merge remote-tracking branch 'origin/master' into editor-waveform ... # Conflicts: # osu-framework	2017-10-09 17:20:24 +09:00
smoogipoo	19b38983df	Update in-line with framework	2017-10-09 17:18:11 +09:00
TocoToucan	81b9e08fb6	Fix foreign key constraint failure	2017-10-09 00:30:52 +03:00
TocoToucan	5d27c66efa	Use one DbContext with configured CommandTimeout for all stores	2017-10-08 18:18:28 +03:00
Dan Balasescu	b1a2da58bc	Merge pull request #1339 from sunghwan2789/decoder-improve ... Trim end of line	2017-10-08 19:07:04 +09:00
Bang Sunghwan	bd9f2db477	Trim line	2017-10-08 17:30:21 +09:00
Bang Sunghwan	6c5c734ff1	Trim end of line ... Fix ArgumentOutOfRangeException when parsing http://osu.ppy.sh/osu/1004136	2017-10-08 09:42:09 +09:00
Huo Yaoyuan	09093013a7	Move spm calculation into counter.	2017-10-07 15:58:53 +08:00
Huo Yaoyuan	a876ab9b90	Move spm counter to a seperated control.	2017-10-07 15:31:42 +08:00
Jorolf	f3ca6cc387	remove redundant stuff	2017-10-06 22:02:33 +02:00
Jorolf	de2181b8f5	Merge branch 'master' of git://github.com/ppy/osu into direct-previews	2017-10-06 21:02:48 +02:00
Jorolf	5a8b8dacbb	move stuff thats duplicated in PreviewButton and DirectPanel to PlayButton	2017-10-06 21:02:00 +02:00
Dean Herbert	3b6596b609	Merge branch 'master' into spm-counter	2017-10-07 01:10:57 +08:00
Dean Herbert	c22e1520a0	Merge pull request #1337 from smoogipoo/editor-screens ... Initial implementation of editor screens	2017-10-07 01:09:04 +08:00
smoogipoo	10abaa866b	Put screens below the top and bottom bars of the editor	2017-10-07 01:56:11 +09:00