15470 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Roman Kapustin	3c0ce2b615	Revert "Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle"" ... This reverts commit bcdaee7d39.	2018-11-19 20:48:59 +03:00
smoogipoo	d5b937f88f	Fix post-merge issue	2018-11-19 19:17:03 +09:00
Dean Herbert	12e0d8761d	Merge pull request #3737 from smoogipoo/revert-idletracker ... Revert idletracker changes	2018-11-19 19:08:58 +09:00
Dan Balasescu	8cee4141e8	Merge branch 'master' into note-placement	2018-11-19 19:08:53 +09:00
smoogipoo	c84f49addf	Add testcase	2018-11-19 19:02:59 +09:00
smoogipoo	2ee56e4a78	Add a body piece	2018-11-19 18:59:05 +09:00
smoogipoo	ad950cfc90	Implement hold note placement	2018-11-19 18:40:43 +09:00
smoogipoo	8071244d97	Make sizing happen per-blueprint	2018-11-19 18:40:27 +09:00
Dan Balasescu	d9b8d2d15c	Trim whitespace	2018-11-19 18:05:21 +09:00
Dan Balasescu	079230d9ed	Merge branch 'master' into mania-selection-movement	2018-11-19 18:03:12 +09:00
smoogipoo	d1cbaa9612	Use the column width	2018-11-19 18:02:01 +09:00
smoogipoo	52309465eb	Apply some simple fixes	2018-11-19 17:59:52 +09:00
smoogipoo	bcdaee7d39	Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle" ... This reverts commit 3e2e2a7000, reversing changes made to d94801b6c6.	2018-11-19 17:52:31 +09:00
smoogipoo	08ffa18936	Fix nullref	2018-11-19 17:05:51 +09:00
smoogipoo	55edeb095d	SelectionBox -> SelectionHandler	2018-11-19 16:58:11 +09:00
smoogipoo	595e2ffbff	Unbind event when column changes	2018-11-19 16:20:21 +09:00
smoogipoo	ce956d7fd4	Fix exception when order of objects changes	2018-11-19 16:19:56 +09:00
Dan Balasescu	11b13d1a5f	Merge pull request #3735 from peppy/fix-hold-menu-disappearing ... Fix hold for menu button occasionally disappearing	2018-11-19 12:24:41 +09:00
Dean Herbert	970ea928ae	Fix hold for menu button occasionally disappearing	2018-11-19 12:06:47 +09:00
Dean Herbert	a57f98ed4d	Merge branch 'master' into fix-taiko-lifetimes	2018-11-19 08:41:19 +09:00
Dean Herbert	eb5cb44a60	Merge pull request #3729 from UselessToucan/improve_hud_overlay_colour_setting ... Set AccentColour in concrete counters	2018-11-19 08:30:44 +09:00
Dean Herbert	72c9c66461	Merge branch 'master' into improve_hud_overlay_colour_setting	2018-11-19 08:14:51 +09:00
Dean Herbert	5ec28c31ca	Merge pull request #3699 from smoogipoo/fix-mask-disposal ... Use bindables for hitobject events	2018-11-18 22:42:21 +09:00
Roman Kapustin	376e76e00d	Resolve merge conflicts	2018-11-18 16:10:36 +03:00
Dean Herbert	dd21daa635	Merge branch 'master' into fix-mask-disposal	2018-11-18 21:18:00 +09:00
Roman Kapustin	ecf8a89f26	Set AccentColour and GlowColour in StandardHealthDisplay	2018-11-16 19:30:58 +03:00
Dan Balasescu	974873f5b4	Merge pull request #3688 from jorolf/flashlight-mod ... Add flashlight mod	2018-11-16 18:57:14 +09:00
Dan Balasescu	57c1ddb1e0	Merge branch 'master' into flashlight-mod	2018-11-16 18:45:15 +09:00
smoogipoo	92b1c56aed	Update osu-resources	2018-11-16 18:31:37 +09:00
smoogipoo	4cbda97b1e	Move positional adjustment to SelectionBox	2018-11-16 17:12:24 +09:00
Roman Kapustin	37b19f78ae	Set AccentColour in concrete counters	2018-11-15 23:37:21 +03:00
jorolf	80bd98bb9d	apply suggestions	2018-11-15 17:38:38 +01:00
smoogipoo	f7fc2ca569	Basic inter-column selection movement	2018-11-15 21:37:22 +09:00
smoogipoo	df7515b66f	Pass all selected hitobjects to the selection blueprints	2018-11-15 21:01:09 +09:00
smoogipoo	d5464702fa	Fix post-merge issue	2018-11-15 20:56:34 +09:00
smoogipoo	eddba44d0f	Merge branch 'note-placement' into inter-column-movements	2018-11-15 20:53:57 +09:00
smoogipoo	63642586c4	Merge remote-tracking branch 'origin/master' into mania-selection-movement	2018-11-15 20:47:53 +09:00
smoogipoo	e207dd728b	Fix taiko proxies not receiving the correct lifetimes	2018-11-15 20:26:12 +09:00
Dan Balasescu	3e2e2a7000	Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle ... Return to large logo after idle period	2018-11-15 15:40:15 +09:00
Dan Balasescu	e8f34ddff0	Merge branch 'master' into return_to_large_logo_after_idle	2018-11-15 15:16:10 +09:00
Dan Balasescu	d94801b6c6	Merge pull request #3720 from HoLLy-HaCKeR/fix-settingstextbox ... Fix SettingsTextBox having width of 0	2018-11-15 12:15:11 +09:00
jorolf	f0f7b15edc	remove unused using	2018-11-15 00:45:27 +01:00
jorolf	41a0f9896e	Merge branch 'master' into flashlight-mod	2018-11-15 00:35:42 +01:00
jorolf	7d2958b7b0	split shader, remove unnecessary clutter and fix some bugs	2018-11-15 00:33:13 +01:00
HoLLy	9dd3d28436	Fix SettingsTextBox having width of 0	2018-11-14 22:29:11 +01:00
Dean Herbert	1501e05c04	Merge branch 'master' into fix-mask-disposal	2018-11-14 21:27:37 +09:00
Dean Herbert	92adcb7613	Merge pull request #3719 from smoogipoo/dropdown-updates ... Update with osu!-side dropdown changes	2018-11-14 21:27:16 +09:00
Dean Herbert	caaa5645e3	Correct framework version	2018-11-14 21:16:08 +09:00
Dean Herbert	30547ac064	Merge remote-tracking branch 'upstream/master' into dropdown-updates	2018-11-14 20:03:45 +09:00
Dan Balasescu	287d7043f8	Merge pull request #3686 from peppy/hold-for-menu-back ... Require holding back button to quit gameplay	2018-11-14 19:32:24 +09:00