9981 commits

Author	SHA1	Message	Date
Seth Alves	b19d505fc1	remove stray debug print	2015-07-01 20:32:45 -07:00
Seth Alves	246861221c	rearrange things so that when EntityItem::setActionData is called before the entity-tree is set up, the data is set aside and used once the entity-tree is ready.	2015-07-01 20:17:21 -07:00
Seth Alves	6e3cab9f4d	fix logic problem with previous fix	2015-07-01 12:37:15 -07:00
Seth Alves	593ed9f998	work around problem where EntityItem::setActionData is called before the entity tree is set up	2015-07-01 12:26:51 -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	b7e9056c04	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire-and-sim-ownership	2015-07-01 07:33:29 -07:00
Seth Alves	6e7973f5b9	coding-standard / code-review	2015-06-30 19:28:22 -07:00
Seth Alves	f4bbbcbec7	try to explain action class hierarchy in a comment	2015-06-30 19:05:34 -07:00
Seth Alves	a300dec1f7	update entity data bytes whenever it's asked for	2015-06-30 10:42:34 -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	7d7e3769f6	suppress a log message	2015-06-30 09:56:15 -07:00
Ryan Huffman	abab284f38	Merge pull request #5235 from ericrius1/lineTransform ... line entities can now be properly rotated using rotation property	2015-06-30 09:30:01 -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	0a734c9d3d	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire-and-sim-ownership	2015-06-29 16:56:04 -07:00
Seth Alves	fbede0a23f	guard against feeding bullet a NaN	2015-06-29 15:54:24 -07:00
Seth Alves	9b7ea19087	include action type in arguments delivered to scrips	2015-06-29 14:33:58 -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
ericrius1	843ab6d5e3	line entities can now be properly rotated using rotation property	2015-06-29 11:08:09 -07:00
Brad Davis	5cfa22396c	Merge pull request #5219 from venkatn93/master ... Changing tooltip reticle	2015-06-29 10:51:16 -07:00
Seth Alves	3e88e1f400	unbungle merge	2015-06-29 10:04:27 -07:00
Seth Alves	1d122060a6	merge andrew's sim-ownership branch	2015-06-29 09:50:38 -07:00
Andrew Meadows	513285a00e	use macros for packing/unpacking QByteArray	2015-06-29 07:27:34 -07:00
Andrew Meadows	769755e30a	recycle PROP_SIMULATOR_ID	2015-06-29 06:20:14 -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	aa3c7eac9b	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-27 10:12:59 -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	426b343e2c	remove cruft canAppendBytes() method	2015-06-26 23:12:48 -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
Brad Hefta-Gaub	9b42221123	Merge pull request #5216 from ctrlaltdavid/comment-update ... Improve entity properties list code comment	2015-06-26 22:21:39 -07:00
Andrew Meadows	f274958beb	fix bad merge during rebase	2015-06-26 22:13: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	ff67b54f87	don't read terse update data for objs we own	2015-06-26 21:58:40 -07:00
Andrew Meadows	1ba937eab9	fix bug in streaming of SimulationOwner class	2015-06-26 21:58:40 -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	b6d5adaef8	move global into function that uses it	2015-06-26 21:57:04 -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	c87e7c99ce	bid for ownership on script-change phys properties	2015-06-26 21:57:04 -07:00
Andrew Meadows	4b29907216	trigger bid for ownership on action manipulations	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