60968 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Melissa Brown	20787c9c7c	Merge pull request #11644 from cain-kilgore/21508 ... WL 21508 - Improve upon Skybox Changer	2017-10-23 10:30:55 -07:00
Cain Kilgore	b42afdaff0	WL 21508 - Cleanup from Code Review	2017-10-23 16:27:28 +01:00
Brad Hefta-Gaub	ea38b32dea	Merge pull request #11646 from ZappoMan/callServerEntityMethod ... implement support for Entities.callEntityServerMethod()	2017-10-22 18:56:35 -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
Ken Cooke	c555d0785b	Merge pull request #11647 from vladest/create_audio_cues ... Add sound cues to create app	2017-10-22 11:34:21 -07:00
vladest	b791dcba7f	Add sound cues to create app	2017-10-22 14:59:53 +02:00
ZappoMan	934c9479af	implement support for Entities.callEntityServerMethod()	2017-10-21 20:27:35 -07:00
Ken Cooke	bd418364e1	Merge pull request #11645 from vladest/goto_sound_cues ... Sound cues for GoTo interface	2017-10-21 17:37:56 -07:00
vladest	cf7b050680	Sound cues for GoTo interface	2017-10-21 20:47:56 +02:00
Cain Kilgore	bc772a2f9a	WL 21508 - Improve upon Skybox Changer	2017-10-21 19:42:53 +01:00
Bradley Austin Davis	e85494b958	Merge pull request #11643 from SamGondelman/billboard ... Fix Image3DOverlay isFacingAvatar	2017-10-21 01:09:50 -07:00
SamGondelman	88b8d7bc46	fix image3d overlay isFacingAvatar	2017-10-20 16:56:42 -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
Zach Fox	fbd393d918	Add newline to cert ID when updating location	2017-10-20 15:10:24 -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
Zach Fox	7b3a6f9967	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-20 13:28:03 -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	908d601a43	Code style fixes #1	2017-10-20 20:00:11 +02:00
Zach Fox	c0ab320da6	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-20 10:40:35 -07:00
Zach Fox	9e68e805a0	Get marketplace public key from backend	2017-10-20 10:38:59 -07:00
Seth Alves	9d00606505	Merge pull request #11635 from druiz17/fix-hud-issues ... actually fix toolbar from completely dispersing	2017-10-20 10:22:34 -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
Zach Fox	c99e803ab7	Error handling	2017-10-19 17:19:37 -07:00
Nissim	0f519da76e	Additional protection for mode.	2017-10-19 17:16:36 -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
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
druiz17	f2ad61934b	fix toolbar from completely dispearing	2017-10-19 14:02:21 -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
Ryan Huffman	894e91ea23	Merge pull request #10702 from CraftsmanMG/master ... Fingerpaint PR	2017-10-19 13:13:59 -07:00
Zach Fox	24d109cfe7	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-19 12:13:38 -07:00