24804 commits

Author	SHA1	Message	Date
luiscuenca	3d3077978e	Simplyfied and fixed null pointer	2017-10-25 18:47:10 -07:00
luiscuenca	a1c9285c90	Fixed bug on case 6443	2017-10-25 13:13:50 -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
John Conklin II	08cfa32858	Merge pull request #11610 from ElderOrb/case8217_RC57 ... 8217 Search in tablet doesn't update (RC-57)	2017-10-18 10:41:33 -07:00
Nissim	fe286aff83	Andrew's corrections (per coding standard).	2017-10-18 08:42:07 -07:00
David Rowe	f31e014e8b	Quat.ZERO --> Quat.IDENTITY	2017-10-18 20:34:55 +13:00
SamGondelman	58172cfbd4	merge from master	2017-10-17 18:05:59 -07:00
beholder	e8589d53dd	updated code based on code review	2017-10-18 03:45:50 +03:00
Andrew Meadows	25818fc5e9	Merge pull request #11613 from jherico/feature/qml_whitelist ... Support for custom functionality for specific QML URLs	2017-10-17 17:34:22 -07:00
SamGondelman	975a3e5bbb	Merge branch 'pointers' of https://github.com/highfidelity/hifi into pointers	2017-10-17 13:23:08 -07:00
SamGondelman	315baeae1f	threading fix	2017-10-17 13:22:40 -07:00
Bradley Austin Davis	50929b780d	Add constructor to suppress warning	2017-10-17 12:59:41 -07:00
Seth Alves	aaf3c24a44	handle camera-relative controller joints for other avatars	2017-10-17 12:36:15 -07:00
Nissim	d53aadc617	Merge branch 'master' into hazeZone	2017-10-17 12:13:40 -07:00
Bradley Austin Davis	f53a74b515	Support for custom functionality for specific QML URLs	2017-10-17 11:53:30 -07:00
Nissim	5a1c4d5a30	Fixed gcc warning.	2017-10-17 11:08:15 -07:00
John Conklin II	31b8013ed9	Merge pull request #11538 from kencooke/audio-mac-bugfix2 ... Additional cleanup of audio noise gate	2017-10-17 11:02:55 -07:00
Nissim	3e228acdb6	Fixed gcc warning.	2017-10-17 10:41:49 -07:00
Nissim	afa93f46e5	Merge branch 'master' into hazeZone	2017-10-17 09:28:07 -07:00
Nissim	a641d6de66	Variable rename.	2017-10-17 09:18:29 -07:00