ZappoMan
|
b05d6e25e3
|
remove two debug outs
|
2013-10-23 10:23:07 -07:00 |
|
ZappoMan
|
5d18b68a2e
|
added support for forceFullFrustum in hideOutOfView() this fixes inconcistancies with voxel hiding showing
|
2013-10-23 10:14:41 -07:00 |
|
Andrzej Kapolka
|
cf78e21ea4
|
Merge branch 'master' of https://github.com/worklist/hifi into ossome
Conflicts:
interface/src/Application.cpp
|
2013-10-23 10:06:56 -07:00 |
|
Andrzej Kapolka
|
a568e71e37
|
Merge pull request #1099 from stojce/19433
Code Review for Job #19433
|
2013-10-23 10:03:36 -07:00 |
|
Andrzej Kapolka
|
251b80b514
|
Merge branch 'master' of https://github.com/worklist/hifi into ossome
|
2013-10-23 10:03:22 -07:00 |
|
Philip Rosedale
|
5a7561978c
|
Merge pull request #1101 from ZappoMan/keep_local_voxels
Make Keep Local Voxels the Default
|
2013-10-23 07:13:57 -07:00 |
|
ZappoMan
|
6e31f74236
|
tweak to menu text order
|
2013-10-23 06:00:26 -07:00 |
|
ZappoMan
|
306b23d489
|
make Fast Voxel Pipeline the default behavior
|
2013-10-23 05:58:47 -07:00 |
|
ZappoMan
|
1430a083d1
|
make DontRemoveOutOfView the default behavior
|
2013-10-23 05:44:20 -07:00 |
|
ZappoMan
|
3c8e30c956
|
make HideOutOfView the default behavior
|
2013-10-23 05:38:33 -07:00 |
|
ZappoMan
|
1786049710
|
make use delta frustum in culling the default behavior
|
2013-10-23 05:30:15 -07:00 |
|
ZappoMan
|
370fe3dad9
|
make constant culling the default mode
|
2013-10-23 05:22:29 -07:00 |
|
stojce
|
9382268ee3
|
CR fixes
|
2013-10-23 09:30:26 +02:00 |
|
Stephen Birarda
|
fdf9b05dab
|
add bootstrap to DS, stub fulfilled and queued assignments on index page
|
2013-10-22 17:38:14 -07:00 |
|
Andrzej Kapolka
|
247dfd3750
|
Merge branch 'master' of https://github.com/worklist/hifi into ossome
|
2013-10-22 17:27:14 -07:00 |
|
Andrzej Kapolka
|
cf98d900f9
|
Removed unused variable.
|
2013-10-22 17:26:42 -07:00 |
|
Philip Rosedale
|
873a479f99
|
Merge pull request #1098 from birarda/assignment
add back pools for assignments
|
2013-10-22 17:13:02 -07:00 |
|
Andrzej Kapolka
|
9dd41f4206
|
Render sticks, use avatar colors.
|
2013-10-22 16:52:44 -07:00 |
|
Andrzej Kapolka
|
2e06965b1c
|
I think this does the trick, finally.
|
2013-10-22 15:50:42 -07:00 |
|
Andrzej Kapolka
|
41775912d8
|
Back to using matrices.
|
2013-10-22 15:39:45 -07:00 |
|
Andrzej Kapolka
|
1f8bed9d9c
|
More transform rejiggery.
|
2013-10-22 15:31:27 -07:00 |
|
Andrzej Kapolka
|
d393bdcea6
|
Wheeee, let's try a different way of applying the lean rotation.
|
2013-10-22 15:04:49 -07:00 |
|
Andrzej Kapolka
|
02a21ae9c0
|
New plan: let's get the skeleton working first, then work on the face.
|
2013-10-22 14:33:27 -07:00 |
|
Andrzej Kapolka
|
cd4b88acaa
|
More rotation tweaks.
|
2013-10-22 13:39:51 -07:00 |
|
Stephen Birarda
|
1eba133a6d
|
use char array of static length for pool
|
2013-10-22 13:35:26 -07:00 |
|
stojce
|
b728689c6d
|
more camera fixes
|
2013-10-22 22:18:56 +02:00 |
|
stojce
|
1cea3b403b
|
Fixed camera view options
- fixed camera lens angle
- xamera distance
|
2013-10-22 22:02:17 +02:00 |
|
Andrzej Kapolka
|
a33c7ce20c
|
More work on extracting rotations.
|
2013-10-22 12:54:32 -07:00 |
|
Stephen Birarda
|
85b5d8564f
|
pull pool from voxel server configs passed to DS
|
2013-10-22 12:14:40 -07:00 |
|
Stephen Birarda
|
b4a2214d26
|
add notion of pool back to assignment
|
2013-10-22 11:43:06 -07:00 |
|
stojce
|
2fcb246923
|
close button on rear mirror view
|
2013-10-22 20:42:31 +02:00 |
|
Philip Rosedale
|
d44a82fce1
|
Merge pull request #1097 from ZappoMan/keep_local_voxels
Fixed bug in Keep Local Voxels
|
2013-10-22 09:35:47 -07:00 |
|
ZappoMan
|
96cd8c5d97
|
fixed issue with delta frustums on hide out of view
|
2013-10-22 09:25:01 -07:00 |
|
ZappoMan
|
73d8cdacf8
|
fixed comment
|
2013-10-22 09:24:21 -07:00 |
|
ZappoMan
|
bfb9ed2229
|
fix issue with delta frustums in hideOutOfView
|
2013-10-22 09:22:55 -07:00 |
|
Philip Rosedale
|
cab9e7f658
|
Merge pull request #1094 from birarda/assignment
allow multiple buffers to be hooked to an individual node
|
2013-10-21 20:29:10 -07:00 |
|
Andrzej Kapolka
|
9d89baa506
|
Apply the neck position.
|
2013-10-21 17:30:26 -07:00 |
|
Philip Rosedale
|
c354b4a063
|
Merge pull request #1095 from ZappoMan/keep_local_voxels
Keep local voxels
|
2013-10-21 17:22:24 -07:00 |
|
Stephen Birarda
|
197f9d6f49
|
Merge branch 'master' of github.com:worklist/hifi into assignment
|
2013-10-21 17:08:41 -07:00 |
|
Andrzej Kapolka
|
b5f2dcfa55
|
Use the head position from the loaded skeleton, if available.
|
2013-10-21 16:58:01 -07:00 |
|
Stephen Birarda
|
ee1a6bd99b
|
Merge pull request #1096 from birarda/master
README touchups for QT_CMAKE_PREFIX_PATH
|
2013-10-21 16:55:27 -07:00 |
|
Stephen Birarda
|
076328d713
|
add some clarity for inclusion to profile
|
2013-10-21 16:54:57 -07:00 |
|
Stephen Birarda
|
08d1d418f8
|
touchups to README for QT_CMAKE_PREFIX_PATH
|
2013-10-21 16:43:26 -07:00 |
|
Stephen Birarda
|
cb2cb05688
|
remove the STK library as it is no longer needed
|
2013-10-21 16:32:32 -07:00 |
|
Stephen Birarda
|
73a42fbfde
|
remove dependency on Stk library and TwoPole effect
|
2013-10-21 16:30:01 -07:00 |
|
ZappoMan
|
f618b3a88d
|
removed some old comments
|
2013-10-21 16:19:03 -07:00 |
|
Andrzej Kapolka
|
349f7b363a
|
More work on custom skeletons.
|
2013-10-21 16:14:38 -07:00 |
|
ZappoMan
|
f5efe2dd7f
|
removed some old comments
|
2013-10-21 16:14:34 -07:00 |
|
ZappoMan
|
22a1d0a699
|
small tweak
|
2013-10-21 16:07:34 -07:00 |
|
Stephen Birarda
|
00446076b5
|
remove audio injectors that are starved and not added
|
2013-10-21 16:04:13 -07:00 |
|