1641 commits

Author	SHA1	Message	Date
samcake	16e6f0900d	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis	2017-04-10 10:12:23 -07:00
Sam Cake	b65448bcbe	Trying to improve the Job/Task classes and testing it with the ZoneRenderer	2017-04-09 11:08:35 -07:00
Brad Hefta-Gaub	0d4649ded8	Merge pull request #10079 from jherico/entity_thread_safety ... Thread safety for property getter/setters on entities	2017-04-07 19:01:07 -07:00
Seth Alves	03065ee6c8	Merge pull request #9938 from kunalgosar/jsRenderBug ... Stop WebEntities Running Files and Commands	2017-04-07 13:44:03 -07:00
samcake	6fc965072c	Adding the Selection, and not the Tag concept fro real, and beeing able to reset it from the Transaction and simply communicating the ranked zones to the engine through a selection, ready to be used by the ZOneREnderer	2017-04-06 15:19:55 -07:00
samcake	6122155880	Renaming the PendingCHanges class to Transaction	2017-04-05 13:10:31 -07:00
Brad Davis	15f7e895aa	More thread safety	2017-04-04 15:09:21 -07:00
kunalgosar	19ab7526d3	apply profile to relevant entities	2017-04-04 11:54:21 -07:00
Brad Davis	d89104f69c	Use getters instead of direct member access	2017-04-04 10:50:55 -07:00
Seth Alves	6080c4782a	fix polyvox shader	2017-03-28 16:44:31 -07:00
Seth Alves	4516ddf855	Merge pull request #9847 from highfidelity/tablet-ui ... Tablet ui	2017-03-28 14:48:02 -07:00
Seth Alves	6df4dda746	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 11:42:14 -07:00
Seth Alves	6f6343420c	don't crash if entity dimensions somehow include a zero	2017-03-28 10:56:33 -07:00
Seth Alves	7641677902	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-28 10:14:49 -07:00
Seth Alves	b50a02ea19	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 08:16:59 -07:00
Seth Alves	8da91695df	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-27 20:15:54 -07:00
Andrew Meadows	18544581e6	remove warnings about implicit float cast	2017-03-27 14:40:31 -07:00
Brad Hefta-Gaub	3bdcfd8b78	Merge pull request #9796 from ZappoMan/removePropertiesFromRayPick ... remove properties from RayToEntityIntersectionResult	2017-03-27 14:26:51 -07:00
Seth Alves	d0c8994a8c	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-27 09:51:40 -07:00
Seth Alves	5ed0ff729b	cleanups	2017-03-27 07:25:40 -07:00
Seth Alves	2682586c38	some clean-ups and a bug fix in PolyVox to mesh code	2017-03-27 06:50:06 -07:00
Seth Alves	c21b8b4eac	raise max mesh count for static collision entities from 500 to 1000	2017-03-26 08:48:08 -07:00
Seth Alves	f1470e34f9	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-24 15:17:52 -07:00
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	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
Seth Alves	8f7f5efade	new javascript call: Model.newMesh()	2017-03-24 12:51:00 -07:00
Seth Alves	aaa78d108b	if a model has too many meshes, give up.	2017-03-24 11:17:24 -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
ZappoMan	ddd0645453	fix merge issue	2017-03-24 09:59:11 -07:00
ZappoMan	bc331af6a0	Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick	2017-03-24 08:46:43 -07:00
Seth Alves	902e3d41d6	merge from upstream	2017-03-24 08:20:35 -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
ZappoMan	246f377a07	Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick	2017-03-23 10:40:37 -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
Seth Alves	ff3fc244d1	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-23 09:50:53 -07:00
Brad Davis	944255a37b	Fix crash in render-perf-test	2017-03-22 22:44:05 -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	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
Seth Alves	cc4ddd1387	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 08:43:35 -08:00
Brad Hefta-Gaub	ac309df3d1	Merge pull request #9946 from sethalves/model-scripting-1 ... Model scripting	2017-03-21 09:26:32 -07:00
Brad Davis	e482eac437	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-20 16:22:13 -07:00
Seth Alves	67507f1f05	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-20 09:37:53 -07:00
Seth Alves	98cae8d152	added EntityScriptingInterface::getEntityLocalTransform. try harder to make sure polyvox mesh is ready before giving it to javascript	2017-03-20 09:37:46 -07:00
Chris Collins	308c134119	Merge pull request #9686 from humbletim/21114-part3 ... CR 21114 -- Implement modules/require support into hifi	2017-03-20 06:22:35 -07:00
Seth Alves	424af2255b	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-19 21:17:30 -08:00
Seth Alves	b876d22e46	fix handling of normals. don't crash when extracting a mesh from a polyvox with no 'on' voxels	2017-03-18 22:36:24 -07:00