5658 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
atlante45	bae0f7fa1b	New paste behaviour	2013-08-21 13:21:15 -07:00
atlante45	bda6e03117	Changed name of copySubTreeIntoNewTree destinationTree argument	2013-08-21 12:11:34 -07:00
atlante45	9003a7d40b	PR comments	2013-08-21 12:06:47 -07:00
atlante45	9fb864a699	Merge branch 'master' of https://github.com/worklist/hifi into separate_import_with_preview	2013-08-21 11:37:18 -07:00
atlante45	867303e673	Code cleanup	2013-08-21 11:33:10 -07:00
atlante45	27b0338294	Fixed clipboard not being previewed	2013-08-21 10:31:56 -07:00
atlante45	3eb5ace715	merge + few efficiency ameliorations to importDialog	2013-08-20 18:04:25 -07:00
ZappoMan	c320a87d5a	Merge pull request #875 from ey6es/master ... Fix for diffuse glow with SSAO, made diffuse glow the default, improved performance, added debug statements.	2013-08-20 18:04:10 -07:00
Andrzej Kapolka	571131d42e	No glow effect on the avatar, fixed OS X warning.	2013-08-20 17:25:54 -07:00
Andrzej Kapolka	f3a32a7934	Might as well convert the divide to a multiply.	2013-08-20 17:04:29 -07:00
Andrzej Kapolka	590672d035	Fewer texture lookups when diffusing.	2013-08-20 17:02:35 -07:00
Andrzej Kapolka	49da612a4e	Turns out we do have to initialize the "odd frame" field.	2013-08-20 16:37:23 -07:00
Andrzej Kapolka	ecc6d41523	Merge branch 'master' of https://github.com/worklist/hifi	2013-08-20 16:07:54 -07:00
Andrzej Kapolka	d5c66f6b67	Default to diffuse/add mode, fix for interacting with ambient occlusion. ... Unfortunately, I managed to break the diffusion somehow.	2013-08-20 16:07:12 -07:00
ZappoMan	86f2cbe8d4	Merge pull request #873 from birarda/master ... switch OS X base SDK to 10.7	2013-08-20 15:45:46 -07:00
ZappoMan	a6a38b4ebe	Merge pull request #872 from ey6es/ssao ... Performance improvement for the SSAO blur step, cleanup.	2013-08-20 15:40:48 -07:00
ZappoMan	222849986e	Merge pull request #874 from Atlante45/master ... Several VoxelSystems can have different view frustum	2013-08-20 15:37:29 -07:00
atlante45	22a2603eaa	Several VoxelSystems can have different view frustum	2013-08-20 15:28:08 -07:00
Stephen Birarda	7e1b682663	switch OS X base SDK to 10.7	2013-08-20 14:55:29 -07:00
Andrzej Kapolka	5b923bc6f2	More cleanup.	2013-08-20 13:46:13 -07:00
Andrzej Kapolka	11be8c752b	Cleanup.	2013-08-20 13:40:45 -07:00
Andrzej Kapolka	edd119ccdc	Merge branch 'master' of https://github.com/worklist/hifi into ssao	2013-08-20 13:24:32 -07:00
Stephen Birarda	11311f33ba	Merge pull request #871 from birarda/master ... fix for logitech USB reporting only one channel	2013-08-20 13:07:22 -07:00
Stephen Birarda	146e9176eb	switch to one channel from PortAudio to resolve USB error	2013-08-20 13:06:30 -07:00
Andrzej Kapolka	22598ceb4f	Optimizations for occlusion blur (the main one being that we only need to ... sample the texture four, not sixteen, times if we turn on linear filtering and sample between the texels).	2013-08-20 11:52:43 -07:00
Andrzej Kapolka	8ded40476e	Merge branch 'master' of https://github.com/worklist/hifi into ssao	2013-08-20 10:54:17 -07:00
Andrzej Kapolka	15cf909fce	Merge pull request #869 from ey6es/master ... Need to #ifdef this out to avoid linking against nonexistent quazip on L...	2013-08-20 10:53:09 -07:00
Andrzej Kapolka	1d74860877	Need to #ifdef this out to avoid linking against nonexistent quazip on Linux.	2013-08-20 10:51:55 -07:00
Andrzej Kapolka	7f4557fe1a	Add blur scale uniform.	2013-08-20 10:50:25 -07:00
Andrzej Kapolka	dcbfb914e9	Merge branch 'master' of https://github.com/worklist/hifi into ssao	2013-08-20 10:38:28 -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
Andrzej Kapolka	7ab0f18622	Merge pull request #868 from birarda/fervor ... changes to update flow to prepare for gazzlab	2013-08-20 10:34:10 -07:00
Stephen Birarda	13f5b7f68d	change application name to Interface	2013-08-20 10:02:06 -07:00
Stephen Birarda	05c9ca7131	remove unneeded package finds in interface CMakeLists	2013-08-20 09:56:50 -07:00
Stephen Birarda	71edaa2472	replace appcast url with highfidelity s3 bucket link	2013-08-20 09:55:48 -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
Stephen Birarda	54d637119f	updates required for fervor updater with Qt5	2013-08-19 16:05:37 -07:00
atlante45	24531fdd10	Dialogbox for import fully functionnal	2013-08-19 15:54:51 -07:00
Andrzej Kapolka	98a9cbefc7	Merge branch 'master' of https://github.com/worklist/hifi into ssao	2013-08-19 14:00:20 -07:00
Leonardo Murillo	16f8bb0cb4	Merge pull request #866 from birarda/master ... changes to jobs DSL for interface OS X build	2013-08-19 13:19:38 -07:00
Andrzej Kapolka	dea95200a3	Merge pull request #867 from ey6es/master ... Restore the gyro-only lean behavior based on linear accelerometer data.	2013-08-19 13:19:07 -07:00
Stephen Birarda	42c69ba77f	rename missed variable in last commit	2013-08-19 13:19:02 -07:00
Andrzej Kapolka	222e026662	Use a small default lean scale.	2013-08-19 13:18:20 -07:00
Stephen Birarda	d8798b7ed6	coalesce interfaceAppleJob name with name of generated job	2013-08-19 13:16:16 -07:00
Andrzej Kapolka	8d65323345	Restore the gyro-only lean behavior based on linear accelerometer data.	2013-08-19 13:14:35 -07:00
Stephen Birarda	9ee66288ab	switch to shallow clone for checkouts, os x build from stable	2013-08-19 13:09:05 -07:00
Stephen Birarda	f8cd138054	changes to jobs.groovy to build on OS X	2013-08-19 12:36:50 -07:00
Andrzej Kapolka	dec4a4c422	Added toggle for ambient occlusion (defaults to off).	2013-08-19 11:45:43 -07:00
Andrzej Kapolka	89b13417e5	Merge branch 'master' of https://github.com/worklist/hifi into ssao	2013-08-19 11:03:41 -07:00