1799 commits

Author	SHA1	Message	Date
Seth Alves	138125faab	fix-up parentJointIndex in terse logging	2015-12-06 05:42:51 -08:00
Seth Alves	d518a4573e	if script sets parent or jointIndex, don't pop entity off to someplace	2015-12-05 15:15:33 -08:00
Seth Alves	1f0150f65f	add parentID and parentJointIndex to terse logging	2015-12-05 15:12:44 -08:00
Atlante45	1d498af76e	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-12-04 15:18:25 -08:00
Ryan Huffman	89c412c324	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-12-04 11:38:28 -08:00
Brad Hefta-Gaub	d9a1563396	Merge pull request #6152 from sethalves/parents ... Parents	2015-12-04 10:26:57 -08:00
ericrius1	7e7327042a	Merge branch 'master' into polylineOptimizations	2015-12-04 09:53:01 -08:00
Brad Hefta-Gaub	5a75a17174	Revert "Cruft removal"	2015-12-03 17:40:41 -08:00
Clément Brisset	fa52b97f61	Merge pull request #6538 from ZappoMan/cruftRemoval ... Cruft removal	2015-12-03 17:03:04 -08:00
Atlante45	c8ab95bb53	Spacing	2015-12-03 15:01:18 -08:00
Atlante45	180ffcc456	Typo (English is weird)	2015-12-03 15:01:18 -08:00
ericrius1	5f881e7650	polylines now take color as a uniform	2015-12-03 13:46:29 -08:00
Brad Hefta-Gaub	1a5bc5d111	removing optional compression	2015-12-03 12:40:24 -08:00
Seth Alves	4e74c98ae7	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-12-03 11:00:13 -08:00
Seth Alves	6f79b381f9	working toward making children of avatar joints work	2015-12-03 11:00:06 -08:00
Ryan Huffman	667d2b728e	Fix uninitialized xColor value when converting script value	2015-12-03 09:52:56 -08:00
ericrius1	07430fb75a	Merge branch 'master' into polylineOptimizations	2015-12-02 15:59:32 -08:00
Brad Hefta-Gaub	1e51a90204	add edit times and entity ids to the viewer stats	2015-12-02 14:43:00 -08:00
Seth Alves	6eae98fb28	merge from upstream	2015-12-02 14:38:26 -08:00
Brad Hefta-Gaub	08ba535c38	add some basic send tracking	2015-12-02 13:43:05 -08:00
Brad Hefta-Gaub	112cdaf028	Merge pull request #6512 from AndrewMeadows/remove-debug-cruft ... remove debug option for disabling physics updates	2015-12-02 10:00:29 -08:00
Brad Hefta-Gaub	75a57c3cb8	Merge pull request #6500 from Atlante45/octree_crash ... Octree crash fix	2015-12-02 09:59:56 -08:00
Andrew Meadows	ab6367ff4e	remove debug option for disabling physics updates	2015-12-01 11:13:01 -08:00
Atlante45	083205916f	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-30 18:25:53 -08:00
ericrius1	71d361ed3b	fixed hydra paint, adding more interactive brushes	2015-11-30 17:06:35 -08:00
Seth Alves	b7ebe5b92b	merge from upstream	2015-11-30 16:59:52 -08:00
Seth Alves	3402585d1a	fix a crash from previous commit	2015-11-30 16:54:29 -08:00
Seth Alves	9b54924524	edit.js can now manipulate children without flipping the table	2015-11-30 16:21:14 -08:00
Atlante45	4aaa9ca02f	Make OctreeElementBag safer to use	2015-11-30 15:23:49 -08:00
Seth Alves	89b78986d5	remove some more stray const	2015-11-30 14:01:17 -08:00
Stephen Birarda	4573e5c59e	resolve conflicts on merge with upstream/master	2015-11-30 13:32:38 -08:00
Seth Alves	4b87e09848	clean up some unneeded consts. get edit.js closer to working on parented entities	2015-11-30 13:23:55 -08:00
Ryan Huffman	99dd9646bc	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-11-30 10:20:13 -08:00
Seth Alves	4add3e2e91	rework worldToLocal, start on allowing scripts entity position/rotation to always be in world space	2015-11-30 09:41:15 -08:00
Seth Alves	cf39cac7fc	attempt to make SpatiallyNestable data access thread-safe	2015-11-29 12:50:33 -08:00
Seth Alves	eb50c9de5f	aabox delivered to scripts in properties should be in world space	2015-11-29 10:16:56 -08:00
Seth Alves	6062691c2a	minimize diff vs master	2015-11-26 07:04:27 -08:00
Seth Alves	10cf85bad9	fix some rotation handling in EntityItem, minimize diff vs master	2015-11-26 07:02:53 -08:00
Seth Alves	ca75802b9c	unmangle merge	2015-11-26 06:43:28 -08:00
Atlante45	a364e85e1d	Remove DeleteHooks	2015-11-25 17:21:56 -08:00
Anthony J. Thibault	23def8d173	Merge branch 'master' into tony/remove-joint-states	2015-11-25 13:55:23 -08:00
Clément Brisset	5ff482071e	Merge pull request #6465 from ericrius1/polyLineFix ... moved logic to build vertex buffer to renderable polyline class, recalculati…	2015-11-25 11:02:02 -08:00
Anthony J. Thibault	f120e10ff4	Merge branch 'master' into tony/remove-joint-states	2015-11-24 15:00:05 -08:00
Atlante45	0f316e6ae1	Remove particles emiter bounds compute	2015-11-24 11:51:56 -08:00
Atlante45	e25ea122d8	Start moving update to shader	2015-11-24 11:51:56 -08:00
Atlante45	ca17c75631	Save one array traversal	2015-11-24 11:51:56 -08:00
Atlante45	230a413ec1	First pass at new particle shader	2015-11-24 11:51:56 -08:00
Atlante45	7d0a5677fa	More code cleanup	2015-11-24 11:51:56 -08:00
Atlante45	964ac5bad6	More cleanup	2015-11-24 11:51:56 -08:00
Atlante45	c33b6205a8	Some cleanup	2015-11-24 11:51:56 -08:00
Atlante45	40e802bae7	Get rid of global variable for sort ... Fix rhs/lhs	2015-11-24 11:51:56 -08:00
Atlante45	a71ed7b166	Implement particle bounds with Extents	2015-11-24 11:51:56 -08:00
Philip Rosedale	dde01b2071	Merge pull request #6476 from AndrewMeadows/arrow ... fix for objects suffering from very small updates to physics properties	2015-11-24 11:22:25 -08:00
Andrew Meadows	e26081e981	always update physics properties when they change ... and move activation check logic to MotionState	2015-11-24 10:20:19 -08:00
Ryan Huffman	dac491ef41	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-11-24 09:59:22 -08:00
Stephen Birarda	5a7b0dd1ad	put the parsed model URL in ModelEntityItem	2015-11-24 11:46:51 -06:00
ericrius1	1409ed2d18	moved logic to build vertices buffer to renderable class, recalculating vertices anytime any of the normals, point, or strokeWidths data changes	2015-11-23 12:28:44 -08:00
Anthony J. Thibault	dd3f43705c	Fix for Model Entity animations. ... Because rig->setJoint* methods take parameters in geometry space the animations preRotation has to be applied manually.	2015-11-23 11:06:11 -08:00
Seth Alves	6f19093cb9	if an entity with an action has a motion-type of static, flag it so it gets updated in bullet	2015-11-23 10:03:35 -08:00
Seth Alves	a0c1f9a1f9	progress toward having things be children of specific joints rather than just of other objects	2015-11-22 13:11:37 -08:00
Seth Alves	4646c0c103	unmangle merge	2015-11-21 10:49:31 -08:00
Seth Alves	f013f95e9b	merge from upstream	2015-11-21 08:43:00 -08:00
Brad Hefta-Gaub	c7673aad4a	Merge pull request #6447 from huffman/polyline-texture ... Add texture property to polyline entity type	2015-11-20 13:31:34 -08:00
Ryan Huffman	9e31614fce	Fix textures property not being sent for polyline	2015-11-19 15:16:46 -08:00
Ryan Huffman	2a416ebc61	Merge branch 'master' of https://github.com/highfidelity/hifi into received-message	2015-11-18 16:52:23 -08:00
Brad Hefta-Gaub	2f3cf82202	don't apply out of order edits to entities that have been deleted	2015-11-18 14:26:18 -08:00
Ryan Huffman	2fe9af54d4	Add textures property to polyline	2015-11-18 13:59:32 -08:00
Philip Rosedale	5b853ddf57	Merge pull request #6402 from sethalves/grab-equip ... grab script bumper is an equip toggle	2015-11-17 20:15:26 -08:00
Philip Rosedale	450608bf5b	Merge pull request #6390 from sethalves/average-near-holds ... Average near holds	2015-11-17 20:01:46 -08:00
Seth Alves	1d4e1eabcb	Merge branch 'master' of github.com:highfidelity/hifi into grab-equip	2015-11-17 11:01:22 -08:00
Seth Alves	b062d23f61	bumper is now an equip toggle	2015-11-17 09:51:52 -08:00
David Rowe	b3b73e8cd1	Fix particle aging	2015-11-17 12:02:35 +13:00
Seth Alves	b567a4846d	Merge branch 'master' of github.com:highfidelity/hifi into average-near-holds	2015-11-16 10:08:01 -08:00
Seth Alves	89ed3751ae	Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug	2015-11-14 14:00:20 -08:00
Seth Alves	b0d24be58f	add a way to get a list of all actions of a certain type from an entity. hold actions average their positional targets.	2015-11-13 16:02:39 -08:00
Stephen Birarda	e263453acb	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-13 14:48:26 -08:00
Seth Alves	3746920655	allow action updates from others when we are the simulation owner	2015-11-13 13:56:30 -08:00
Seth Alves	6ec5b12081	send to network when an action is deleted, also	2015-11-13 09:52:35 -08:00
Seth Alves	3f7f5a2bbd	send to network when an action is deleted, also	2015-11-13 09:49:31 -08:00
Seth Alves	5acbb74362	send to network when an action is deleted, also	2015-11-13 09:45:06 -08:00
Seth Alves	7979fb38cf	don't always send actiondata along with other physics related properties	2015-11-13 09:25:17 -08:00
Seth Alves	dbaea5770a	include action data in properties suppressed by non-simulation ownership	2015-11-12 18:28:26 -08:00
Brad Hefta-Gaub	ecaa50c0ff	fix for infinite loop in erase entities special packet	2015-11-12 18:25:18 -08:00
Seth Alves	d7be1699a7	adjust how the decision to send action changes over the wire is made	2015-11-12 15:27:10 -08:00
Seth Alves	a8cd891e48	adjust how the decision to send action changes over the wire is made	2015-11-12 14:19:23 -08:00
Stephen Birarda	ef778c554c	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-12 10:40:51 -08:00
Seth Alves	cffe4551dd	merge from upstream	2015-11-11 16:15:07 -08:00
Seth Alves	07f3d8eca0	more debugging prints	2015-11-11 16:03:08 -08:00
Brad Hefta-Gaub	2f903a9513	CR feedback and some cleanup	2015-11-11 14:21:14 -08:00
Brad Hefta-Gaub	bdfe304f7a	remove some logging	2015-11-11 14:08:15 -08:00
Brad Hefta-Gaub	040bae6014	more debugging	2015-11-11 12:31:50 -08:00
Brad Hefta-Gaub	866116d285	more debugging	2015-11-11 12:13:47 -08:00
Seth Alves	31ebe5dba1	terse logging for sim ownership	2015-11-11 08:51:10 -08:00
Seth Alves	39b92d2b52	terse log when ownership changes	2015-11-10 17:06:12 -08:00
Brad Hefta-Gaub	3316b63bf6	add a fixme comment	2015-11-10 15:46:53 -08:00
Brad Hefta-Gaub	006a1d60c8	keep some additional erase entities history and send to viewers	2015-11-10 15:31:51 -08:00
Seth Alves	df5d161721	adjust how EntityMotionState updates its idea of what the server knows about an entity	2015-11-10 15:02:17 -08:00
Seth Alves	82bd506086	adjust how EntityMotionState updates its idea of what the server knows about an entity	2015-11-10 14:32:57 -08:00
Seth Alves	5e4f30b2bb	improve terse entity logging. change how action data sending is triggered	2015-11-10 13:58:09 -08:00
Atlante45	b15054c1fb	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-09 13:41:06 -08:00