24821 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	ef78711b7b	Merge pull request #11663 from AndrewMeadows/shape-sharing ... fix incorrect collision shape sharing for some ModelEntityItem configurations	2017-10-24 21:04:57 -07:00
Brad Hefta-Gaub	2a865f3a45	Merge pull request #11666 from SamGondelman/mirrorMode ... Fix backwards HUD in mirror mode	2017-10-24 21:03:29 -07:00
Brad Hefta-Gaub	41b637bc79	Merge pull request #11668 from ZappoMan/cleanupVersions ... Cleanup versions	2017-10-24 16:24:01 -07:00
Seth Alves	75f8699bcc	Merge pull request #11665 from NissimHadar/hazeZone ... Changed blend range from 32,000 m to 30,000m	2017-10-24 15:22:24 -07:00
ZappoMan	aad91edba2	actually remove all those defines	2017-10-24 14:45:33 -07:00
ZappoMan	3ded26b0e9	Merge branch 'master' of https://github.com/highfidelity/hifi into cleanupVersions	2017-10-24 14:44:06 -07:00
Brad Hefta-Gaub	ecf8d35f5f	Merge pull request #11664 from ZappoMan/callEntityClientMethod ... implement callEntityClientMethod	2017-10-24 14:43:39 -07:00
ZappoMan	5901d1a311	clean up VERSION_ENTITIES stuff	2017-10-24 13:48:27 -07:00
SamGondelman	046e5ca716	fix backwards HUD in mirror mode	2017-10-24 13:24:09 -07:00
Andrew Meadows	27f4d182d9	fix scale of rendered collision geometry	2017-10-24 13:23:46 -07:00
Andrew Meadows	29efe53f74	repair debug rendering of collision shapes	2017-10-24 13:23:46 -07:00
Andrew Meadows	996b71fa9a	avoid incorrect ShapeManager dupes for compound shapes	2017-10-24 13:23:46 -07:00
Nissim Hadar	f81675e3b4	Changed blend range from 32,000 m to 30,000m	2017-10-24 13:17:09 -07:00
ZappoMan	12c32d5834	bump protocol version	2017-10-24 13:08:48 -07:00
ZappoMan	ed408e09d0	remove some log spam	2017-10-24 11:50:25 -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
Olivier Prat	a34db5f26d	Shadows are now cast by the current zone key light (sun)	2017-10-24 11:09:36 +02:00
Bradley Austin Davis	4f5851f420	Reducing needless render updates	2017-10-23 15:31:25 -07:00
ZappoMan	44f8bf00bc	move remoteCallerID to Script.remoteCallerID	2017-10-22 17:14:11 -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
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
Brad Hefta-Gaub	87294b8e67	Merge pull request #11638 from ZappoMan/fixWireframe ... fix the rendering of wireframe for model entities with bad model URLs	2017-10-20 14:29:01 -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	26ea8bea6a	Merge pull request #11612 from highfidelity/pointers ... Fix tablet intersection bug and start of Pointer migration work (WIP)	2017-10-20 13:53:52 -07:00
Brad Hefta-Gaub	f6af1d1ecf	Merge pull request #11387 from vladest/tablet_extended_sounds ... Tablet extended sounds	2017-10-20 13:49:06 -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	b976dbd224	Merge branch 'master' into hazeZone	2017-10-20 13:33:01 -07:00
Nissim	b0ca1353e4	Implemented Haze mode default.	2017-10-20 13:32:27 -07:00
ZappoMan	27ffb97a07	Merge branch 'master' of https://github.com/highfidelity/hifi into fixWireframe	2017-10-20 12:31:35 -07:00
ZappoMan	ef0ff96a44	fix the rendering of wireframe for model entities with bad model URLs	2017-10-20 11:46:28 -07:00
Ryan Huffman	de195dd844	Merge pull request #11585 from huffman/fix/draco-material-ids ... Fix baking bug with single-part FBX + multiple materials	2017-10-20 11:32:31 -07:00
vladest	fa349a694c	Code style fixes	2017-10-20 15:12:09 +02:00
vladest	ea6c2e1bb5	Merge branch 'master' into tablet_extended_sounds	2017-10-20 14:46:02 +02:00
Nissim	0f519da76e	Additional protection for mode.	2017-10-19 17:16:36 -07:00
Nissim	d01ecb71df	Fixed gcc warning.	2017-10-19 14:41:02 -07:00
Andrew Meadows	c79bf3bc04	cleanup WANT_DETAILED_PROFILING	2017-10-19 14:31:50 -07:00
Nissim	e314ee432e	Fixed gcc warning.	2017-10-19 14:20:47 -07:00
Stephen Birarda	23563cca47	Merge pull request #11592 from birarda/bug/ignore-dds-in-fbx ... ignore unbakeable textures in FBXBaker	2017-10-19 15:51:41 -05: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
Daniela	832e30ad1c	Edited Packet headers.	2017-10-19 19:53:47 +01:00
Seth Alves	89ce9e6367	Merge pull request #11614 from sethalves/fix-others-adjusting-hats ... handle camera-relative controller joints for other avatars	2017-10-19 08:10:04 -07:00
Melissa Brown	1a3821e984	Merge pull request #11591 from ctrlaltdavid/21568 ... Add some Quat and Uuid JavaScript helper properties	2017-10-18 22:07:06 -07:00
Sam Gateau	4d7accabdf	Merge pull request #11439 from NissimHadar/hazeZone ... Adding haze component to the zone entity.	2017-10-18 16:14:28 -07:00
Zach Fox	a669aff453	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171018	2017-10-18 10:45:30 -07:00