Seth Alves
45643a3aad
try, try again
2015-08-04 14:36:16 -07:00
Seth Alves
a4bf169ade
on windows, copy zlib dll next to programs that link with shared
2015-08-04 14:13:41 -07:00
Seth Alves
ff477b35a8
fix zlib include directory
2015-08-04 11:33:39 -07:00
Seth Alves
fb9fa76018
adjust comments
2015-08-04 08:26:28 -07:00
Seth Alves
5369f4c5eb
adjust comments
2015-08-04 08:25:33 -07:00
Seth Alves
adcd91e3ff
Added an option to domain-server settings to persist entities as gzipped json. With this setting enabled, persist files take much less space on disk than with the other two options.
2015-08-04 07:23:24 -07:00
Andrew Meadows
acfc907704
Merge pull request #5438 from howard-stearns/rig
...
Rig: Bottleneck animation management through a Rig class
2015-08-03 11:14:21 -07:00
Howard Stearns
8f616c04fb
Fix https://app.asana.com/0/32622044445063/43589567731045
2015-08-02 21:46:39 -07:00
ZappoMan
493836e363
remove QUADS from GLBackendShared and Format
2015-08-01 17:26:38 -07:00
ZappoMan
b02f751830
diff redux
2015-08-01 16:53:35 -07:00
ZappoMan
b138c16c7f
use Austins QUAD to TRIANGLE_STRIP approach
2015-08-01 16:50:36 -07:00
ZappoMan
05a4a6aa9b
implement on-the-fly conversion of FBXMeshParts that are quads, into their triangle equivalents
2015-08-01 13:07:56 -07:00
ZappoMan
452225ddaf
removed QUADS from Font::drawString()
2015-08-01 11:51:07 -07:00
ZappoMan
1dd6c1117d
change GeometryCache::renderQuad() to use TRIANGLES as lower level render primitive
2015-08-01 11:29:28 -07:00
Howard Stearns
2713115336
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-31 18:05:47 -07:00
Howard Stearns
0dad1adf7d
Speculative guard against crashing.
2015-07-31 18:05:14 -07:00
Seth Alves
bbee001366
Merge pull request #5470 from birarda/master
...
fix for unique_ptr<char> allocations
2015-07-31 15:09:18 -07:00
Stephen Birarda
b0afdb21ad
correct the unique_ptr char allocations
2015-07-31 14:29:05 -07:00
Brad Hefta-Gaub
b46a430fba
Merge pull request #5468 from bwent/reset-position
...
Add gettable naturalPosition property for model entities
2015-07-31 11:03:27 -07:00
bwent
aab1f70800
Renaming vars
2015-07-31 10:47:05 -07:00
bwent
67760fad79
Add gettable naturalPosition property for model entities
2015-07-31 10:15:35 -07:00
Howard Stearns
b685378ab0
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-31 10:08:30 -07:00
samcake
fbf21cb089
FIxed the problem on Mac, by removing all of the gpuConfig includesgit status
...
q
:q
wq
2015-07-30 18:27:47 -07:00
Howard Stearns
51ed912f5e
Merge branch 'rig' of https://github.com/howard-stearns/hifi into rig
2015-07-30 17:03:06 -07:00
Howard Stearns
78a900c866
Prototype blend. Just equal weighting for now.
2015-07-30 17:01:48 -07:00
Anthony J. Thibault
e52bf2e12d
Fix for head cauterization.
...
When rendering rigidly bound mesh clusters were not properly using
the cauterization matrix set.
2015-07-30 15:51:34 -07:00
Sam Gateau
14f4c9c6c0
REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend
2015-07-30 15:07:36 -07:00
Anthony J. Thibault
7a10b31dd9
Clear translation on root joint.
...
Also, delete/rename all instances of updateJointState except for the one in Rig
and derived classes.
2015-07-30 15:04:27 -07:00
Sam Gateau
d84e2d31ea
Merge with master
2015-07-30 11:20:00 -07:00
Howard Stearns
06aa107762
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-30 09:57:02 -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
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
Niraj Venkat
291e0e21ae
HBAO final implementation
2015-07-29 18:47:27 -07:00
samcake
70d64a7777
Really fixing the depth write mask issue on clear...
2015-07-29 18:27:10 -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
Seth Alves
b7ecffa0be
treat a "g" in an obj file the same as a "o"
2015-07-29 17:55:56 -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
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
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
Sam Gateau
3c934af297
clean the gpuCOnfig.h for linux
2015-07-29 14:45:48 -07:00
