52374 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	59da607d07	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-24 15:08:23 -07:00
Seth Alves	6e40f03c8e	cleanups	2017-03-24 15:08:13 -07:00
Seth Alves	0d2e0eb9c3	Merge pull request #9994 from sethalves/avoid-deadlock-on-10k-mesh-fbx ... Avoid deadlock on 10k mesh fbx	2017-03-24 12:34:37 -08:00
Brad Hefta-Gaub	9b26e8ee95	Merge pull request #9871 from Triplelexx/21208 ... 21208 - Muted microphone indicator	2017-03-24 13:07:43 -07:00
Seth Alves	8f7f5efade	new javascript call: Model.newMesh()	2017-03-24 12:51:00 -07:00
Seth Alves	642cf57976	obj-writer now outputs normals	2017-03-24 12:49:58 -07:00
Ryan Huffman	bb09dd9414	Merge pull request #9988 from huffman/fix/touch-detection-after-launch ... Fix Oculus Touch + Remote not being detected after initial launch	2017-03-24 11:37:57 -07:00
Lexx	fa606446a7	remove cache buster	2017-03-24 18:27:38 +00:00
Seth Alves	aaa78d108b	if a model has too many meshes, give up.	2017-03-24 11:17:24 -07:00
Seth Alves	e1e51614d9	don't hang loop if entity isDead	2017-03-24 11:16:54 -07:00
Clément Brisset	5ff7dbb254	Merge pull request #9991 from Atlante45/fix/entity-bad-url ... Show entity bounding box for bad URLs	2017-03-24 10:56:06 -07:00
Brad Hefta-Gaub	1972b140b9	Merge pull request #9976 from mittens/21215 ... Worklist #21215 - Removing Duplicate Status Icons for Submeshes	2017-03-24 08:52:12 -07:00
Brad Hefta-Gaub	9a38b36f59	Merge pull request #9970 from Triplelexx/21223 ... 21223 - Quat functions have naming inconsistencies	2017-03-24 08:12:11 -07:00
Brad Hefta-Gaub	aa1883ba85	Merge pull request #9979 from jherico/crash_fix ... Fix crash in render-perf-test	2017-03-24 08:10:37 -07:00
Atlante45	4f8d9b190b	Show green box when model entity has bad url	2017-03-23 17:56:33 -07:00
Ryan Huffman	56c5f06365	Fix Oculus Touch + Remote not being detected after initial launch	2017-03-23 16:29:08 -07:00
Brad Hefta-Gaub	20bc32fc89	Merge pull request #9980 from birarda/bug/ac-agent-audio ... make sure the AC agent has an AudioScriptingInterface	2017-03-23 15:13:24 -07:00
Zach Fox	a231b57472	Merge pull request #9962 from birarda/cmake-with-space ... Fix failing POST_BUILD steps on Windows with spaces in build path	2017-03-23 11:41:38 -07:00
Seth Alves	bb1c556c91	forgot a file	2017-03-23 11:04:50 -07:00
Seth Alves	ba0c9e405a	cleanup	2017-03-23 10:38:57 -07:00
Seth Alves	f5680def55	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-23 09:55:41 -07:00
Seth Alves	93992bb427	Merge branch 'model-scripting-2' of github.com:sethalves/hifi into model-scripting-2	2017-03-23 09:55:35 -07:00
Seth Alves	ce9bb439b3	change Model api in anticipation of more than just PolyVox being able to give meshes to javascript	2017-03-23 09:55:30 -07:00
samcake	73227f6598	Merge pull request #9958 from highfidelity/smarter_textures ... New texture streaming system	2017-03-23 09:44:31 -07:00
Stephen Birarda	b53cb5934b	make sure the AC agent has an AudioScriptingInterface	2017-03-22 23:35:29 -07:00
Brad Davis	944255a37b	Fix crash in render-perf-test	2017-03-22 22:44:05 -07:00
Brad Davis	3a40fd886f	Fix comparison between GL stamps and GPU stamps	2017-03-22 18:11:20 -07:00
Brad Davis	4868a1618a	Add initialization to sampler stamp	2017-03-22 18:10:54 -07:00
Brad Davis	893fcba283	Return the correct format and internal format combo for depth textures	2017-03-22 17:14:40 -07:00
Seth Alves	df875ab504	make RenderablePolyVoxEntityItem::setSphere affect any voxel the sphere touches rather than just the ones whose center the sphere touches	2017-03-22 16:21:45 -07:00
Brad Davis	9a3686fc1a	Fixing merge conflict	2017-03-22 14:55:11 -07:00
Triplelexx	09cbace975	remove unused getBodyForwardDirection	2017-03-22 21:54:21 +00:00
Brad Davis	85c80f3be8	Merge remote-tracking branch 'upstream/master' into smarter_textures ... Conflicts: libraries/gpu/src/gpu/Texture.cpp	2017-03-22 14:25:23 -07:00
Andrew Meadows	a463013d90	Merge pull request #9960 from samcake/blue ... Fix Ambient Lighting equation	2017-03-22 14:13:31 -07:00
Chris Collins	05c40d2930	Merge pull request #9933 from mittens/hotfix/obj-texture-fix ... Fixed the texture assignment for the OBJ loader	2017-03-22 13:19:01 -07:00
trent	c71e57753b	Removing changes (albeit benign ones) from another PR.	2017-03-22 15:23:40 -04:00
Triplelexx	c7b9492620	revert removing rightUnitVec ... .....	2017-03-22 19:14:20 +00:00
trent	36619cd2e4	Fixed issue with duplicate physics status icons per sub-object.	2017-03-22 15:07:29 -04:00
Triplelexx	216f20ed2c	rename fronts to forwards	2017-03-22 19:03:39 +00:00
Triplelexx	d1db04f93a	fix lost forwardOffset declaration	2017-03-22 18:57:00 +00:00
Triplelexx	fd312f6bf8	rename fronts to forwards	2017-03-22 18:49:34 +00:00
Triplelexx	31ec9b832f	rename fronts to forwards	2017-03-22 18:43:30 +00:00
Triplelexx	c2cff55427	rename fronts to forwards	2017-03-22 18:41:06 +00:00
trent	83d69e65b3	Merge branch 'master' of https://github.com/highfidelity/hifi into 21215	2017-03-22 14:20:37 -04:00
Triplelexx	2fc8dd48de	change testFront to testForward	2017-03-22 17:13:45 +00:00
Triplelexx	2d1ca99e2e	change variable names that use Quat.getForward	2017-03-22 17:00:12 +00:00
Ryan Huffman	1285f2a9eb	Merge pull request #9937 from thoys/boppo ... El Boppo the Clown punching bag game	2017-03-22 09:30:54 -07:00
Thijs Wenker	dff67886d0	CR Changes - remove double constructor, use creation function instead	2017-03-22 17:28:10 +01:00
Brad Davis	e60108cc8c	PR comments	2017-03-21 17:26:24 -07:00
Triplelexx	2515563a0b	change getFront to getForward	2017-03-21 22:35:07 +00:00