902 commits

Author	SHA1	Message	Date
atlante45	867303e673	Code cleanup	2013-08-21 11:33:10 -07:00
atlante45	3eb5ace715	merge + few efficiency ameliorations to importDialog	2013-08-20 18:04:25 -07:00
Stephen Birarda	d0ab8317c4	Merge pull request #865 from ey6es/ssao ... Basic screen space ambient occlusion effect. Defaults to off, because at the moment it slows things down substantially.	2013-08-20 10:37:01 -07:00
Stephen Birarda	329253d8e4	move update checking later in init, add menu option	2013-08-19 17:17:26 -07:00
Stephen Birarda	65a63fb73e	move checkForUpdates to menu to have option in menu	2013-08-19 16:16:27 -07:00
atlante45	24531fdd10	Dialogbox for import fully functionnal	2013-08-19 15:54:51 -07:00
Andrzej Kapolka	dec4a4c422	Added toggle for ambient occlusion (defaults to off).	2013-08-19 11:45:43 -07:00
atlante45	b4157593c5	Merge branch 'master' of https://github.com/worklist/hifi into separate_import_with_preview	2013-08-19 10:54:35 -07:00
Andrzej Kapolka	c9f9be5d9a	Merge branch 'master' of https://github.com/worklist/hifi into ssao	2013-08-19 10:53:33 -07:00
Andrzej Kapolka	60b410cecd	We must set the window menu bar in order for it to show up on Linux/Windows.	2013-08-19 10:51:41 -07:00
Andrzej Kapolka	2c9a8dfebc	Merge branch 'master' of https://github.com/worklist/hifi into ssao ... Conflicts: interface/src/Application.h	2013-08-19 10:42:12 -07:00
atlante45	6b58e1bfec	merge	2013-08-16 20:24:18 -07:00
Stephen Birarda	98b144d675	Merge remote-tracking branch 'upstream/master' into menu	2013-08-16 15:59:09 -07:00
LionTurtle	c579f70611	Render lookatIndicator for cursor select even when gyros are on for ... more consistent behavior.	2013-08-16 11:44:23 -07:00
Andrzej Kapolka	3ddab484e0	Beginnings of ambient occlusion. Looks like an architectural drawing.	2013-08-15 17:52:31 -07:00
atlante45	68a1c56ad6	More work on import interface	2013-08-15 17:21:23 -07:00
Stephen Birarda	4a13f3b75a	move swatch reset to Menu	2013-08-15 15:52:47 -07:00
Stephen Birarda	0ec2b761e9	remove some extra methods after menu cleanup	2013-08-15 15:44:03 -07:00
Stephen Birarda	0667190d00	hook settings options in menu	2013-08-15 15:40:17 -07:00
Stephen Birarda	e18be2cb36	hook audio listening modes and complete cleanup for debug	2013-08-15 15:37:09 -07:00
Stephen Birarda	154c6b4f32	fix disabling of occlusion culling from menu	2013-08-15 15:32:44 -07:00
Stephen Birarda	c930d058b1	fix monochrome option menu hook	2013-08-15 15:23:26 -07:00
Stephen Birarda	e77aae157b	fix in view and occluded false colorization	2013-08-15 15:15:19 -07:00
Stephen Birarda	cf5c53281b	repair first couple of false colorize methods	2013-08-15 15:07:49 -07:00
atlante45	90a44acbc1	Merge branch 'master' of https://github.com/worklist/hifi into separate_import_with_preview	2013-08-15 14:59:51 -07:00
Stephen Birarda	f72f9d8735	fix hook to render pipeline warnings and kill local voxels	2013-08-15 14:57:40 -07:00
Stephen Birarda	474b0465a7	hook tree stat calculation to menu	2013-08-15 14:50:12 -07:00
Stephen Birarda	eb4508aafb	hook timing tests to Menu	2013-08-15 14:46:25 -07:00
Stephen Birarda	cd000cb7c1	remove the particle system from ground plane	2013-08-15 14:37:27 -07:00
Andrzej Kapolka	cceeb1c6ff	Merge branch 'master' of https://github.com/worklist/hifi into ssao	2013-08-15 13:11:12 -07:00
Andrzej Kapolka	28d306a228	Remove the code here; will be replacing it based on glow effect work.	2013-08-15 13:10:48 -07:00
Stephen Birarda	89248cdf8d	fix voxel paint color assignment	2013-08-15 12:56:25 -07:00
Stephen Birarda	f864b6436d	fix isVoxelModeChecked comparisons	2013-08-15 12:51:33 -07:00
Stephen Birarda	0e4d54d5b0	voxel mode actions group cannot be exclusive	2013-08-15 12:48:48 -07:00
Stephen Birarda	4903122432	fix hooks to voxel stats dialog	2013-08-15 12:38:26 -07:00
Stephen Birarda	d257b70103	fixes for new Menu class after merge with upstream/master	2013-08-15 12:29:04 -07:00
Stephen Birarda	443203201e	Merge remote-tracking branch 'upstream/master' into menu	2013-08-15 12:22:37 -07:00
ZappoMan	2ae5a56b6e	Merge pull request #854 from ey6es/glow ... Three other glow techniques, with menu option to cycle between them.	2013-08-15 12:21:11 -07:00
Stephen Birarda	811fc87294	move avatar size changes to Avatar slots	2013-08-15 12:18:19 -07:00
Stephen Birarda	3a42bda0f2	repairs after merge with upstream master	2013-08-15 11:42:30 -07:00
Stephen Birarda	a2ed48ed1d	Merge remote-tracking branch 'upstream/master' into menu	2013-08-15 11:38:33 -07:00
Stephen Birarda	bbe239694e	move Avatar goHome to Avatar slot	2013-08-15 11:36:12 -07:00
Stephen Birarda	c6baa56022	update Q_OS_MAC ifdefs for Qt 5	2013-08-15 11:12:17 -07:00
Stephen Birarda	10109fff10	inlined spacing cleanup in Head, remove noise	2013-08-15 11:04:18 -07:00
ZappoMan	8e07bd42ea	removed app from SendVoxelsOperationArgs since its available as singleton	2013-08-15 10:51:56 -07:00
Stephen Birarda	46b064b7d6	initial decoupling of menu from Application	2013-08-15 10:46:51 -07:00
Andrzej Kapolka	3ad0b8b99d	Merge branch 'master' of https://github.com/worklist/hifi into ssao ... Conflicts: interface/src/Application.h	2013-08-15 10:06:22 -07:00
ZappoMan	beec5f60d8	renamed class to be more appropriate, added doxygen comments	2013-08-15 08:36:06 -07:00
Andrzej Kapolka	95fee434a7	Don't make the avatars glow; that was just for testing.	2013-08-14 17:37:50 -07:00
ZappoMan	d19e2d7490	merge repair	2013-08-14 14:23:13 -07:00