1675 commits

Author	SHA1	Message	Date
ericrius1	5f881e7650	polylines now take color as a uniform	2015-12-03 13:46:29 -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
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
ericrius1	71d361ed3b	fixed hydra paint, adding more interactive brushes	2015-11-30 17:06:35 -08:00
Atlante45	4aaa9ca02f	Make OctreeElementBag safer to use	2015-11-30 15:23:49 -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
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
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
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
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
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
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