545 commits

Author	SHA1	Message	Date
Seth Alves	015498a6e0	move function up so this builds in non-debug mode	2015-06-26 07:20:22 -07:00
Seth Alves	2682c4720d	fix alt-branch of ifdef	2015-06-26 07:04:10 -07:00
Seth Alves	a0d77c061c	lock the entity tree during physics operations that access then entity tree. if the simulation and entity-tree are both going to be locked, be sure to lock the entity tree first (and unlock it last), because this is what the network-reading thread does	2015-06-26 07:00:28 -07:00
Philip Rosedale	2f080a8e29	Merge pull request #5147 from sethalves/more-actions ... offset action	2015-06-18 17:35:50 -07:00
Philip Rosedale	61a2196a30	Reduce error tolerances for ballistic prediction that trigger updating the server	2015-06-18 13:21:37 -07:00
Seth Alves	68df6b662d	fix ifdefs around asserts	2015-06-17 15:03:09 -07:00
Seth Alves	44bb220130	fix debug build	2015-06-17 14:54:13 -07:00
ZappoMan	f2ba91383c	fix some warnings	2015-06-17 14:26:36 -07:00
Seth Alves	85564199c6	git rid if pull-to-point action (spring handles this). add new action which tries to maintain an entity's distance from a given point	2015-06-17 11:22:10 -07:00
Seth Alves	4216308b9b	Merge branch 'master' of github.com:highfidelity/hifi into actions	2015-06-10 19:05:25 -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	eccf4eb8a8	hold action works	2015-06-10 17:05:49 -07:00
Andrew Meadows	8d41960cc3	reset simulation bid counters on object activation	2015-06-10 12:40:14 -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	b1a209b9db	pull some common code out of subclasses and into ObjectAction	2015-06-09 16:17:48 -07:00
Seth Alves	23dab530f9	fix some glitchy behavior during rotation	2015-06-09 14:11:01 -07:00
Seth Alves	ccb2f17b33	grab.js rotation sort-of works now	2015-06-09 11:21:13 -07:00
Seth Alves	14a45e8349	convert grab.js to use spring action. rotation doesn't work right, yet	2015-06-08 18:25:58 -07:00
Seth Alves	b3bc9c3ef0	first attempt at getting spring-action to handle rotation	2015-06-08 17:10:13 -07:00
Seth Alves	1e858d8bc5	start on spring action	2015-06-08 14:16:03 -07:00
Seth Alves	b425cc6491	merge from upstream	2015-06-05 11:56:33 -07:00
Seth Alves	b0480af040	Merge pull request #5053 from AndrewMeadows/isothermal ... fix crash during bogus reconnect on login	2015-06-05 11:38:23 -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	c5143cdfa0	Merge pull request #5027 from AndrewMeadows/isentropic ... cleanup around sending all "terse update" data whenever some of it changes	2015-06-05 10:41:06 -07:00
Seth Alves	4e10c28b41	merge from upstream	2015-06-05 10:31:13 -07:00
Seth Alves	edb3622c85	Merge pull request #5037 from AndrewMeadows/inertia ... collision groups for physical objects	2015-06-05 10:26:28 -07:00
Seth Alves	51f5730e68	formatting	2015-06-05 10:05:11 -07:00
Seth Alves	b2db5f7fee	update grab.js to use pull-to-point action, various other fixes	2015-06-05 07:10:44 -07:00
Seth Alves	ba42b0dcc4	updateAction and deleteAction	2015-06-04 17:51:59 -07:00
Andrew Meadows	911baee8b8	fix for crash during bogus reconnect on login	2015-06-04 16:57:29 -07:00
Andrew Meadows	cd6bf9d461	cleanup comments	2015-06-04 16:56:14 -07:00
Howard Stearns	5cbb5dadca	More perspicacious zero.	2015-06-04 14:21:12 -07:00
Seth Alves	5e5bc497d9	remove debugging prints	2015-06-04 12:44:08 -07:00
Seth Alves	66ab3d455f	use shared pointers to keep track of action objects	2015-06-04 12:29:05 -07:00
Seth Alves	8f19bad97d	pull argument extracting code into EntityActionInterface	2015-06-04 11:39:15 -07:00
Andrew Meadows	6b03e671d8	remove comment cruft	2015-06-04 11:28:07 -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
Andrew Meadows	6ea4c58319	material changes are an "easy" property to update	2015-06-04 10:22:01 -07:00
Seth Alves	57d85cece0	get rid of simulation back-pointer in actions	2015-06-04 09:41:32 -07:00
Seth Alves	d634663bb1	simple action is working. destructor sequense is still suspicous	2015-06-03 17:33:55 -07:00
Andrew Meadows	b0ca2df3aa	move API from PhysicsEngine to ObjectMotionState	2015-06-03 14:56:04 -07:00
Andrew Meadows	8e61a10bcf	compute collision group for entity	2015-06-03 14:22:48 -07:00
Andrew Meadows	ec0b4a956a	move collision group consts to shared lib	2015-06-03 14:13:51 -07:00
Andrew Meadows	7b6cc59d30	basic support for collision groups	2015-06-03 11:40:48 -07:00
Seth Alves	c8ab22c517	hook up entity-scripting-interface to actions	2015-06-03 11:19:45 -07:00
Howard Stearns	c036b5fd4b	Actually commit the changes this time!	2015-06-03 10:19:28 -07:00
Seth Alves	1d0d002222	clear out action change lists after applying them	2015-06-03 09:10:42 -07:00
Seth Alves	a31a5a1554	main actions interface is in EntityItem. changes in actions are queued up and applied before simulation step	2015-06-02 19:40:20 -07:00
Seth Alves	d6549948d0	first pass at entity interface to actions	2015-06-02 16:06:27 -07:00
Seth Alves	100248c4e8	beginnings of ObjectAction class	2015-06-02 13:19:07 -07:00