174 Commits

Author	SHA1	Message	Date
Dean Herbert	86de4fa2e2	Apply CI fixes	2017-09-12 18:36:19 +09:00
Dean Herbert	f32d444d68	Remove generics from Playfield (fixes catch)	2017-09-12 18:19:28 +09:00
Dean Herbert	d7ac02d090	Ensure judgements aren't updated when ArmedState is not idle	2017-09-12 18:00:41 +09:00
Dean Herbert	1194e46ef1	Merge remote-tracking branch 'upstream/master' into judgement-revamp	2017-09-12 17:46:21 +09:00
smoogipooo	58c875bdca	Merge remote-tracking branch 'origin/master' into blending-equations ... # Conflicts: # osu-framework	2017-09-11 15:02:12 +09:00
Dean Herbert	5ce76d8023	Merge remote-tracking branch 'upstream/master' into judgement-revamp	2017-09-11 14:36:51 +09:00
Dean Herbert	7170fbd087	Target .NET 4.6.1	2017-09-11 12:39:00 +09:00
Dean Herbert	3cacee300a	Fix a false resharper positive	2017-09-11 11:41:29 +09:00
smoogipooo	cde22865b9	Merge remote-tracking branch 'origin/master' into blending-equations ... # Conflicts: # osu-framework	2017-09-11 02:42:23 +09:00
MrTheMake	a7f874e5b6	Merge branch 'master' into leaderboard-scores	2017-09-07 18:25:33 +02:00
smoogipooo	19db7a8f72	Update in line with framework changes.	2017-09-07 22:46:21 +09:00
smoogipooo	0cc443e618	Remove all generic judgements.	2017-09-06 18:05:51 +09:00
smoogipooo	29941019a5	Hacky way to make osu! and taiko work again.	2017-09-06 17:44:51 +09:00
smoogipooo	ac8ec31b61	Make judgements able to be "added" plus make everything compile and run.	2017-09-06 17:02:13 +09:00
Dean Herbert	84c22df3f5	Combine Judgement.HitResults into one.	2017-09-06 17:01:48 +09:00
Dean Herbert	081b98ef39	"Use" the hitobject ... Obviously temporary.	2017-09-05 21:41:20 +09:00
Dean Herbert	0fc2e49ce6	Remove second calculateScore call	2017-09-05 19:33:20 +09:00
Dean Herbert	d69b8d7784	Add basic combo score factor to osu! ruleset	2017-09-05 17:09:58 +09:00
Dean Herbert	ed0f2a654b	Rename variable	2017-09-04 18:51:50 +09:00
Akash Mozumdar	c6b226b017	refactor	2017-09-01 15:32:03 -04:00
Akash Mozumdar	080bdf808c	Merge branch 'master' of https://github.com/Artikash/osu	2017-08-31 21:35:59 -04:00
Akash Mozumdar	472710e5db	trim whitespace	2017-08-31 21:35:30 -04:00
Akash Mozumdar	04596fee61	Update OsuScoreProcessor.cs	2017-08-31 08:26:06 -04:00
Akash Mozumdar	af2f45a980	slight edits	2017-08-31 04:44:00 -04:00
Akash Mozumdar	cbc35e0cf3	implemented hp	2017-08-31 04:31:48 -04:00
Akash Mozumdar	d252af8ab4	basic implementation of hp	2017-08-31 02:36:25 -04:00
Dean Herbert	1b0a1dd410	Add missing licence header	2017-08-24 20:37:03 +09:00
Dean Herbert	a7a7e0323f	Update autoplay and replay handling to result in actions, not keys	2017-08-24 15:36:42 +09:00
smoogipooo	56292bd7f0	Use constant definition.	2017-08-23 16:54:06 +09:00
smoogipooo	42e6865493	Flip hit objects.	2017-08-23 16:35:30 +09:00
Dean Herbert	ea450fecf5	Merge branch 'master' into action-key-counter	2017-08-21 16:25:44 +09:00
Dean Herbert	16e96888ab	Update KeyCounterCollection to support action-based buttons	2017-08-21 12:39:22 +09:00
smoogipooo	6a7b410bc3	Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147	2017-08-21 11:58:54 +09:00
Dean Herbert	09b5eef26e	Fix incorrect osu! defaults	2017-08-20 21:56:28 +09:00
Dean Herbert	aebda8b032	Merge branch 'master' into fix-slider-tracking-outside-follow-circle	2017-08-20 18:27:38 +09:00
Shane Woolcock	71ddbd22a1	Convert ReceiveMouseInputAt override to lambda syntax, and make Tracking property private set	2017-08-20 14:00:53 +09:30
Shane Woolcock	51af233d66	Fix sliders not checking the correct cursor position once it moves out of the follow circle	2017-08-19 12:19:37 +09:30
Dean Herbert	f829caf197	Fix custom logic still existing in OsuInputManager	2017-08-19 07:24:29 +09:00
MrTheMake	6d401b5f21	Merge branch 'master' into leaderboard-scores	2017-08-19 00:00:40 +02:00
Dean Herbert	a8996b8b5f	Merge branch 'master' into fix-sliders-ignoring-actions	2017-08-19 00:30:40 +09:00
Dean Herbert	d6249e7a63	Add support for binding mouse buttons to actions	2017-08-18 20:01:41 +09:00
Shane Woolcock	7e0fe6cbcb	Fix slider tracking to use pressed actions rather than directly querying the mouse buttons	2017-08-18 20:19:23 +09:30
Shane Woolcock	9558d2a161	Remove unnecessary using	2017-08-18 19:39:28 +09:30
Shane Woolcock	44feef78f1	Simplify OsuActionInputManager property	2017-08-18 19:32:08 +09:30
Shane Woolcock	529732ea47	More CI fixes	2017-08-18 16:58:01 +09:30
Shane Woolcock	90dacd9861	Trim whitespace	2017-08-18 16:49:10 +09:30
Shane Woolcock	9628c0b6d6	Change spinner to check currently pressed actions rather than implementing IKeyBindingHandler	2017-08-18 16:46:00 +09:30
Shane Woolcock	9c6ca2d159	Add lazy weak property to DrawableOsuHitObject to find and cache the containing OsuInputManager, if it exists	2017-08-18 16:34:01 +09:30
Shane Woolcock	f951120775	Merge branch 'master' into fix-spinner-ignoring-actions	2017-08-18 16:25:26 +09:30
Dean Herbert	a44ff5a2c2	Fix regression causing global hotkeys to no longer work	2017-08-17 17:47:44 +09:00