1657 commits

Author	SHA1	Message	Date
Bradley Austin Davis	b97c938544	Merge pull request #12216 from thoys/feat/js-script-console-auto-complete ... JS scripting console auto-complete	2018-01-31 10:39:51 -08:00
MiladNazeri	3585bead96	Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes ... Leopoly_Phase1_004_RayPick-Changes	2018-01-29 14:02:38 -08:00
MiladNazeri	9baf02b7a1	Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request ... Leopoly_Phase1_003_Asset-Request	2018-01-29 11:40:41 -08:00
Thijs Wenker	45487a1e45	Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete ... # Conflicts: # interface/CMakeLists.txt	2018-01-25 22:51:35 +01:00
ZappoMan	cb01bd14b9	Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription	2018-01-25 10:39:43 -08:00
humbletim	63a226f999	make fromScriptValue logic easier to follow for CR; eliminate extra QByteArray conversion	2018-01-24 13:49:58 -05:00
humbletim	c2ee13931e	changes per CR feedback; additional jsdoc	2018-01-24 13:38:10 -05:00
humbletim	65455e7b50	Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes	2018-01-23 14:57:33 -05:00
humbletim	76cbc4ee55	separate getAsset fail/then handlers	2018-01-23 14:47:49 -05:00
humbletim	3a735c1fc7	CR feedback and code cleanup	2018-01-23 03:12:26 -05:00
ZappoMan	4ad5d34a10	more preferences cleanup, removing some dead code from ScriptEngines/ScriptModel	2018-01-20 17:20:42 -08:00
humbletim	395cc663dd	reuse same disk cache as AssetClient	2018-01-19 15:10:36 -05:00
Thijs Wenker	0f7f58417b	JS scripting console auto-complete	2018-01-19 19:11:12 +01:00
humbletim	d2a3a71f00	trying JS_VERIFY on for size (instead of JS_ASSERT)	2018-01-18 21:48:41 -05:00
humbletim	49bb9420cc	Merge branch 'master' into Leopoly_Phase1_003_Asset-Request	2018-01-17 17:11:33 -05:00
humbletim	0930cc4f0e	partial getMapping PR integration	2018-01-17 17:08:57 -05:00
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
humbletim	8d2e041678	remove debug prints; CR feedback	2018-01-03 03:39:24 -05: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
humbletim	a146b778f7	support additional .extraInfo for ray intersections	2017-12-21 12:35:13 -05:00
humbletim	8c7a8f0df3	expanded Assets scripting interface	2017-12-21 12:04:47 -05: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