1213 commits

Author	SHA1	Message	Date
Atlante45	80fe090a94	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-10 20:20:03 -07:00
ZappoMan	1dd40af162	fix AnimationLoop::setRunning() to not constantly reset the frame when the running state doesn't actually change	2015-07-10 12:43:35 -07:00
Seth Alves	bf6fce4e45	remove unneeded const	2015-07-09 17:05:15 -07:00
Seth Alves	2dc4922da3	bring over code from entity-level-locking branch	2015-07-09 15:23:05 -07:00
Seth Alves	a01fb6f1dc	if an action changes its own arguments, cause reserialisation	2015-07-09 14:32:34 -07:00
Brad Davis	49a14e3446	Merge remote-tracking branch 'upstream/master' into entity_parsing	2015-07-08 18:37:41 -07:00
Brad Davis	98e0688e98	Reducing heap allocation in network packet parsing	2015-07-08 17:21:38 -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
ZappoMan	a59fd44014	quiet some log spam	2015-07-07 09:04:20 -07:00
ZappoMan	2aa345dfc6	Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats	2015-07-03 15:04:59 -07:00
ZappoMan	29a7584ee6	remove dead code	2015-07-03 11:29:59 -07:00
Stephen Birarda	812b18c74e	Merge pull request #5205 from SeijiEmery/unit-tests ... Unit tests	2015-07-02 20:58:09 -04:00
ZappoMan	0c0b8dbbc1	add stats for elements and entities per incoming packet	2015-07-02 16:19:13 -07:00
ZappoMan	b568e895ec	Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats	2015-07-02 15:00:09 -07:00
Brad Hefta-Gaub	2a03f62bf2	Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership ... Actions over wire and improved simulation ownership	2015-07-02 14:57:27 -07:00
ZappoMan	5c4d4893de	added bytes per edit stats	2015-07-02 13:44:28 -07:00
ZappoMan	63b585da0f	added updates per second stat	2015-07-02 13:28:12 -07:00
ZappoMan	b13a4b2a71	add edit update stats	2015-07-02 11:07:47 -07:00
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
Atlante45	7b5a5a339a	Use make_shared/create to make shared pointers	2015-07-01 19:46:06 -07:00
Atlante45	ee13407066	Fix smart pointer casts	2015-07-01 19:22:40 -07:00
ZappoMan	24b4614703	add more detailed edit timing to entity server	2015-07-01 16:11:08 -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	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	7d7e3769f6	suppress a log message	2015-06-30 09:56:15 -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
Seiji Emery	374150a39f	Merge https://github.com/highfidelity/hifi	2015-06-29 11:56:50 -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	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	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