ZappoMan
|
b4c88a85f8
|
improvements to subtle moves for view frustum and voxel serving
|
2013-10-23 17:49:58 -07:00 |
|
ZappoMan
|
3efc277aae
|
wrap more displaySide() items for not rendering when in mini rear view mode
|
2013-10-23 14:19:25 -07:00 |
|
ZappoMan
|
d31c3854ad
|
fix merge issue
|
2013-10-23 12:06:11 -07:00 |
|
ZappoMan
|
ea844634a6
|
Merge branch 'master' of https://github.com/worklist/hifi into fix_mirror_mode
|
2013-10-23 11:59:47 -07:00 |
|
ZappoMan
|
55294e1de7
|
Merge pull request #1103 from ey6es/master
As a temporary measure, restore the full screen mirror as a menu option.
|
2013-10-23 11:59:39 -07:00 |
|
ZappoMan
|
46eadb5fb7
|
Merge branch 'master' of https://github.com/worklist/hifi into fix_mirror_mode
|
2013-10-23 11:58:47 -07:00 |
|
ZappoMan
|
161367c899
|
fix rear view mirror mode to only render self
|
2013-10-23 11:58:01 -07:00 |
|
Andrzej Kapolka
|
183a866e9e
|
Remove code that will be added back in fullscreen mirror request.
|
2013-10-23 11:44:28 -07:00 |
|
Andrzej Kapolka
|
e8885332f2
|
Code review fixes.
|
2013-10-23 11:39:30 -07:00 |
|
Andrzej Kapolka
|
665551d690
|
Merge branch 'master' of https://github.com/worklist/hifi into ossome
|
2013-10-23 11:26:23 -07:00 |
|
Andrzej Kapolka
|
5334d9021e
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-10-23 11:22:04 -07:00 |
|
Andrzej Kapolka
|
71b4b8fe46
|
Use lowercase h to toggle full screen mirror, capital H for inset.
|
2013-10-23 10:54:39 -07:00 |
|
Philip Rosedale
|
b1364f589a
|
Merge pull request #1102 from ZappoMan/keep_local_voxels
added support for forceFullFrustum in hideOutOfView() this fixes inconci...
|
2013-10-23 10:33:54 -07:00 |
|
Andrzej Kapolka
|
adc79be81c
|
Add back the full screen mode as a menu option, temporarily.
|
2013-10-23 10:30:42 -07:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Andrzej Kapolka
|
b5f2dcfa55
|
Use the head position from the loaded skeleton, if available.
|
2013-10-21 16:58: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 |
|
ZappoMan
|
1b302f60f8
|
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
|
2013-10-21 16:03:53 -07:00 |
|