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
|
a6a38b4ebe
|
Merge pull request #872 from ey6es/ssao
Performance improvement for the SSAO blur step, cleanup.
|
2013-08-20 15:40:48 -07:00 |
|
atlante45
|
22a2603eaa
|
Several VoxelSystems can have different view frustum
|
2013-08-20 15:28:08 -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
|
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
|
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 |
|
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
|
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
|
222e026662
|
Use a small default lean scale.
|
2013-08-19 13:18:20 -07:00 |
|
Andrzej Kapolka
|
8d65323345
|
Restore the gyro-only lean behavior based on linear accelerometer data.
|
2013-08-19 13:14:35 -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
|
fe2484ba68
|
Added back the glow mode cycle command that got removed in the menu reshuffle.
|
2013-08-19 11:01:57 -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 |
|
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 |
|
atlante45
|
6b58e1bfec
|
merge
|
2013-08-16 20:24:18 -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
|
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 |
|
atlante45
|
2eb29ee56b
|
Added ImportDialog.*
|
2013-08-16 10:21:12 -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
|
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 |
|