603 commits

Author	SHA1	Message	Date
Andrew Meadows	bf3ff8daea	fix crash for convex hull of co-planar points	2015-07-22 15:06:10 -07:00
Stephen Birarda	8b5026a817	cleanup some warnings	2015-07-15 11:20:55 -07:00
Stephen Birarda	821c16cbc4	resolve conflicts on merge with uptream/master	2015-07-14 09:52:20 -07:00
Seth Alves	848e5bcebf	this code can be called for hold actions if they end up in an svo save. revert a line from a previous commit	2015-07-12 13:43:21 -07:00
Andrew Meadows	9ce9c541de	fix activation of object when action changes	2015-07-10 18:45:40 -07:00
Andrew Meadows	294c1ba367	always serialize ACTION_TYPE_SPRING	2015-07-10 12:25:11 -07:00
Andrew Meadows	56f00a526d	cleanup of ObjectActionSpring	2015-07-10 12:25:11 -07:00
Andrew Meadows	90ae1fea8b	handle case where action params are missing	2015-07-10 12:25:11 -07:00
Seth Alves	85f206d49d	if an action is updating its own arguments, cause updates to go out over network	2015-07-09 14:13:01 -07:00
Stephen Birarda	1b4e333c49	Merge pull request #3 from birarda/atp ... initial networking API changes for new protocol	2015-07-09 16:51:37 -04:00
Andrew Meadows	55207a8fb1	enforce coding standards	2015-07-09 11:59:28 -07:00
Andrew Meadows	ccf14b2e50	fix syntax error typo	2015-07-09 11:43:57 -07:00
Andrew Meadows	612e9649d8	fix update logic of ObjectActionOffset	2015-07-09 11:35:54 -07:00
Andrew Meadows	46bca30698	MotionState reports zero velocity for slow objects ... This reduces the number of updates for an Entity that is effectively at rest due to a balance between some spring action and gravity, but nevertheless has a slight non-zero velocity at the end of each simulation step.	2015-07-09 11:34:27 -07:00
Stephen Birarda	da3502eb6c	resolve conflicts on merge with upstream/master	2015-07-08 18:41:48 -07:00
Andrew Meadows	58c32dbf20	remove whitespace from end of lines	2015-07-08 11:30:04 -07:00
Stephen Birarda	74940a2132	replace lingering PacketTypes in old format	2015-07-08 10:18:13 -07:00
Andrew Meadows	a0a1b01ea9	coalesce dupe action data members: _id and _type	2015-07-07 17:50:08 -07:00
Andrew Meadows	e9df8cacc7	make some arguments const, cleanup some #includes	2015-07-07 17:50:08 -07:00
Andrew Meadows	77bd7b2821	some ObjectAction methods should be const	2015-07-07 17:50:08 -07:00
Seth Alves	e8a6acd65b	responses to code review	2015-07-01 10:42:04 -07:00
Seth Alves	5e2f7204b4	responses to code review	2015-07-01 10:29:42 -07:00
Seth Alves	a356cbf620	remove commented code	2015-07-01 07:33:46 -07:00
Seth Alves	6e7973f5b9	coding-standard / code-review	2015-06-30 19:28:22 -07:00
Seth Alves	505332c367	include action data among physics initiated network updates from interface to entity-server	2015-06-30 10:19:03 -07:00
Seth Alves	c3747ab8aa	initialize some variables	2015-06-29 19:40:57 -07:00
Seth Alves	88fc74374b	if a hold action is edited by a local script, mark it as 'mine'. if it's not 'mine', let the spring action handle the wire protocol	2015-06-29 19:27:10 -07:00
Seth Alves	fbede0a23f	guard against feeding bullet a NaN	2015-06-29 15:54:24 -07:00
Seth Alves	c539d9f233	allow for removal and readdition of an action in one time-slice without asserting	2015-06-29 12:22:06 -07:00
Seth Alves	1d122060a6	merge andrew's sim-ownership branch	2015-06-29 09:50:38 -07:00
Seth Alves	0970f010a4	provide a way for scripts to get information about what actions an entity has and what the arguments of those actions are	2015-06-27 13:31:00 -07:00
Seth Alves	c0c1116c69	attempt some clean-ups in edge/unexpected situations	2015-06-27 11:09:28 -07:00
Seth Alves	30be515a94	remove unneeded lock around action-data in entity item. Actions now use a weak pointer to keep track of owner entity	2015-06-27 08:53:27 -07:00
Andrew Meadows	4d4b97fe59	add priority promotion to reduce volunteer races ... also fix priority inheritance from chained collisions	2015-06-26 22:30:06 -07:00
Andrew Meadows	e18506c77f	promote volunteer priority ... also remove some cruft change uint8_t to be quint8	2015-06-26 22:00:43 -07:00
Andrew Meadows	d6c69e8fe6	pack terse update parameters near each other ... also don't constantly resend ownership data	2015-06-26 22:00:43 -07:00
Andrew Meadows	40f6ecd936	fix crash for dereference null pointer	2015-06-26 21:58:40 -07:00
Andrew Meadows	44d3074561	remove debug code	2015-06-26 21:58:03 -07:00
Andrew Meadows	12fc18092b	SimulationOwner as one property	2015-06-26 21:58:03 -07:00
Andrew Meadows	cf74dbe1dc	partial progress toward sim ownership negotiations ... works well for just a few objects but fails for piles committing some debug stuff that will have to be torn out later	2015-06-26 21:57:04 -07:00
Andrew Meadows	a33c350385	improved forcing of simulator ownership bid	2015-06-26 21:57:04 -07:00
Andrew Meadows	8510110324	increase sim priority when flagged for ownership	2015-06-26 21:57:04 -07:00
Andrew Meadows	2579247c34	claim ownership faster for scripted manipulations	2015-06-26 21:57:04 -07:00
Andrew Meadows	7c793c6397	accept simulation release from entity-server	2015-06-26 21:57:04 -07:00
Andrew Meadows	d0ac3e4514	more work on simulator priority ... scripts that edit terse update data try to assert priority physics simulation tries to assert "volunteer" priority max priority rules are applied in entity server	2015-06-26 21:57:04 -07:00
Seth Alves	1326791502	add sanity check to PhysicalEntitySimulation::addAction	2015-06-26 16:55:16 -07:00
Seth Alves	31a3ca641d	clean up left-over action if it's re-added	2015-06-26 16:54:46 -07:00
Seth Alves	c95db5672a	include argument-packing version in serialized argument data	2015-06-26 10:01:45 -07:00
Seth Alves	f5f1d0829c	Merge branch 'physics-lock-entity-tree' of github.com:sethalves/hifi into actions-over-wire	2015-06-26 07:20:51 -07:00
Seth Alves	015498a6e0	move function up so this builds in non-debug mode	2015-06-26 07:20:22 -07:00