1638 commits

Author	SHA1	Message	Date
Brad Davis	6a06bf405a	Merge remote-tracking branch 'upstream/master' into android	2018-01-16 18:24:44 -08:00
Brad Davis	ceb60f6eba	Fix built-in resource loading from scripts	2018-01-16 12:33:09 -08:00
humbletim	b91d536dd0	rename model:: -> graphics::	2018-01-16 12:46:16 -05:00
humbletim	08ccda9cfc	rename libraries/model(src/model) -> libraries/graphics(src/graphics)	2018-01-16 12:44:44 -05:00
Seth Alves	76048f3c30	error handling	2018-01-15 10:48:12 -08:00
Seth Alves	3e7d303661	export atp GetMappingRequest to js	2018-01-15 09:56:46 -08:00
Brad Davis	7579451c24	Merge remote-tracking branch 'upstream/master' into android	2018-01-11 23:31:45 -08:00
Seth Alves	568c27d6e0	Merge pull request #12039 from luiscuenca/currentAPI ... Fix and improve currentAPI.js	2018-01-10 17:55:08 -08:00
Brad Davis	2c35242af1	Merge remote-tracking branch 'upstream/master' into android_nov	2018-01-10 13:40:12 -08:00
Olivier Prat	db9e5fdae8	Merged from master but rendering seems broken	2018-01-09 11:05:34 +01:00
Gabriel Calero	7fbd23f36b	Merge branch 'android_render_pr' of https://github.com/gcalero/hifi into android_render_pr	2018-01-08 17:38:28 -03:00
Gabriel Calero	6050737e7c	Resolving comments in PR	2018-01-08 17:36:08 -03:00
Bradley Austin Davis	68cd768a65	Merge branch 'android' into android_render_pr	2018-01-08 12:49:52 -05:00
Gabriel Calero	76b38bebad	Make Interface run in Android	2018-01-03 16:36:11 -03:00
Olivier Prat	752952507d	Fixed memory leak in ModelScriptingInterface::appendMeshes and wrong normal transformation in ModelScriptingInterface	2017-12-22 14:18:02 +01:00
luiscuenca	d93828f2f0	Fix an improve currentAPI.js	2017-12-21 11:50:02 -07:00
Brad Davis	26291e0a75	PR feedback	2017-12-21 07:29:29 -08:00
Brad Davis	c6bc6f6ef2	Merge remote-tracking branch 'upstream/master' into android_nov	2017-12-16 16:20:16 -08:00
Brad Davis	6cff86b0f3	Fix polyvox archive, correct build errors, add additional libraries	2017-12-12 18:29:36 -08:00
Stephen Birarda	139976d8bb	allow staging METAVERSE_SERVER_URL to be toggled by env	2017-12-12 16:22:08 -08:00
Bradley Austin Davis	282ae7b6f9	Small fixes	2017-12-11 14:42:37 -08:00
Bradley Austin Davis	9df9cf7a47	Adding more libs, ifdefs for android incompatible code	2017-12-11 13:18:23 -08:00
David Rowe	f5b12a0a9d	Fix typo	2017-11-30 19:16:51 +13:00
David Rowe	a01d118c57	Documentation review	2017-11-30 16:03:57 +13:00
David Rowe	07a7cb412a	Merge branch '21602' into 21603	2017-11-28 16:43:12 +13:00
David Rowe	de49fefc61	Merge branch 'master' into 21602 ... # Conflicts: # libraries/shared/src/RegisteredMetaTypes.h	2017-11-25 17:06:36 +13:00
Elisa Lupin-Jimenez	b6e75d1222	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-11-20 10:07:11 -08:00
Elisa Lupin-Jimenez	3aa7cb440d	file structures in zip files replicated, more useful unzip debug print, updated blocks tablet app url	2017-11-20 10:01:33 -08:00
David Rowe	27e3e0bf0b	Merge branch 'master' into 21602	2017-11-20 08:12:19 +13:00
David Rowe	d3c33b1aaf	Quat API JSDoc	2017-11-16 16:20:54 +13:00
David Rowe	a35316913e	Uuid API JSDoc fixes	2017-11-16 12:58:33 +13:00
David Rowe	41e929c8a2	Add missing types to typedefs	2017-11-16 10:58:03 +13:00
David Rowe	bde3dbc2fd	Uuid JSDoc	2017-11-13 11:25:11 +13:00
David Rowe	a2ece7a3ad	Initial, placeholder JSDoc for Uuid	2017-11-12 12:02:58 +13:00
David Rowe	9d9f684af5	Tidying	2017-11-12 11:44:51 +13:00
David Rowe	f5e155bf94	Expand Menu's JSDoc	2017-11-11 17:01:55 +13:00
David Rowe	c8734ccd63	Menu JSDoc improvements	2017-11-11 16:18:05 +13:00
David Rowe	c77a12f5fa	Update Clipboard and Menu JSDoc to use JavaScript type names	2017-11-11 07:55:57 +13:00
David Rowe	036ac8de6d	Update JSDoc for Menu JavaScript API	2017-11-10 21:55:42 +13:00
Ken Cooke	82d9827571	Merge branch 'master' into audio-louder-mastergain	2017-11-01 08:10:55 -07:00
Nissim Hadar	d6b3fa4cb1	Removed references to Haze from Stage.	2017-10-30 10:49:08 -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
David Rowe	da33c4fcf2	Fix script reload icon not working in Windows developer builds	2017-10-26 11:41:52 +13: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
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
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
Nissim	a641d6de66	Variable rename.	2017-10-17 09:18:29 -07:00
David Rowe	ed1c974f75	Use MyAvatar.SELF_ID instead of Uuid.SELF	2017-10-17 15:58:51 +13:00