14374 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Balasescu	492b5edb02	Merge pull request #3425 from LastExceed/close-chattabs-with-Mclick ... Close chat tabs with middle mouse button	2018-09-18 15:45:46 +09:00
Dan Balasescu	ad31962643	Cleanup, use similar code to everywhere else	2018-09-18 15:27:21 +09:00
LastExceed	27ea6102bc	only return true on Mclick	2018-09-18 08:07:19 +02:00
Dan Balasescu	af6618a239	Merge branch 'master' into close-chattabs-with-Mclick	2018-09-18 14:52:56 +09:00
Dan Balasescu	008bafae45	Merge pull request #3420 from Aergwyn/add-rank-status ... Add rank status display in song select	2018-09-18 14:23:21 +09:00
Dan Balasescu	d3bb78d139	Merge branch 'master' into add-rank-status	2018-09-18 14:10:42 +09:00
Dan Balasescu	759633d4c8	Merge pull request #3396 from peppy/music-controller-topmost ... Bring music controller in front of notification overlay	2018-09-18 14:03:44 +09:00
Dan Balasescu	9f1f879f3d	Merge branch 'master' into music-controller-topmost	2018-09-18 13:56:13 +09:00
Dan Balasescu	3bd719072c	Merge pull request #3424 from Hanamuke/fix_combo ... Fruit type now depends on combo (osu!catch)	2018-09-18 13:17:52 +09:00
Dan Balasescu	29e023b252	Merge branch 'master' into fix_combo	2018-09-18 12:54:51 +09:00
smoogipoo	aba1de8b1a	Cleanup	2018-09-18 12:54:07 +09:00
LastExceed	ed01f3067f	Merge branch 'master' into close-chattabs-with-Mclick	2018-09-15 18:05:01 +02:00
LastExceed	fce9740f28	return true since we are handling the action	2018-09-15 18:00:47 +02:00
Dean Herbert	b17bd6aaaa	Merge pull request #3438 from peppy/fix-new-inspections ... Fix new resharper redundant parenthesis inspections	2018-09-16 00:16:39 +09:00
Dean Herbert	00d0613053	Fix new resharper redundant parenthesis inspections	2018-09-16 00:09:17 +09:00
Dean Herbert	a34b0d67f8	Merge pull request #3435 from plankp/patch-1 ... Make Transform and Wiggle incompatible with each other	2018-09-15 23:59:48 +09:00
Paul Teng	1a8665864c	Remove redundant explicit array type info	2018-09-15 08:55:29 -04:00
Paul Teng	3e02a36938	Make Wiggle incompatible with Transform	2018-09-15 08:43:22 -04:00
Paul Teng	92c6b570ea	Make Transform incompatible with Wiggle	2018-09-15 08:42:04 -04:00
Dean Herbert	8cb0b5e98d	Merge pull request #3423 from peppy/update-squirrel ... Bump squirrel version	2018-09-15 19:07:00 +09:00
Dean Herbert	6a1e2c6fa5	Update efcore packages	2018-09-15 18:49:01 +09:00
Dean Herbert	39a6bcba17	Merge remote-tracking branch 'upstream/master' into update-squirrel	2018-09-15 18:45:19 +09:00
Dean Herbert	9a88e09eb0	Merge pull request #3388 from peppy/fix-logo-overhead ... Fix osu! logo being present throughout the whole game	2018-09-15 18:44:12 +09:00
Dean Herbert	41be757a11	Merge branch 'master' into fix-logo-overhead	2018-09-15 18:33:22 +09:00
Dean Herbert	7fa6b4154e	Merge pull request #3427 from Hanamuke/disable_scroll_control_catch ... Disable scrolling speed control for osu!catch	2018-09-15 18:31:47 +09:00
Dean Herbert	511f129ee1	Merge remote-tracking branch 'upstream/master' into disable_scroll_control_catch	2018-09-15 17:03:57 +09:00
Dean Herbert	2d74c088ce	Add newline	2018-09-15 17:03:51 +09:00
Dean Herbert	d18a86c5a7	Merge pull request #3100 from UselessToucan/replay_keycounter ... Restore key counters state on replay rewinding	2018-09-15 16:59:41 +09:00
Dean Herbert	79b56cb35c	Make saveState private	2018-09-15 16:34:08 +09:00
Dean Herbert	7b57439976	Add proper testing	2018-09-15 16:25:37 +09:00
Dean Herbert	e636cfe79e	Fix dynamic compilation not working	2018-09-15 16:24:06 +09:00
Dean Herbert	65b2bceef2	Simplify implementation	2018-09-15 14:51:04 +09:00
Hanamuke	dd7f667fe3	Disable scrolling speed control for osu!catch	2018-09-15 00:18:42 +02:00
Hanamuke	3e7006ec1f	Fix fonction name	2018-09-14 19:52:32 +02:00
Hanamuke	c8d3776c79	Remove uneeded brackets	2018-09-14 19:46:04 +02:00
Hanamuke	347cb0a1b5	Check for type conversion, mais the update recursive	2018-09-14 19:41:29 +02:00
Hanamuke	a17200a66a	Merge branch 'master' into fix_combo	2018-09-14 18:48:13 +02:00
LastExceed	9f546bd484	close tab on Mclick	2018-09-14 13:50:35 +02:00
Dean Herbert	1662575f88	Merge branch 'master' into replay_keycounter	2018-09-14 19:08:54 +09:00
Dean Herbert	7a2d83d807	Merge pull request #3140 from miterosan/ArrangeMod ... Add "transform" mod	2018-09-14 19:07:21 +09:00
Dean Herbert	328de07615	Merge branch 'master' into ArrangeMod	2018-09-14 18:58:00 +09:00
Dean Herbert	14c2aec53e	Merge remote-tracking branch 'upstream/master' into ArrangeMod	2018-09-14 18:48:32 +09:00
Dean Herbert	ccabad60fb	Merge pull request #3419 from peppy/fix-system-user ... Fix system user attempting to show in profile overlay	2018-09-14 18:46:22 +09:00
Dean Herbert	bf10561052	Merge pull request #3362 from MaxOhn/wiggle-branch ... Add "wiggle" mod	2018-09-14 18:30:14 +09:00
Dean Herbert	ec6185cd31	Reduce random allocations	2018-09-14 18:21:12 +09:00
Dean Herbert	ef31698f56	Further code tidying	2018-09-14 18:21:12 +09:00
Dean Herbert	00daaef27a	Use a slightly more suiting icon	2018-09-14 18:21:12 +09:00
Dean Herbert	9d94aa4e62	Fix formatting and constants	2018-09-14 18:21:12 +09:00
MaxOhn	b1f6828a1a	Added OsuModWiggle class and adjusted OsuRuleset.cs	2018-09-14 18:21:11 +09:00
Dean Herbert	da8b838438	Merge branch 'master' into ArrangeMod	2018-09-14 17:20:04 +09:00