2618 commits

Author	SHA1	Message	Date
Olivier Prat	5cee2cff9f	Merge branch 'master' of git://github.com/highfidelity/hifi into 21378	2017-07-04 17:48:07 +02:00
Olivier Prat	d9a83539b2	Merged with master	2017-07-03 15:32:30 +02:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
Olivier Prat	8a12d0c106	Fade effect working again for basic enter domain but with various Fade jobs	2017-06-29 08:54:23 +02:00
Seth Alves	794495c197	make ResourceManager be owned by DependencyManager	2017-06-28 14:18:14 -07:00
Brad Davis	8130a91b8c	Cleanup entity dependencies	2017-06-27 19:15:49 -07:00
Seth Alves	428dc81083	Merge pull request #10696 from AndrewMeadows/avoid-ownership-bid-race ... ignore remote update younger than recent ownership bid	2017-06-20 10:42:54 -07:00
Brad Davis	a69cf31f4b	PR feedback and cmake fixes	2017-06-16 16:59:58 -07:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
Andrew Meadows	8d19395b0a	ignore remote update younger than recent bid	2017-06-14 16:04:52 -07:00
Andrew Meadows	29a05d7eb4	bid immediately when creating new entity ... also clear EntityMotionState::_numInactiveUpdates on new ownership	2017-06-01 17:39:21 -07:00
Andrew Meadows	c56a6c44f8	minor formatting fix	2017-06-01 17:39:21 -07:00
samcake	6dbbd6c8d0	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-25 11:25:46 -07:00
Brad Hefta-Gaub	5af95c8fdf	Merge pull request #10476 from sethalves/fix-imported-children-querybox ... fix up queryAACubes before sending imported entities to server	2017-05-25 08:29:23 -07:00
samcake	e7b808cbc1	Merging with upstream	2017-05-23 12:12:31 -07:00
Stephen Birarda	cecbf43129	make server entity scripts respect script whitelist	2017-05-22 16:17:01 -07:00
Seth Alves	381de7a1e2	tabs	2017-05-21 08:42:53 -07:00
Seth Alves	c68efc2ed0	treat locked like other properties that affect simulation	2017-05-21 08:29:35 -07:00
Seth Alves	2512b39848	don't dirty motion-type if lock value isn't actually changing	2017-05-20 14:14:33 -07:00
Seth Alves	8f38ea8c6a	force locked entities to be static in bullet	2017-05-20 11:54:42 -07:00
Seth Alves	a442181859	remove some redundancy	2017-05-20 08:51:44 -07:00
Seth Alves	5c94147f40	children collision hulls appear to be in the right place, now	2017-05-19 17:09:42 -07:00
Seth Alves	67f222cb3f	be more careful about fixing up entities which arrived before their parents	2017-05-19 15:19:16 -07:00
Seth Alves	386c76545c	be more careful about fixing up entities which arrived before their parents	2017-05-19 14:21:05 -07:00
Seth Alves	54dafa0f83	be more careful about fixing up entities which arrived before their parents	2017-05-19 14:14:00 -07:00
Seth Alves	5c93dbd20d	be more careful about fixing up entities which arrived before their parents	2017-05-19 13:48:29 -07:00
Seth Alves	936d0e2d50	be more careful about fixing up entities which arrived before their parents	2017-05-19 12:13:43 -07:00
Seth Alves	735e4b7d05	trying to get child collision hulls to be in the right place after import	2017-05-19 10:59:59 -07:00
Seth Alves	7220fe0ad8	set more physics flags dirty when an entity parent is found	2017-05-19 10:40:24 -07:00
Seth Alves	77ce8a19cf	call entityChanged after settings flags	2017-05-19 10:11:02 -07:00
Seth Alves	0c12baa258	call entityChanged after settings flags	2017-05-19 09:57:42 -07:00
Seth Alves	4007133423	collision hulls are still not always in the right place	2017-05-18 14:59:26 -07:00
Seth Alves	1b0eeb9c2c	try harder to put things in place when their parent entities are discovered	2017-05-18 14:35:39 -07:00
Seth Alves	ef556fae9b	when an entity's parent wasn't known and then becomes known, patch up the rigid-body and the render-item bounds	2017-05-18 14:13:33 -07:00
Seth Alves	ec02887ae6	attempt to get imported entities into the correct octree-element	2017-05-18 13:20:44 -07:00
Sam Gateau	d9ad45bf4a	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-18 09:37:04 -07:00
Seth Alves	b8567e0550	Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox	2017-05-18 09:10:58 -07:00
Seth Alves	b05cb4af3b	fix nan	2017-05-17 20:51:34 -07:00
Seth Alves	0dc355cf86	Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox	2017-05-17 16:43:50 -07:00
Brad Hefta-Gaub	0d3f7058ec	Merge pull request #10483 from AndrewMeadows/cap-velocities ... cap scripted linear and angular velocity inputs	2017-05-17 16:15:42 -07:00
Seth Alves	8a88b30da7	Merge pull request #10468 from AndrewMeadows/cleanup-actions ... cleanup Actions and Constraints part-1	2017-05-17 11:33:53 -07:00
Andrew Meadows	97ed719506	cap scripted linear and angular velocity inputs	2017-05-17 10:40:45 -07:00
Sam Gateau	0f250e693d	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-17 09:49:20 -07:00
Seth Alves	8ab676e627	Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox	2017-05-17 09:09:04 -07:00
Thijs Wenker	278bc610d4	Merge pull request #10466 from misslivirose/feat-find-entities-by-type ... Add function findEntitiesByType EntityScriptingInterface	2017-05-17 15:06:04 +02:00
Seth Alves	d90843428d	when importing entities, make a queryAACube that takes children into account	2017-05-16 16:54:16 -07:00
Seth Alves	1e4e2cc1b4	when a parent entity is deleted, delete its children in the local tree, rather than waiting for the server to tell us about it	2017-05-16 16:22:40 -07:00
Seth Alves	b9005a9e76	fix up queryAACubes before sending imported entities to server	2017-05-16 14:32:55 -07:00
Andrew Meadows	e6accb61b0	more purging of legacy 'Spring' action	2017-05-16 08:09:20 -07:00