3002 commits

Author	SHA1	Message	Date
ZappoMan	04ee1adabd	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-19 14:40:31 -08:00
Brad Hefta-Gaub	0678a7c9df	Merge pull request #11718 from kencooke/audio-louder-mastergain ... Adjustable master avatar volume	2017-11-17 16:58:27 -08:00
Stephen Birarda	dd27e3db31	add diff traversal reset when resetting state	2017-11-17 09:44:35 -08:00
Stephen Birarda	eedb77dae9	add clearing of known state if client resets ES connection	2017-11-16 11:40:35 -08:00
Clément Brisset	2b39cb4500	Merge pull request #11832 from highfidelity/RC59 ... Merge RC59 into master	2017-11-16 11:19:54 -08:00
Atlante45	d8b1cb10df	CR	2017-11-15 11:20:30 -08:00
Stephen Birarda	557ee458ec	wait for node active socket before constructing packets	2017-11-14 17:08:01 -08:00
Ken Cooke	9810d1582d	CR fixes	2017-11-14 14:36:37 -08:00
Stephen Birarda	05a38a78c5	don't send octree data without first query	2017-11-14 14:08:27 -08:00
Atlante45	462ec30cac	Utilise Windows Job Object so child dies w/ parent	2017-11-14 11:41:43 -08:00
David Rowe	05275afb4f	Resending full scene is not necessary after all	2017-11-05 15:48:02 +13:00
David Rowe	a76b7855b5	Record only explicitly filtered-in entities for flagging extras	2017-11-05 15:03:43 +13:00
David Rowe	4a5f52155c	Pin node pointer	2017-11-05 14:33:30 +13:00
David Rowe	2d27a6cf4c	Merge branch 'master' into 21580	2017-11-05 13:59:43 +13:00
Ken Cooke	68e9ec9b23	Use qCDebug instead of qDebug in audio-mixer	2017-11-02 16:36:45 -07:00
Zach Fox	48979a5ce8	Merge pull request #11730 from zfox23/pop_avatarEntityTests ... Commerce: Avatar Entity Tests	2017-11-02 15:34:37 -07:00
Stephen Birarda	25c10d5de2	Merge pull request #11735 from highfidelity/stable ... Merge stable back into master	2017-11-02 14:22:31 -07:00
ZappoMan	afaad5fcd7	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-02 13:39:51 -07:00
Zach Fox	8a6a744099	It's working	2017-11-01 10:46:13 -07:00
David Rowe	328fc29bc5	Fix serverScripts not being able to see entities in parent/child tree	2017-11-01 17:01:19 +13:00
Zach Fox	e9c144892a	Fixes	2017-10-31 13:11:32 -07:00
Zach Fox	6f96e0c7bd	More progress	2017-10-31 12:14:12 -07:00
Zach Fox	90e9251176	It's a start	2017-10-31 11:28:19 -07:00
Ken Cooke	cfba6ae819	Implement master avatar gain in the audio-mixer	2017-10-31 11:18:03 -07:00
Zach Fox	19420a0ff2	Move static cert verify to properties	2017-10-30 17:01:55 -07:00
Ken Cooke	6ba2a83bbe	Send and receive Avatar MASTER Gain packets, signaled using null nodeID. ... Packet protocol change is not needed (existing audio-mixer will ignore).	2017-10-29 10:47:56 -07:00
ZappoMan	a7a0f03ede	rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()	2017-10-27 18:39:17 -07:00
Zach Fox	5ab737f66d	Merge pull request #11658 from zfox23/pop_dynamicTestsMaster ... Commerce: Owner Verification for Certified Entities	2017-10-27 12:28:04 -07:00
Stephen Birarda	60fbbe4bc0	disable baking of JS files	2017-10-25 14:29:28 -07:00
Zach Fox	14150c09ac	Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting	2017-10-25 12:59:36 -07:00
Zach Fox	91333cdf7b	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-25 10:26:50 -07:00
ZappoMan	275fff4609	more CR feedback	2017-10-24 14:02:47 -07:00
Zach Fox	c64c2e17c8	First pass at consolidation	2017-10-24 12:01:05 -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	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	fb7f6df694	CR feedback	2017-10-22 11:40:41 -07:00
ZappoMan	934c9479af	implement support for Entities.callEntityServerMethod()	2017-10-21 20:27:35 -07:00
Zach Fox	74180bc4cd	Implement static cert verification correctly	2017-10-19 16:39:13 -07:00
Zach Fox	952160874c	Stringmatch Domain ID instead of placename for DVV	2017-10-18 11:21:03 -07:00
Zach Fox	3f0b08aea8	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-18 10:37:47 -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	960f1fbfe4	Still broken, but safer	2017-10-16 13:28:14 -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
Clément Brisset	725dc1851e	Merge pull request #11412 from mnafees/21495 ... CR for Job #21495 - Add limit to file size imported into asset server	2017-10-13 13:45:42 -07:00