137 commits

Author	SHA1	Message	Date
bwent	67760fad79	Add gettable naturalPosition property for model entities	2015-07-31 10:15:35 -07:00
Atlante45	8d6ff2d9f9	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 14:50:44 -07:00
Atlante45	256c786e28	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-17 17:59:19 -07:00
Stephen Birarda	821c16cbc4	resolve conflicts on merge with uptream/master	2015-07-14 09:52:20 -07:00
Atlante45	80fe090a94	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-10 20:20:03 -07:00
Andrew Meadows	9ce9c541de	fix activation of object when action changes	2015-07-10 18:45:40 -07:00
Seth Alves	2dc4922da3	bring over code from entity-level-locking branch	2015-07-09 15:23:05 -07:00
Stephen Birarda	74940a2132	replace lingering PacketTypes in old format	2015-07-08 10:18:13 -07:00
Stephen Birarda	ffa6edc904	fix spaces created by xcode find/replace	2015-07-07 15:01:19 -07:00
Stephen Birarda	b3c3e5a6c8	more PacketType to PacketType::Value replacements	2015-07-02 16:49:19 -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	ee13407066	Fix smart pointer casts	2015-07-01 19:22:40 -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
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	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	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	2579247c34	claim ownership faster for scripted manipulations	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	6e34678a59	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-23 10:48:21 -07:00
ericrius1	dbec1aad0c	line entity points are now local to entity position. Changed paint script to reflect this	2015-06-19 18:54:28 -07:00
Seth Alves	fce551099f	first stab at sending action data across wire	2015-06-18 18:32:57 -07:00
ericrius1	6a5deaaef1	returning true from set line points	2015-06-18 16:54:39 -07:00
ericrius1	2b4146125f	adding logic to check points of line are inside bounds	2015-06-18 16:27:06 -07:00
Seth Alves	45c7cd4929	respond to code review, add a simple hold-a-stick script	2015-06-10 18:48:51 -07:00
Seth Alves	3dcc6c9b8c	make action-factory interface and subclass it in Interface. this allows an action to use avatar data. the login the AvatarActionHold is still bogus.	2015-06-10 12:04:44 -07:00
Seth Alves	aff582287d	use const references for arguments in action-related calls	2015-06-05 11:26:54 -07:00
Seth Alves	28c034698f	Merge branch 'master' of github.com:highfidelity/hifi into actions	2015-06-05 10:41:20 -07:00
Seth Alves	51f5730e68	formatting	2015-06-05 10:05:11 -07:00
Seth Alves	eb912892dc	code review	2015-06-05 09:56:34 -07:00
Seth Alves	086b9d404a	fix return-type in lambda	2015-06-05 08:59:08 -07:00
Seth Alves	3dbf28b7b4	use lambdas to remove some repeated code	2015-06-05 07:33:39 -07:00
Seth Alves	ba42b0dcc4	updateAction and deleteAction	2015-06-04 17:51:59 -07:00
Seth Alves	66ab3d455f	use shared pointers to keep track of action objects	2015-06-04 12:29:05 -07:00
Seth Alves	14026667f5	script interface for creating an action now takes an action-type name rather than having a different call for each action	2015-06-04 10:55:32 -07:00
Seth Alves	d634663bb1	simple action is working. destructor sequense is still suspicous	2015-06-03 17:33:55 -07:00
Seth Alves	c8ab22c517	hook up entity-scripting-interface to actions	2015-06-03 11:19:45 -07:00
Andrew Meadows	acb3163f43	add comments for future work	2015-06-02 17:20:41 -07:00
Andrew Meadows	0e2028b820	merge ... Conflicts: libraries/entities/src/EntityItem.cpp	2015-06-02 15:08:36 -07:00
Andrew Meadows	fa491a5c4f	fix theoretical crash bug in editEntity()	2015-06-01 13:59:56 -07:00
Seth Alves	d1bb6473d9	more work on edge handling and resizing	2015-06-01 13:57:28 -07:00
Seth Alves	fe59f8846f	recompute polyvox mesh when setVoxelSurfaceStyle is called. remove left-over color stuff from polyvox. don't require that a polyvox be rendered before computing its physics shape	2015-05-30 16:43:11 -07:00
Seth Alves	96a40bd673	basic collisions with cubic polyvoxes	2015-05-29 18:50:26 -07:00
Seth Alves	a96520ca74	set up EntityItemPropertiesFromScript to either ignore or honor read-only properties	2015-05-29 13:43:18 -07:00
Andrew Meadows	8177512432	send all TerseUpdate properties when one changes	2015-05-29 11:35:50 -07:00
Seth Alves	a91a7942a4	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-28 06:59:39 -07:00