7152 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
smoogipooo	871ca7520f	Merge remote-tracking branch 'origin/master' into menu-bar	2017-09-07 15:32:01 +09:00
Dean Herbert	af0eaab78c	maybe fix	2017-09-07 01:46:07 +09:00
naoey	69ff4bfa46	Fix startup crash on mono.	2017-09-06 20:04:21 +05:30
Dean Herbert	70e3ac30db	Merge pull request #1217 from peppy/fix-mania-input ... Fix incorrect initialisation order causing mania key bindings to not work	2017-09-06 23:30:03 +09:00
Dean Herbert	13c3ef65a8	Merge branch 'master' into fix-mania-input	2017-09-06 23:18:23 +09:00
Dean Herbert	c9e41e4b6f	Merge pull request #1120 from naoey/quit-chat-channels ... Add close button to chat channel tabs	2017-09-06 23:18:06 +09:00
Dean Herbert	e5308b6247	Method rename	2017-09-06 23:12:32 +09:00
Dean Herbert	da294c9605	Don't use base call when we don't have to	2017-09-06 23:10:08 +09:00
Dean Herbert	4f49a0c183	Simplify action	2017-09-06 22:58:21 +09:00
Dean Herbert	2c4de83298	Merge branch 'master' into fix-mania-input	2017-09-06 22:49:23 +09:00
Dean Herbert	a7fa66b9f9	Fix CI issue	2017-09-06 22:41:03 +09:00
Dean Herbert	858c41f86e	Merge branch 'master' into quit-chat-channels	2017-09-06 22:36:36 +09:00
Dean Herbert	632fe7d2e2	Merge pull request #1218 from smoogipooo/fix-testcases ... Remove a few unnecessary attributes in OsuTestCase.	2017-09-06 21:44:40 +09:00
Dean Herbert	940c45b6d1	Fix visual styling and code styling	2017-09-06 21:43:20 +09:00
Dean Herbert	c6fa899b15	Merge remote-tracking branch 'upstream/master' into quit-chat-channels	2017-09-06 21:43:03 +09:00
smoogipooo	f70b4839bd	Remove a few unnecessary attributes in OsuTestCase.	2017-09-06 21:22:23 +09:00
smoogipooo	06fac913bf	Re-implement EditorMenuBar.	2017-09-06 21:14:29 +09:00
Dean Herbert	e834e0e958	Fix incorrect initialisation order causing mania key bindings to not work	2017-09-06 21:07:57 +09:00
Dan Balasescu	cfd25693ce	Merge pull request #1216 from peppy/unlock-chat ... Allow posting to chat in all channels	2017-09-06 21:01:17 +09:00
Dean Herbert	4f4b0a1f35	Allow posting to chat in all channels	2017-09-06 20:26:01 +09:00
smoogipooo	df79d8918d	Merge branch 'master' into menu-bar	2017-09-06 18:26:18 +09:00
smoogipooo	0cc443e618	Remove all generic judgements.	2017-09-06 18:05:51 +09:00
smoogipooo	e85d511645	No more partial judgements.	2017-09-06 17:48:01 +09:00
smoogipooo	29941019a5	Hacky way to make osu! and taiko work again.	2017-09-06 17:44:51 +09:00
smoogipooo	63b61ce669	Make TimeOffset internal set.	2017-09-06 17:20:51 +09:00
smoogipooo	f158ce814c	Fix state never getting set.	2017-09-06 17:20:41 +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	5988b5924d	Merge pull request #1210 from smoogipooo/new-menus ... Update framework in line with the new Menu changes	2017-09-05 23:48:42 +09:00
Dean Herbert	968c61902a	Merge branch 'master' into new-menus	2017-09-05 23:42:33 +09:00
Dean Herbert	cd488a6336	Merge pull request #1213 from tom-arrow/difficulty-colors ... New difficulty colors	2017-09-05 23:09:42 +09:00
Dean Herbert	048d1541c3	Merge branch 'master' into difficulty-colors	2017-09-05 23:01:49 +09:00
Dean Herbert	643228d32f	Merge pull request #1214 from tom-arrow/taiko-accuracy ... Fix taiko accuracy starting at 0% instead of 100%	2017-09-05 22:58:58 +09:00
Dean Herbert	796f9d8782	Merge branch 'master' into taiko-accuracy	2017-09-05 22:45:56 +09:00
Tom	1e10d977f9	Accuracy starts at 100% instead of 0%	2017-09-05 15:39:27 +02:00
Dan Balasescu	f47c3bb152	Merge pull request #1212 from peppy/osu-scoring ... Add basic combo score factor to osu! ruleset	2017-09-05 22:20:33 +09:00
Dean Herbert	081b98ef39	"Use" the hitobject ... Obviously temporary.	2017-09-05 21:41:20 +09:00
Tom	05f5dfba81	Change difficulty colors and add ExpertPlus ... ExpertPlus is for beatmaps above 6.75*	2017-09-05 13:57:30 +02:00
Dean Herbert	0fc2e49ce6	Remove second calculateScore call	2017-09-05 19:33:20 +09:00
smoogipooo	b871323ed8	Fix BeatmapGroup initialization not correctly setting panels to Hidden.	2017-09-05 19:26:28 +09:00
smoogipooo	5508fa0fd9	Merge remote-tracking branch 'origin/master' into new-menus	2017-09-05 19:14:42 +09:00
smoogipooo	24f7fbe1e5	Update framework.	2017-09-05 19:14:37 +09:00
Dean Herbert	d69b8d7784	Add basic combo score factor to osu! ruleset	2017-09-05 17:09:58 +09:00
Dean Herbert	770d04956f	Merge pull request #1202 from 2yangk23/rearrange-playlist ... Rearranging support in playlist	2017-09-05 11:09:24 +09:00
smoogipooo	1904b5edfe	Only store native position instead of input state.	2017-09-05 10:38:19 +09:00
Dan Balasescu	f76cecc704	Merge branch 'master' into rearrange-playlist	2017-09-05 10:31:53 +09:00
smoogipooo	e9f0762440	Don't query GetContainingInputManager every Update.	2017-09-05 10:29:51 +09:00
Dean Herbert	f05c6a653d	Merge pull request #1206 from Artikash/master ... Adjust HP penalties/bonuses based on beatmap specification	2017-09-04 18:59:59 +09:00
Dean Herbert	ed0f2a654b	Rename variable	2017-09-04 18:51:50 +09:00
Dean Herbert	12706a894e	Merge branch 'master' into master	2017-09-04 18:44:12 +09:00