Commit graph

2926 commits

Author SHA1 Message Date
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
Andrzej Kapolka
e7dab88d69 Square vector lengths to bunch them up towards the center, add a minimum
length, include the URL of the SSAO tutorial.
2013-08-19 10:32:56 -07:00
Andrzej Kapolka
b41fa1e03c Basic ambient occlusion effect up and running; needs tweaking and
optimization.
2013-08-16 17:26:47 -07:00
Stephen Birarda
98b144d675 Merge remote-tracking branch 'upstream/master' into menu 2013-08-16 15:59:09 -07:00
ZappoMan
6c1601c4eb Merge pull request #862 from birarda/master
changes for UCSF installer build
2013-08-16 15:58:38 -07:00
Stephen Birarda
4d9075f21c optionally check /usr/local/lib for plugins 2013-08-16 13:58:22 -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
Stephen Birarda
5b02125d5f remove an extra g 2013-08-15 16:10:34 -07:00
Stephen Birarda
d4951b0223 fix getter for Hand and Head 2013-08-15 16:09:44 -07:00
Stephen Birarda
9816e1d9a8 some spacing cleanup in Head 2013-08-15 16:09:00 -07:00
Stephen Birarda
6cbe0ca3d0 some spacing cleanup in Avatar header 2013-08-15 16:04:42 -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
e2ae85176f make settings methods slots in Menu so they are accessible 2013-08-15 15:41:25 -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
b288cc43a2 fix disabling of delta sending and low res while moving 2013-08-15 15:29:05 -07:00
Stephen Birarda
c930d058b1 fix monochrome option menu hook 2013-08-15 15:23:26 -07:00
Stephen Birarda
b4da77028b fix true colorization of voxels 2013-08-15 15:16:58 -07:00
Stephen Birarda
80967e6941 fix by source false colorization 2013-08-15 15:16:13 -07:00
Stephen Birarda
2742e723e0 fix V2 occlusion false coloring 2013-08-15 15:15:43 -07:00
Stephen Birarda
e77aae157b fix in view and occluded false colorization 2013-08-15 15:15:19 -07:00
Stephen Birarda
c7be2e13cd repair false coloring by distance 2013-08-15 15:12:05 -07:00
Stephen Birarda
cf5c53281b repair first couple of false colorize methods 2013-08-15 15:07:49 -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
87bb260dcc hook menu to voxel cut/copy/paste operations 2013-08-15 14:42:41 -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
d1bc2058bc fix hook to open bandwidth details 2013-08-15 12:30:29 -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
92b6459e4b hooks for cycle of voxel mode and face mode 2013-08-15 11:54:56 -07:00
Stephen Birarda
3a42bda0f2 repairs after merge with upstream master 2013-08-15 11:42:30 -07:00
ZappoMan
4f16157e51 CR feedback 2013-08-15 11:39:00 -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
ce3afbcb32 fix hooks for webcam mode cycle and texture 2013-08-15 11:31:25 -07:00
Stephen Birarda
f5079374f3 fix hooks for skeleton tracking and collisions 2013-08-15 11:29:10 -07:00
Stephen Birarda
9e4e1f3edc fix hook to Webcam toggle from Menu 2013-08-15 11:19:45 -07:00