2916 commits

Author	SHA1	Message	Date
Zach Fox	91333cdf7b	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-25 10:26:50 -07:00
Brad Hefta-Gaub	18a74cea91	Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023 ... 2017-10-23: Merge RC57 into Master	2017-10-24 21:19:01 -07:00
ZappoMan	5901d1a311	clean up VERSION_ENTITIES stuff	2017-10-24 13:48:27 -07:00
ZappoMan	a1885926b5	some cleanup	2017-10-24 11:46:42 -07:00
ZappoMan	1128a98e88	implement callEntityClientMethod	2017-10-24 11:15:57 -07:00
Zach Fox	1f6d989044	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023	2017-10-23 17:37:43 -07:00
Zach Fox	3e139283ba	Remove unnecessary newlines	2017-10-23 17:31:21 -07:00
Zach Fox	97d44e62c8	Fix bugs	2017-10-23 16:52:32 -07:00
Zach Fox	53081b51a6	Clean up as much as possible	2017-10-23 16:00:39 -07:00
Zach Fox	cda43ec1ea	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-23 11:52:59 -07:00
ZappoMan	a7e21d7e76	add remotelyCallable and remoteCallerID to provide additional security to Entities.callEntityServerMethod()	2017-10-22 14:30:58 -07:00
ZappoMan	934c9479af	implement support for Entities.callEntityServerMethod()	2017-10-21 20:27:35 -07:00
Sam Gateau	7754061505	Merge pull request #11634 from highfidelity/hazeZone ... Fogbugz 8477: Crash on loading older domains that have zones without the haze component.	2017-10-20 16:01:13 -07:00
Seth Alves	2b0285adc2	fix action (grab) deadlock	2017-10-20 15:05:21 -07:00
Nissim	5d0deaf946	Code review fixes.	2017-10-20 14:27:27 -07:00
Nissim	00c99d3d02	Corrected wrong else format.	2017-10-20 13:53:53 -07:00
Brad Hefta-Gaub	d6ad389dab	Merge pull request #11611 from AndrewMeadows/faster-update-renderables ... Faster renderables update	2017-10-20 13:43:08 -07:00
Nissim	b0ca1353e4	Implemented Haze mode default.	2017-10-20 13:32:27 -07:00
Zach Fox	9e68e805a0	Get marketplace public key from backend	2017-10-20 10:38:59 -07:00
Zach Fox	c99e803ab7	Error handling	2017-10-19 17:19:37 -07:00
Zach Fox	74180bc4cd	Implement static cert verification correctly	2017-10-19 16:39:13 -07:00
Zach Fox	0dc6211a7d	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-19 14:43:33 -07:00
Nissim	d01ecb71df	Fixed gcc warning.	2017-10-19 14:41:02 -07:00
Nissim	e314ee432e	Fixed gcc warning.	2017-10-19 14:20:47 -07:00
Nissim	9af87d46f2	Removed optimize pragma.	2017-10-19 13:51:33 -07:00
Nissim	61fc45c6bf	Merge branch 'master' into hazeZone	2017-10-19 13:39:18 -07:00
Nissim	edd256c600	Fixed crash on invalid HazeMode.	2017-10-19 13:36:32 -07:00
Seth Alves	2c8c5e214c	puff querybox if entity is in motion	2017-10-19 13:19:41 -07:00
Seth Alves	e8ca455547	cleanups + call updateQueryAACube when parent changes or action is deleted	2017-10-19 13:19:35 -07:00
Seth Alves	c1e8d5144c	remove code which is no longer needed because of custom physics setters	2017-10-19 13:19:25 -07:00
Seth Alves	f2cb5d4aff	clean-up concept of puffed queryAACube	2017-10-19 13:19:13 -07:00
Seth Alves	ae70f091c3	don't accept updates to queryAACube if this interface is simulation owner	2017-10-19 13:18:45 -07:00
Seth Alves	f75e59c0a6	keep grabbed and worn entities from spamming entity-server	2017-10-19 13:18:37 -07:00
Daniela	832e30ad1c	Edited Packet headers.	2017-10-19 19:53:47 +01:00
Zach Fox	9537e19ad4	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-19 10:58:55 -07:00
Nissim	a641d6de66	Variable rename.	2017-10-17 09:18:29 -07:00
Zach Fox	e1b0e5a2dd	Move some include files around	2017-10-16 16:00:32 -07:00
Zach Fox	a4b8bf0be6	Bugfixes and CR	2017-10-16 15:33:10 -07:00
Zach Fox	3c572b0f7a	Fix deadlock	2017-10-16 13:41:39 -07:00
Zach Fox	960f1fbfe4	Still broken, but safer	2017-10-16 13:28:14 -07:00
Andrew Meadows	23bb8608b1	minor optimizations in updateModelBounds()	2017-10-16 11:52:30 -07:00
Andrew Meadows	e109101acc	update profiling timers	2017-10-16 11:52:30 -07:00
Zach Fox	febc725520	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into pop_dynamicTests57	2017-10-16 09:53:15 -07:00
Nissim Hadar	afb8b2d8e7	Merge branch 'master' into hazeZone	2017-10-13 13:40:06 -07:00
Nissim Hadar	9c9dfc7211	Replace light blend with glare.	2017-10-13 13:36:46 -07:00
Nissim Hadar	c76229934c	Changed blend-in colour and blend-out colour to colour and glare colour	2017-10-13 12:21:00 -07:00
Nissim Hadar	5bfbaf4860	Renamed HazeMode to ComponentMode.	2017-10-13 11:24:56 -07:00
Bradley Austin Davis	4dcce6ef45	Merge pull request #11578 from hyperlogic/bug-fix/delete-on-wrong-thread ... Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.	2017-10-12 17:37:05 -07:00
Nissim Hadar	b1174ce40c	Merge branch 'master' into hazeZone	2017-10-12 17:04:42 -07:00
Zach Fox	1400c66506	Be a bit more thorough	2017-10-12 16:58:48 -07:00