11701 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Balasescu	50acab8d86	Merge branch 'master' into relative-date-drawable	2018-03-12 11:28:43 +09:00
Dan Balasescu	09b13ee618	Merge pull request #2182 from peppy/fix-duplicate-judgements ... Remove judgements when deciding a new judgement for a HitObject	2018-03-12 11:28:34 +09:00
Dan Balasescu	0da407f75c	Merge branch 'master' into fix-duplicate-judgements	2018-03-12 11:02:54 +09:00
Dan Balasescu	89582f7afe	Merge pull request #2160 from peppy/rewrite-break-overlay ... Rewrite BreakOverlay to work with rewinding	2018-03-12 11:02:40 +09:00
Dean Herbert	1447ca55a3	Add xmldoc, make restrictSize private	2018-03-12 11:02:02 +09:00
smoogipoo	86d93ffe3c	Fix tooltip not working due to not handling input	2018-03-12 10:49:50 +09:00
Dean Herbert	d27cf16bf9	Merge remote-tracking branch 'ppy/master' into more-skinning	2018-03-12 10:46:37 +09:00
Dan Balasescu	96e2aca1ba	Merge branch 'master' into relative-date-drawable	2018-03-12 10:36:43 +09:00
smoogipoo	209d91fe21	Fix duplicate item in csproj	2018-03-12 10:35:37 +09:00
Dan Balasescu	8ba87dfdbd	Merge branch 'master' into fix-duplicate-judgements	2018-03-12 10:29:50 +09:00
smoogipoo	33c721bcbb	Fix post-merge errors	2018-03-12 09:51:32 +09:00
smoogipoo	6e51b74890	Merge remote-tracking branch 'origin/master' into rewrite-break-overlay	2018-03-12 09:47:05 +09:00
Dean Herbert	7bf38eb1ad	Merge pull request #2200 from HoLLy-HaCKeR/fix-legacyid-check ... Fix check against LegacyID for non-default rulesets	2018-03-12 09:06:53 +09:00
HoLLy	9c75c392f2	Only check by null instead of sign	2018-03-11 21:27:49 +01:00
HoLLy	a321bcf3af	Fix check against LegacyID for non-default rulesets	2018-03-11 20:19:03 +01:00
TocoToucan	e6c22e2287	Taking screenshot support initial commit	2018-03-10 21:59:20 +03:00
Dean Herbert	ccc3c573ab	Fix resharper not fixing	2018-03-11 02:20:00 +09:00
Dean Herbert	5092fe5596	Adjust cursor trail display length ... In line with shader change at ad5ddec7b2	2018-03-11 02:11:56 +09:00
Dean Herbert	df2815f19e	Add TestCase for GameplayCursor	2018-03-11 02:11:25 +09:00
Dean Herbert	487a03d0d7	Merge branch 'master' into cursor-trail	2018-03-11 02:07:05 +09:00
Dean Herbert	3a5283f96d	Merge pull request #2159 from naoey/fix-unplayable-beatmaps ... Make song select ensure current beatmap is always playable in the active ruleset	2018-03-11 01:38:11 +09:00
Dean Herbert	db2a663234	Use private instead of protected	2018-03-11 01:26:03 +09:00
Dean Herbert	d1ab52e7bc	Merge branch 'master' into fix-unplayable-beatmaps	2018-03-11 01:19:54 +09:00
Dean Herbert	c346638459	Merge branch 'master' into decoders	2018-03-11 01:04:28 +09:00
Dean Herbert	9233266fe1	Fix login failure for users with no country rank ... Closes #2148.	2018-03-11 00:44:16 +09:00
Dean Herbert	19436842de	Merge branch 'master' into editor-hitobject-movement	2018-03-10 23:44:22 +09:00
Dean Herbert	709fcf9552	Update ISSUE_TEMPLATE	2018-03-10 20:01:36 +09:00
Dean Herbert	a9327eac8f	Merge pull request #2194 from smoogipoo/drawableslider-cleanup ... Split out the slider head into a separate drawable hitobject	2018-03-10 18:50:55 +09:00
tgi74000	a29189ff84	Merge remote-tracking branch 'upstream/master'	2018-03-10 08:46:00 +01:00
tgi74000	a4dfeff2d7	Renamed ManiaMirrorMod to ManiaModMirror	2018-03-10 08:44:46 +01:00
tgi74000	ed20e31bbe	Removed redundant parentheses	2018-03-10 08:39:11 +01:00
Dean Herbert	ac5a2f18c4	Merge branch 'master' into drawableslider-cleanup	2018-03-10 16:34:15 +09:00
smoogipoo	92b302971f	Trim whitespace	2018-03-10 01:23:53 +09:00
smoogipoo	24501c37dd	Merge branch 'drawableslider-cleanup' into editor-hitobject-movement	2018-03-10 01:15:24 +09:00
smoogipoo	8ed5fce43a	Split out the slider head into a separate drawable hitobject	2018-03-10 01:13:59 +09:00
Dean Herbert	5727965431	Merge pull request #2193 from peppy/update-framework-again ... Fix major regression (framework revert)	2018-03-10 01:08:17 +09:00
smoogipoo	4103c66cff	Move selection overlay to HitObjectOverlayLayer for extensibility	2018-03-10 00:48:57 +09:00
Dean Herbert	7cabc54f64	Fix major regression (framework revert)	2018-03-10 00:48:48 +09:00
smoogipoo	0e8fbc47b7	Give HitObjectOverlayLayer full input state information	2018-03-10 00:03:02 +09:00
smoogipoo	376f6eec58	SetPosition -> OffsetPosition	2018-03-10 00:02:13 +09:00
smoogipoo	ad72d3816b	Allow dragging anywhere in a capture box to move objects	2018-03-09 23:43:50 +09:00
smoogipoo	4a48136e4f	Make hitobject positions adjustable	2018-03-09 23:12:34 +09:00
smoogipoo	3b766b8ec8	Make CaptureBox account for changes in hitobject states	2018-03-09 23:11:48 +09:00
naoey	56730247e3	Merge branch 'fix-unplayable-beatmaps' of github.com:naoey/osu into fix-unplayable-beatmaps	2018-03-09 19:40:00 +05:30
naoey	2c0488b1f1	Invert bool, add test, and handle ruleset change.	2018-03-09 19:39:28 +05:30
Dean Herbert	9ad9fc5aa9	Merge branch 'master' into fix-unplayable-beatmaps	2018-03-09 21:39:48 +09:00
Dean Herbert	df8f89b3d6	Merge branch 'master' into fix-mania-conversion	2018-03-09 21:39:19 +09:00
Dan Balasescu	1ecd051383	Merge pull request #2190 from peppy/framework-too-far-behind ... Update framework	2018-03-09 21:38:57 +09:00
Dean Herbert	2b0309b26d	Update framework	2018-03-09 21:29:13 +09:00
Dean Herbert	217dd2ecdc	Initial push for better decoders	2018-03-09 21:24:15 +09:00