2957 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
DrabWeb	f1f6f2041f	Null track handling in player	2017-03-23 23:57:33 -03:00
DrabWeb	befbc63c35	Merge https://github.com/ppy/osu into song-progress-graph	2017-03-23 23:42:06 -03:00
DrabWeb	b56fb310bf	More cleanup	2017-03-23 23:38:23 -03:00
Dean Herbert	f23372599d	Merge pull request #542 from smoogipooo/taiko_drumroll_tick_judgements ... Add DrumRoll tick judgement info.	2017-03-24 09:29:45 +09:00
Dan Balasescu	dace1e15c9	Merge pull request #546 from peppy/song-select-improvements ... Song select improvements	2017-03-24 09:26:51 +09:00
Dean Herbert	e3071894f4	Merge branch 'master' into song-select-improvements	2017-03-24 09:21:26 +09:00
Dan Balasescu	b77448ae4e	Merge pull request #544 from peppy/parallax-requires-position ... ParallaxContainer should always know the mouse position.	2017-03-24 09:20:47 +09:00
Dean Herbert	d7426bdc32	Merge branch 'master' into taiko_drumroll_tick_judgements	2017-03-24 09:09:16 +09:00
Dean Herbert	f218066f83	Merge branch 'master' into parallax-requires-position	2017-03-23 22:52:06 +09:00
Dean Herbert	1c404cba5c	Update framework.	2017-03-23 22:42:50 +09:00
Dean Herbert	0bcb463acf	ParallaxContainer should always know the mouse position.	2017-03-23 22:42:40 +09:00
DrabWeb	0a11d035fe	Formatting	2017-03-23 09:07:13 -03:00
DrabWeb	b429d8f1b3	More proper fix	2017-03-23 09:05:53 -03:00
Dan Balasescu	c533650c26	Merge branch 'master' into song-select-improvements	2017-03-23 20:36:18 +09:00
Dean Herbert	c52ad6c6ee	Attempt to speed up CI by excluding some file types from analysis.	2017-03-23 20:34:24 +09:00
DrabWeb	3364801221	Fix for the fix	2017-03-23 08:32:24 -03:00
Dan Balasescu	8901d6137e	Merge branch 'master' into song-select-improvements	2017-03-23 20:25:38 +09:00
DrabWeb	bbca6cf602	Fix bottom square being clipped	2017-03-23 08:13:03 -03:00
DrabWeb	938f5eaf58	Dragging	2017-03-23 07:38:08 -03:00
smoogipooo	35f1f06ee2	Rename drum roll tick judgement.	2017-03-23 19:36:58 +09:00
Dean Herbert	63d7c5a5a3	Pressing back while mod select is visible should close mod select before exiting.	2017-03-23 19:35:46 +09:00
smoogipooo	11fb404574	Merge remote-tracking branch 'origin/master' into taiko_drumroll_tick_judgements ... Conflicts: osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj	2017-03-23 19:35:36 +09:00
Dan Balasescu	672fda79bd	Merge pull request #543 from peppy/rename-judgement-info ... JudgementInfo -> Judgement.	2017-03-23 19:34:43 +09:00
Dean Herbert	8c4fd44a85	Tidy up song select footer and fix depth of mod select vs osu! cookie.	2017-03-23 19:32:58 +09:00
DrabWeb	ca2816f9c8	Formatting	2017-03-23 07:24:43 -03:00
DrabWeb	3923892863	Delete SongProgressGraphColumn.cs	2017-03-23 07:20:16 -03:00
DrabWeb	546a3d0914	Merge branch 'song-progress-graph' of https://github.com/DrabWeb/osu into song-progress-graph	2017-03-23 07:15:53 -03:00
Dean Herbert	2cb801317d	JudgementInfo -> Judgement. ... There is no case where we use the term "Judgement" without the suffix, so deemed it unnecessary.	2017-03-23 19:00:18 +09:00
Dean Herbert	93915ba527	Fix regression of osu! judgement animation.	2017-03-23 18:56:27 +09:00
DrabWeb	0337f18fb9	Cleaning	2017-03-23 06:37:12 -03:00
Dean Herbert	b5d661b53a	some fixing and restyling.	2017-03-23 18:20:00 +09:00
smoogipooo	0ac33b59e3	Add DrumRoll tick judgement info.	2017-03-23 17:52:46 +09:00
Dean Herbert	4d61424abd	Merge branch 'master' into song-progress-graph	2017-03-23 17:44:22 +09:00
Dean Herbert	6e42a75fca	Merge pull request #541 from smoogipooo/use_more_accentcolour ... Use more accentcolour	2017-03-23 17:42:50 +09:00
Dean Herbert	770188fee1	Merge pull request #512 from smoogipooo/taiko_hitobject_drawable ... Base DrawableTaikoHitObject Implementation	2017-03-23 17:42:34 +09:00
Dean Herbert	19e438566f	Merge branch 'master' into taiko_hitobject_drawable	2017-03-23 17:36:50 +09:00
Dean Herbert	d52ac33e7c	Merge branch 'master' into use_more_accentcolour	2017-03-23 17:36:19 +09:00
Dean Herbert	a61cb078e3	Increase timeout on IPC wait.	2017-03-23 17:32:57 +09:00
Dean Herbert	96fc8eef30	Merge branch 'master' into taiko_hitobject_drawable	2017-03-23 17:23:22 +09:00
Dean Herbert	76ae3a8a03	Merge pull request #503 from smoogipooo/taiko_conversion ... Taiko conversion	2017-03-23 17:21:18 +09:00
Dan Balasescu	50543a164c	Merge pull request #539 from DrabWeb/beatmap-detail-tabs ... Beatmap detail area	2017-03-23 17:20:47 +09:00
Dean Herbert	0785dd8528	Change default OsuHitObject combo colour to gray ... This makes it easier to see additive elements in testcases.	2017-03-23 17:15:39 +09:00
Dan Balasescu	e9a061c709	Merge branch 'master' into beatmap-detail-tabs	2017-03-23 17:13:02 +09:00
Dean Herbert	4644f6afdb	Fix SliderBody's accent colour and thread-safety.	2017-03-23 17:11:51 +09:00
Dean Herbert	554b36c6eb	Merge branch 'master' into taiko_conversion	2017-03-23 16:57:23 +09:00
Dean Herbert	43032ef694	Fix missing class renames.	2017-03-23 16:56:42 +09:00
Dean Herbert	1766497728	Update framework.	2017-03-23 16:53:39 +09:00
Dean Herbert	1e1c46765a	Merge branch 'master' into taiko_conversion	2017-03-23 16:52:15 +09:00
Dean Herbert	315994f2b3	Merge pull request #538 from smoogipooo/taiko_base_hit ... Add Hit class, make TaikoHitObject abstract.	2017-03-23 16:51:45 +09:00
Dean Herbert	644e9ae9d5	Increase padding to make flyte happy.	2017-03-23 16:36:52 +09:00