atlante45
|
22a2603eaa
|
Several VoxelSystems can have different view frustum
|
2013-08-20 15:28:08 -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
|
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 |
|
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 |
|
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 |
|
Andrzej Kapolka
|
a391e6fa19
|
Merge pull request #864 from ey6es/master
Added back the glow mode cycle command that got removed in the menu resh...
|
2013-08-19 11:03:02 -07:00 |
|
Andrzej Kapolka
|
fe2484ba68
|
Added back the glow mode cycle command that got removed in the menu reshuffle.
|
2013-08-19 11:01:57 -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
|
c738d52b98
|
Merge pull request #863 from ey6es/master
We must set the window menu bar in order for it to show up on Linux/Wind...
|
2013-08-19 10:53:03 -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 |
|
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 |
|
ZappoMan
|
94952fe8fb
|
Merge pull request #855 from birarda/menu
initial de-coupling of menu from Application
|
2013-08-16 16:08:44 -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 |
|
ZappoMan
|
4555165749
|
Merge pull request #861 from LionTurtle/master
Render lookatIndicator for cursor select even when gyros are on for more consistent behavior.
|
2013-08-16 15:57:39 -07:00 |
|
Stephen Birarda
|
ed48f8d982
|
add a DISABLE_OPENNI option for release builds without OpenNI
|
2013-08-16 14:28:22 -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
|
772ddfadb1
|
Merge branch 'master' of https://github.com/worklist/hifi into ssao
|
2013-08-16 10:45:27 -07:00 |
|
Leonardo Murillo
|
e1e451b4f2
|
Merge pull request #860 from birarda/master
repair docs job in groovy for jenkins
|
2013-08-16 10:44:47 -07:00 |
|
Stephen Birarda
|
1802ccdc7f
|
use shell command for doxygen instead of plugin
|
2013-08-16 10:42:58 -07:00 |
|
Stephen Birarda
|
2cd83ee9a8
|
remove selective listening on git push
|
2013-08-16 10:36:01 -07:00 |
|
Andrzej Kapolka
|
3ddab484e0
|
Beginnings of ambient occlusion. Looks like an architectural drawing.
|
2013-08-15 17:52:31 -07:00 |
|
Stephen Birarda
|
bbcf5b4d8d
|
Merge pull request #859 from birarda/master
comment out addition of docs from seed job for now
|
2013-08-15 17:48:57 -07:00 |
|
Stephen Birarda
|
ab7c5eb1e6
|
comment out docs in seed for now
|
2013-08-15 17:48:27 -07:00 |
|
Stephen Birarda
|
d7423c2c0a
|
Merge pull request #858 from birarda/master
add missing option for doxygen job
|
2013-08-15 17:18:12 -07:00 |
|
Stephen Birarda
|
d4be99ae2b
|
add missing folderWhereYouRunDoxygen option
|
2013-08-15 17:17:30 -07:00 |
|
Stephen Birarda
|
b02208a20f
|
Merge pull request #857 from birarda/master
add missing queue for doxygen job
|
2013-08-15 17:07:36 -07:00 |
|
Stephen Birarda
|
3f5cf8f714
|
add missing queue for doxygen job
|
2013-08-15 17:07:12 -07:00 |
|
Leonardo Murillo
|
a0dc4305a5
|
Merge pull request #856 from birarda/master
add doxygen job for jenkins to groovy
|
2013-08-15 17:04:17 -07:00 |
|