Sam Gondelman
b19376ef6e
trying to fix connexion linker errors, general style fixes, renamed some files
2015-07-30 12:17:36 -07:00
Sam Gateau
d84e2d31ea
Merge with master
2015-07-30 11:20:00 -07:00
Stephen Birarda
fc80e427b9
remove names from audio-mixer jitter calc comments
2015-07-30 11:08:45 -07:00
samcake
b84302a44a
Merge pull request #4 from sethalves/test-5452
...
fix linux build
2015-07-30 10:16:58 -07:00
Howard Stearns
06aa107762
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-30 09:57:02 -07:00
Howard Stearns
95c43c4857
Merge pull request #11 from hyperlogic/ajt/spine-twist-fix
...
Fix for torso twist.
2015-07-30 09:50:42 -07:00
Anthony J. Thibault
4bb415fd0d
Fix for torso twist.
...
Off by one error, 0 is a valid parent bone index.
2015-07-30 09:31:23 -07:00
Brad Hefta-Gaub
96fdb32edc
Merge pull request #5461 from venkatn93/avatar
...
HBAO implementation
2015-07-30 08:46:55 -07:00
Brad Hefta-Gaub
b95e4e1e93
Merge pull request #5323 from MarcelEdward/20605
...
Removed the line where the directory is stripped off the RelativeFile
2015-07-30 07:30:01 -07:00
Marcel Verhagen
fa6d6a5123
Added the & references to the const variables
2015-07-30 15:08:02 +02:00
Seth Alves
a9556660c4
fix linux build
2015-07-29 20:53:24 -07:00
David Rowe
46b4817155
Add DDE option to couple eyelids
...
Use the most "open" value for both.
2015-07-29 20:08:58 -07:00
Brad Hefta-Gaub
398bace83c
Merge pull request #5439 from samcake/punk
...
Remove alias gl calls from Batch and Introduce a ResetStage Batch command
2015-07-29 20:05:06 -07:00
David Rowe
f943dc8492
Use single file robot model as fallback for full avatar models
...
Fixes having only a skeleton with no head if an invalid full model file
is configured.
2015-07-29 19:34:05 -07:00
Howard Stearns
ebd0e38d49
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-29 18:54:40 -07:00
Howard Stearns
dc34c025bd
whitespace
2015-07-29 18:54:05 -07:00
Howard Stearns
4e7d191fb1
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-29 18:53:38 -07:00
Niraj Venkat
291e0e21ae
HBAO final implementation
2015-07-29 18:47:27 -07:00
Brad Hefta-Gaub
5a777b17a2
Merge pull request #5444 from huffman/fix-import-large-svo
...
Fix issue with skyboxes not being importable from marketplace
2015-07-29 18:34:55 -07:00
samcake
70d64a7777
Really fixing the depth write mask issue on clear...
2015-07-29 18:27:10 -07:00
Howard Stearns
84fd67ca7a
Merge pull request #5460 from sethalves/obj-o-means-meshpart
...
treat a "o" in an obj file as if it were a "g"
2015-07-29 18:11:41 -07:00
samcake
e32e45ed2b
make sure the writting mask is on for depth buffer
2015-07-29 18:06:46 -07:00
Howard Stearns
59fe2a168e
Merge branch 'rig' of https://github.com/howard-stearns/hifi into rig
2015-07-29 18:00:11 -07:00
Howard Stearns
1dddf18243
Merge pull request #10 from hyperlogic/ajt/face-lean-eyes-rig
...
Fix avatar head, eye and torso twist.
2015-07-29 18:00:00 -07:00
Seth Alves
b7ecffa0be
treat a "g" in an obj file the same as a "o"
2015-07-29 17:55:56 -07:00
Eric Levin
0b1a36148e
Merge pull request #5457 from howard-stearns/no-idle-hip-shifting
...
Remove avatar->shift hips for idle animations.
2015-07-29 17:50:08 -07:00
samcake
ac46b2bd17
Keep the resetstage in
2015-07-29 17:38:23 -07:00
Anthony J. Thibault
c2934bdb5d
Fix avatar head, eye and torso twist.
...
* Updated SkeletionModel::updateRig to explicitly pass a set of HeadParameters
to the rig to do procedural animation.
* Moved torso lean procedural animation from SkeletonModel into Rig.
* Moved eye tracking procedural animation from HeadModel into Rig.
* Moved neck procedural animation from HeadModel into Rig.
2015-07-29 17:35:29 -07:00
Sam Gateau
8b7ad9cfcb
merge with upstream
2015-07-29 17:13:48 -07:00
Sam Gateau
ab4b940d83
merge with upstream
2015-07-29 17:11:13 -07:00
Niraj Venkat
4f2630c561
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
2015-07-29 16:54:37 -07:00
Sam Gateau
4972cb024f
Try to make the inlucde sequence simpler in gpu for GLBackend
2015-07-29 16:48:23 -07:00
Sam Gateau
5baf993c24
fixing the stars again
2015-07-29 16:27:45 -07:00
Sam Gateau
269db0ff6f
fixing the stars rendering that was vilently broken durign the hunt for GPUCOnfig.h includes
2015-07-29 16:08:16 -07:00
Howard Stearns
d73f133daa
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-29 15:45:00 -07:00
Howard Stearns
838711e526
Remove avatar->shift hips for idle animations.
...
See https://app.asana.com/0/32622044445063/43127903156601
2015-07-29 15:27:50 -07:00
Sam Gateau
3c934af297
clean the gpuCOnfig.h for linux
2015-07-29 14:45:48 -07:00
Sam Gateau
9601e09ba9
A simpler way to add the NSIGHT_FOUND define to all the projects depending on GPU
2015-07-29 14:42:24 -07:00
Sam Gateau
8c96096a67
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-29 14:04:20 -07:00
Sam Gateau
661f29924f
Clean up the cmakelist to normally onlly do th eminimal linking and include for gl
2015-07-29 13:55:26 -07:00
Sam Gateau
17650dde74
Solving the coimpiling issue with Render-utils test
2015-07-29 11:49:22 -07:00
samcake
4ebc75da1f
Merge pull request #5369 from ericrius1/hitEffect
...
Added functionality for displaying a screen-space hit effect
2015-07-29 11:28:08 -07:00
Niraj Venkat
8a833d8a00
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
2015-07-29 11:15:21 -07:00
ericrius1
65e04337bf
removed synccache line
2015-07-29 11:15:20 -07:00
Andrew Meadows
a1e6fdc4b2
Merge pull request #5435 from MarcelEdward/hifi-2-20069
...
Hifi 2 20069
2015-07-29 11:13:30 -07:00
Howard Stearns
806714b20a
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-29 11:10:59 -07:00
Niraj Venkat
d76cda396f
HBAO implementation ported from NVidia HLSL
2015-07-29 11:05:19 -07:00
Howard Stearns
6c68dbeee2
Merge branch 'sethalves-rig2' into rig
2015-07-29 10:50:10 -07:00
Howard Stearns
a9f76324b5
Merge branch 'rig' of https://github.com/sethalves/hifi into sethalves-rig2
2015-07-29 10:49:27 -07:00
ericrius1
697cb4c9d0
fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine
2015-07-29 10:02:06 -07:00
