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
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
Howard Stearns
12d449f69d
Update test case initialization post cauterization changes.
2015-07-29 09:55:46 -07:00
Howard Stearns
7fdba9132e
Revert Camera.h changes.
2015-07-29 09:55:19 -07:00
Sam Gateau
76acbde595
Removing the opengl and glew links from Interface since now coming from gpu lib
2015-07-29 09:54:10 -07:00
samcake
bc941147f4
Merge pull request #5446 from bwent/cookies
...
Add cookies.js functionality for collapsable subpanels, key navigation
2015-07-29 09:53:07 -07:00
Howard Stearns
66621d31e8
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-29 09:26:36 -07:00
bwent
7805cf4e48
Format fixes, UI logos for collapse/expand toggle
2015-07-29 09:19:33 -07:00
Howard Stearns
68aec1fd36
Merge branch 'rig' of https://github.com/howard-stearns/hifi into rig
2015-07-29 09:12:44 -07:00
Howard Stearns
327ecfe62c
Be less noisy.
2015-07-29 09:11:58 -07:00
Howard Stearns
711dce4edc
Merge pull request #9 from hyperlogic/ajt/cauterize-head-fix
...
Remove cauterize code from Rig and move it back into Model.
2015-07-29 09:09:28 -07:00
Thijs Wenker
7325e6a7b7
Send ping requests to the nodes (AvatarMixer, AudioMixer, EntityServer) that the Assignment agent connected with to keep the connections alive.
2015-07-29 14:57:06 +02:00
Marcel Verhagen
1d29fb9d7f
replace tabs with whitespaces.
2015-07-29 14:56:24 +02:00
Brad Davis
6a5c2982ac
Merge pull request #5453 from hyperlogic/ajt/mirror-anchor-fix
...
Changed mirror position to not be achored to the head.
2015-07-28 20:26:19 -07:00
Anthony J. Thibault
044ea2ace5
Changed mirror position to not be achored to the head.
...
But instead it's anchored to the "default" eye position, which
is where the eyes are in the model, before IK or animations occur.
2015-07-28 19:31:43 -07:00
