1925 commits

Author	SHA1	Message	Date
David Rowe	6e1a091447	Mat4 API JSDoc stubs	2018-05-12 14:44:38 +12:00
David Rowe	496154fdbe	File API JSDoc stubs	2018-05-11 21:07:12 +12:00
David Rowe	fab85c3f6d	Fix JSDoc function definitions specifying properties instead of params	2018-05-11 09:52:48 +12:00
Seth Alves	4410402c7d	Merge pull request #13114 from sethalves/more-logging-suppression ... more suppression of logging	2018-05-09 17:36:12 -07:00
MiladNazeri	bc03fb398f	Merge pull request #13102 from ctrlaltdavid/21856-h ... Fix JSDoc for Users.requestUsernameFromID	2018-05-09 13:35:06 -07:00
Seth Alves	7466d08f1f	more suppression of logging	2018-05-09 13:01:49 -07:00
NissimHadar	7f9f9d769a	Corrected bug causing Interface not to exit at end of test.	2018-05-08 15:51:52 -07:00
NissimHadar	c3ef6aab1c	Don't save test scripts	2018-05-07 12:51:41 -07:00
NissimHadar	481eddb2a3	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-07 08:24:03 -07:00
Clement	da9fb9c751	Fix non self-sufficient headers	2018-05-04 16:26:41 -07:00
David Rowe	a35517d985	Fix JSDoc for Users.requestUsernameFromID	2018-05-05 07:05:10 +12:00
NissimHadar	3b566332c6	Shutdown interface when test script finishes.	2018-05-03 14:34:12 -07:00
NissimHadar	3a5425122b	Shutdown interface when test script finishes.	2018-05-03 14:31:01 -07:00
MiladNazeri	8e214d8ee8	Merge pull request #13049 from ctrlaltdavid/21856-d ... List which contexts each namespace and class is available in	2018-05-03 01:29:14 -07:00
John Conklin II	7a5fce4315	Merge pull request #12991 from luiscuenca/avatarScript ... Avatar Scripts	2018-05-02 12:23:13 -07:00
David Rowe	1aa28b7f54	Merge remote-tracking branch 'upstream/master' into 21856-d ... # Conflicts: # interface/src/LODManager.h	2018-05-02 07:50:55 +12:00
David Rowe	a1fc1c4810	Add JSDoc for Entity preload and unload signals	2018-05-01 21:55:14 +12:00
luiscuenca	50ca09b3b4	minor fixes	2018-04-30 16:26:04 -07:00
luiscuenca	2de982a5a2	Added script types and better script reload	2018-04-30 12:04:35 -07:00
David Rowe	2cc3ed6287	List which contexts each namespace and object is available in	2018-04-28 20:00:28 +12:00
John Conklin II	dd32ca33a5	Merge pull request #12957 from sethalves/quiet-logging ... Quiet logging	2018-04-27 14:59:38 -07:00
John Conklin II	ddedfce8a3	Merge pull request #12932 from ZappoMan/fixBug349 ... fix bug 349	2018-04-27 12:48:17 -07:00
David Rowe	08dc9b133f	Docs to JSDoc review	2018-04-26 21:10:28 +12:00
MiladNazeri	0f87e53902	Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate ... Docs/docs to js docs update	2018-04-25 12:26:19 -07:00
milad nazeri	4c736b2d62	Fixed defaults	2018-04-24 21:38:48 -07:00
David Rowe	cae9447ac5	Doc review	2018-04-25 15:09:47 +12:00
milad nazeri	23d07fa292	fixed spacing issue	2018-04-24 13:14:55 -07:00
milad nazeri	1121fe8da0	fix tabs	2018-04-23 21:47:53 -07:00
milad nazeri	4ac06fe99f	Updating previous jsdocs	2018-04-22 22:22:33 -07:00
David Rowe	941e9360dd	JSDoc fixes	2018-04-23 16:09:56 +12:00
David Rowe	d65f66a73d	Interim JSDoc for Recording	2018-04-23 14:13:29 +12:00
David Rowe	4fb55ec2af	Interim JSDoc for Users	2018-04-23 09:59:14 +12:00
David Rowe	2c39f2dbad	Interim JSDoc for Scene	2018-04-22 17:37:06 +12:00
David Rowe	62930eb576	Interim JSDoc for Script	2018-04-22 15:26:39 +12:00
David Rowe	01870af624	Interim JSDoc for ScriptDiscoveryService	2018-04-22 11:32:46 +12:00
MiladNazeri	3710ce593d	Merge pull request #12922 from ctrlaltdavid/21815 ... Controller API JSDoc	2018-04-21 10:44:05 -07:00
Seth Alves	bec39369f7	remove some uncatagorized logging, suppress some categories by default	2018-04-20 16:08:57 -07:00
David Rowe	8173ac87a8	Minor improvement to Quat.IDENTITY JSDoc	2018-04-20 16:41:10 +12:00
David Rowe	b1e214de5a	Vec3 API JSDoc	2018-04-20 16:40:15 +12:00
David Rowe	0a7cccc3f7	Move Vec2 and Vec4 JSDoc	2018-04-20 12:47:53 +12:00
milad	42471c539b	initial fixes from ctralt david's comments	2018-04-19 13:40:57 -07:00
milad	3f129bda13	More done on audio	2018-04-18 20:04:41 -07:00
ZappoMan	1a82101360	fix bug 349	2018-04-18 09:27:09 -07:00
David Rowe	9f83c606e9	Controller API JSDoc	2018-04-17 11:46:40 +12:00
MiladNazeri	e054f16c46	Merge pull request #12526 from ctrlaltdavid/21709 ... Entities API JSDoc	2018-03-12 14:40:09 -07:00
John Conklin II	42a686ad93	Merge pull request #12578 from druiz17/use-correct-audio-api ... use correct scripting api for audio in Audio.qml	2018-03-09 13:41:20 -08:00
Dante Ruiz	3a39fca268	made requested changes	2018-03-09 10:09:51 -08:00
Dante Ruiz	c49d0557fc	fixing check box issues	2018-03-09 09:29:37 -08:00
Atlante45	69fb830480	Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master	2018-03-08 17:23:17 -08:00
David Rowe	b461a422c6	Merge branch 'master' into 21709	2018-03-09 14:18:42 +13:00
Sam Gondelman	1e9cfe29f2	Merge pull request #12388 from highfidelity/android ... Android Tip	2018-03-08 10:18:35 -08:00
David Rowe	a62b6b7150	Merge branch 'master' into 21709	2018-03-07 17:34:53 +13:00
Elisa Lupin-Jimenez	c6e5f4c9c8	zip file drags don't auto add model textures	2018-03-06 19:24:09 -08:00
Brad Davis	8bfc610cfb	Merge remote-tracking branch 'upstream/master' into android	2018-03-05 11:48:58 -08:00
Dante Ruiz	55d8cfd4c1	make sure dont make audio devices that don't use stereo use stereo	2018-03-02 10:56:44 -08:00
David Rowe	d82a300f5f	Miscellaneous JSDoc improvements	2018-03-01 09:58:35 +13:00
David Rowe	3275846882	Material entity JSDoc	2018-03-01 09:57:42 +13:00
David Rowe	a782b6779a	Merge branch 'master' into 21709 ... # Conflicts: # interface/src/ui/overlays/Overlays.h # interface/src/ui/overlays/Shape3DOverlay.cpp # libraries/entities/src/EntityItemProperties.cpp # libraries/entities/src/EntityScriptingInterface.h	2018-02-28 12:42:05 +13:00
Brad Davis	3e552e5739	Fix warnings	2018-02-26 09:53:35 -08:00
humbletim	f8fe06213d	CR feedback; whitespace / remove unnecessary diffs	2018-02-23 09:11:23 -05:00
humbletim	72fca7e57e	Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge	2018-02-22 05:18:05 -05:00
humbletim	be8d79f53f	CR fedback and cleanup	2018-02-22 05:15:01 -05:00
SamGondelman	4c6169ec78	merge and a little cleanup	2018-02-20 15:45:34 -08:00
humbletim	5791ca4c51	interim checkin	2018-02-20 12:22:04 -05:00
David Rowe	86a6f73fb4	Quat JSDoc improvement	2018-02-19 12:21:21 +13:00
Andrew Meadows	96c97547f9	Merge pull request #12205 from jherico/no_widgets ... Remove some unneeded Qt dependencies	2018-02-05 15:32:54 -08:00
humbletim	06afaa7470	BufferView <-> QVariant/QScriptValue conversion ... update MeshProxy/SimpleMeshProxy and ScriptableModel ModelScriptingInterface / scriptable::ModelProvider integration update to RC-63 initial graphics-scripting refactoring graphics-scripting baseline commit wip commit Geometry -> MeshPart remove SimpleMeshProxy collapse graphics-utils -> graphics-scripting scriptable::Model => scriptable::ScriptableModel	2018-02-01 16:30:29 -05:00
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
Brad Davis	0781d8eaf0	Remove some unneeded Qt dependencies	2018-01-28 22:18:24 -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
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
Nissim Hadar	9c9dfc7211	Replace light blend with glare.	2017-10-13 13:36:46 -07:00
Nissim Hadar	c76229934c	Changed blend-in colour and blend-out colour to colour and glare colour	2017-10-13 12:21:00 -07:00
David Rowe	949ed3b33d	Add some Quat and Uuid JavaScript helper properties	2017-10-14 07:17:23 +13:00
Nissim Hadar	30fdf9d08e	Merge branch 'master' into hazeZone	2017-10-11 22:12:52 -07:00
Nissim Hadar	a21995db24	Added checkbox for altitude effect.	2017-10-11 22:10:58 -07:00
Nissim Hadar	96fd3123e8	Changed haze altitude to ceiling.	2017-10-11 20:36:24 -07:00
SamGondelman	403b18977b	remove unused HFMetaEvents	2017-10-11 14:37:23 -07:00
Nissim Hadar	71f567f15a	Merge branch 'master' into hazeZone	2017-10-09 17:28:10 -07:00
Nissim Hadar	7d5a887f43	Refactoring.	2017-10-09 17:25:19 -07:00
Brad Hefta-Gaub	80f0bd3b79	Merge pull request #11494 from humbletim/add-console-output-basenames ... [experiment/feedback] Include script name with all JS/QML debug output	2017-10-06 17:58:19 -07:00
Nissim Hadar	320c888ce4	Added checkbox to allow separate control of keylight attenuation.	2017-10-05 20:31:45 -07:00
Nissim Hadar	2ce86ebfae	WIP - working on byte order in server messages.	2017-10-04 11:56:35 -07:00
Nissim Hadar	999c3201c3	Merge branch 'master' into hazeZone	2017-10-02 16:54:45 -07:00
beholder	cc8f1352da	7951 Reload button in Running Scripts dialog stops script	2017-10-02 22:18:03 +03:00
Nissim Hadar	f26345a3f0	Working on adding zone to haze.	2017-09-29 15:15:49 -07:00
humbletim	fd917917c4	include the source basename in Script.print() && QML/Script console.*() debug output	2017-09-29 14:48:01 -04:00
Nissim Hadar	4d8a1db895	Merge branch 'master' into hazeZone ... # Conflicts: # libraries/entities-renderer/src/RenderableModelEntityItem.cpp	2017-09-27 17:50:51 -07:00
Bradley Austin Davis	e42068f681	Merge branch 'master' into android_new	2017-09-26 14:31:29 -07:00
Nissim Hadar	27af4685e7	Added range and altitude to UI.	2017-09-25 09:32:52 -07:00
Nissim Hadar	678b4e35b1	Before replacing "Haze Active" checkbox with "Haze Mode" combo.	2017-09-24 14:06:00 -07:00
Ken Cooke	84786ac8e3	Merge pull request #11424 from ctrlaltdavid/21548 ... Fix recording just made not playing back if reload it	2017-09-21 12:19:23 -07:00
David Rowe	a2d8152a3a	Coding standard	2017-09-22 07:13:32 +12:00
Ryan Huffman	a56303a3fe	Merge pull request #11379 from highfidelity/feat/auto-bake ... Add auto baking to Asset Server and mesh compression for FBXs	2017-09-21 08:33:51 -07:00
David Rowe	4ce5e4ac46	Fix recording just made not playing back if reload it	2017-09-21 12:19:32 +12:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
Seth Alves	8a49edbecb	code review	2017-09-15 10:08:35 -07:00
Seth Alves	d89f2b77da	rework ScriptEngine lifetimes using 'smart' pointers	2017-09-14 10:42:21 -07:00
Atlante45	8a291f16ff	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-08-25 15:26:38 -07:00
Atlante45	348be788f7	Add BakingEnabled protocol	2017-08-25 10:56:27 -07:00
Stephen Birarda	100ac65975	store relative path URL in resource request on redirect	2017-08-15 15:27:44 -07:00
Elisa Lupin-Jimenez	072f3dfb03	removed commented out code, removed blocks from default scripts	2017-08-15 10:25:14 -07:00
Elisa Lupin-Jimenez	1ac9536f95	Downloading blocks from marketplace in own asset folder	2017-08-09 15:56:07 -07:00
Elisa Lupin-Jimenez	17acf0520d	Download from blocks in marketplace working	2017-08-09 11:08:14 -07:00
Elisa Lupin-Jimenez	d599753771	Started blocks download catch, fixed a debug typo	2017-08-08 18:43:35 -07:00
Elisa Lupin-Jimenez	1102b27ba1	Fixed merge conflicts with master	2017-08-08 11:47:08 -07:00
Elisa Lupin-Jimenez	af432087e3	small revisions to bracketing/variable name	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	ebc28a6557	Renamed isBlocks to isZip, added debug print for non-entity files	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	c6d5b1a5e6	Removed extraneous print statements	2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez	ed1ed4f3e0	Blocks drag does not work yet	2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez	ca6a323d54	Can drag blocks zip folder into hifi and upload the .obj	2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez	310a0eeecc	Renamed isBlocks to isZip, added debug print for non-entity files	2017-08-02 12:24:14 -07:00
Elisa Lupin-Jimenez	b2161e433c	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-07-31 09:54:21 -07:00
Elisa Lupin-Jimenez	d4a7e9188a	Removed extraneous print statements	2017-07-27 13:33:53 -07:00
Elisa Lupin-Jimenez	acb088b263	Blocks drag does not work yet	2017-07-26 16:58:23 -07:00
Elisa Lupin-Jimenez	9cfc4dc91b	Can drag blocks zip folder into hifi and upload the .obj	2017-07-26 15:21:39 -07:00
burtsloane	d4ae298a8d	Merge branch 'master' into midi	2017-07-26 13:59:07 -07:00
Burt Sloane	a960ea5ccb	Linux build	2017-07-26 13:32:23 -07:00
Burt Sloane	4f7243e444	Merge branch 'master' of https://github.com/burtsloane/hifi into midi	2017-07-26 13:30:57 -07:00
Seth Alves	47ea32f4d3	vertex color support in ModelScriptingInterface	2017-07-23 08:06:26 -07:00
Seth Alves	72e5fecb4e	do Model::getMeshes on the correct thread. added ModelScriptingInterface::getVertexCount and ModelScriptingInterface::getVertex	2017-07-20 16:34:34 -07:00
Seth Alves	084a989a7a	stopAndDeleteLater is now just stop	2017-07-11 21:21:42 -07:00
Seth Alves	972dc4d1b2	more const ref	2017-07-11 19:56:34 -07:00
Seth Alves	3670a04d8e	switch bare pointers to AudioInjector objects to be QSharedPointers	2017-07-11 14:24:58 -07:00
Brad Davis	7f1bc07d04	Trying to fix overlay crashes again	2017-07-05 14:30:01 -07:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
Seth Alves	794495c197	make ResourceManager be owned by DependencyManager	2017-06-28 14:18:14 -07:00
Clément Brisset	a2c15c9794	Merge pull request #10770 from jherico/fix_deps_1 ... Cleanup entity dependencies	2017-06-28 10:48:58 -07:00
Seth Alves	e4a9674614	Merge pull request #10824 from sethalves/fix-script-sleep-busyloop ... use QEventLoop and a timer for a less CPU using sleep + event-processing	2017-06-27 21:00:40 -07:00
Brad Davis	8130a91b8c	Cleanup entity dependencies	2017-06-27 19:15:49 -07:00
Seth Alves	4f672f93d2	avoid cast that isn't always available	2017-06-26 16:03:39 -07:00
Seth Alves	bf7da71eaf	use QEventLoop and a timer for a less CPU using sleep + event-processing	2017-06-26 15:07:22 -07:00
Sam Gateau	619b357ad0	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-06-26 10:03:53 +02:00
David Rowe	3de1c0a312	Make and save recording	2017-06-24 15:57:57 +12:00
samcake	c0e8b6c8bc	clean up	2017-06-23 14:18:56 -07:00
samcake	b7b520a6e8	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-06-23 13:50:31 -07:00
Brad Hefta-Gaub	dc649e84df	Merge pull request #10792 from jherico/qml_crashes ... Trying to fix QtQml/QtScript crashes	2017-06-23 12:41:43 -07:00
samcake	c24e254257	Add support for profiling from scripts	2017-06-22 18:10:20 -07:00
Brad Davis	4439de240a	Trying to fix QtQml/QtScript crashes	2017-06-22 16:39:57 -07:00
samcake	bda52c33e6	Adding the function source when profiling, to explore perf issues	2017-06-22 15:35:00 -07:00
David Kelly	06d1ac8bf7	Merge remote-tracking branch 'upstream/master' into dk/scriptsSwitch	2017-06-22 14:14:54 -07:00
David Kelly	ff5b37c785	new --scripts switch overrides default scripts location	2017-06-22 14:09:05 -07:00
Brad Hefta-Gaub	7668fbb7a0	Merge pull request #10755 from seefo/fb5278 ... Fixed an issue where toolbar buttons duplicated themselves when reloading scripts	2017-06-22 13:35:05 -07:00
Sam Cake	c35be446e6	adding profiling on the script engine call back to timer event	2017-06-21 00:06:45 -07:00
Sam Cake	189ad9c706	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-06-20 22:42:40 -07:00
samcake	d853a76376	Fixing the scripts and investigating the scripting	2017-06-20 17:23:44 -07:00
Zach Pomerantz	8e1cf763e3	Merge pull request #10756 from zzmp/audio/input-level ... Update chrome for the audio input level meter	2017-06-20 15:33:17 -07:00
Zach Pomerantz	7e84f67391	Merge pull request #10744 from zzmp/audio/output-sample ... Add "Play sample sound" to audio setting	2017-06-20 15:32:57 -07:00
Zach Pomerantz	c826858458	revamp tablet MicBar	2017-06-20 11:43:02 -07:00
seefo	00a3fc77a1	Fixed an issue where toolbar buttons duplicated themselves when reloading scripts	2017-06-20 11:18:22 -07:00
Brad Hefta-Gaub	cbded766b1	Merge pull request #10676 from NeetBhagat/21369 ... WL 21369 - Implement parts of the JS "console" object	2017-06-20 11:06:34 -07:00
Zach Pomerantz	a7e1b75909	stopgap with MyAvatar.qmlPosition	2017-06-19 14:41:01 -07:00
Brad Davis	ed6620fc51	Merge pull request #10718 from jherico/frame_thread ... Cleanup and refactoring	2017-06-19 13:31:44 -07:00
NeetBhagat	2909aa9ac8	Resolve comments of @zappoman. ... -- Rename "asserts" to "assert" -- Log printing methods will accept lists of objects or strings.	2017-06-17 01:00:32 +05:30
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
Burt Sloane	4f7a1a6e2e	got rid of tabs	2017-06-15 16:35:53 -07:00
Burt Sloane	fbc28c0e2f	pedantic PR	2017-06-15 16:16:29 -07:00
Burt Sloane	7022c4009f	midi in and out	2017-06-15 15:18:06 -07:00
Zach Pomerantz	a8f69bb2e0	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-13 17:41:52 -04:00
Zach Pomerantz	20c0dac8e8	update QML with Audio.muted	2017-06-13 16:10:16 -04:00
NeetBhagat	9646eba873	Complete console.trace and added a testcases for all 13 functions.	2017-06-13 23:52:48 +05:30
NeetBhagat	5c324264a2	Complete the functionality of console.trace().	2017-06-13 14:12:29 +05:30
NeetBhagat	b0e9c62c12	Merge branch 'master' of https://github.com/highfidelity/hifi into 21369	2017-06-13 10:10:44 +05:30
NeetBhagat	e8fc766c2b	Complete Console Exception.	2017-06-12 20:24:59 +05:30
NeetBhagat	71bff04ce0	Update group functionality by removing consoleLog method from consoleScriptingInterfaceClass.	2017-06-12 12:38:56 +05:30
NeetBhagat	2bd2804d0b	complete Group Functionality i.e Group,GroupCollapsed,GroupEnd	2017-06-09 20:31:58 +05:30
NeetBhagat	dd91346c18	Started group functions.	2017-06-09 11:43:16 +05:30
NeetBhagat	ead0d42cf3	Merge branch 'master' into 21369 ... # Conflicts: # libraries/gl/src/gl/OffscreenQmlSurface.cpp # libraries/gl/src/gl/OffscreenQmlSurface.h	2017-06-07 15:47:19 +05:30
NeetBhagat	904e25c9e3	intial commit #21369 Working on clear method of console	2017-06-07 14:37:18 +05:30
Bradley Austin Davis	30c86ff321	Attempt to resolve Tablet scripting interface deadlocks	2017-06-06 14:58:56 -07:00
NeetBhagat	0f9cd5d0c7	intial commit hifi: #21369 Implement parts of the JS "console" object	2017-06-06 15:20:08 +05:30
Zach Pomerantz	4a3f2e1d09	use subclass for interface's Audio interface	2017-05-28 19:25:37 -04:00
Zach Pomerantz	297993b358	report success on tablet->pushOntoStack	2017-05-26 17:09:39 -04:00
Clément Brisset	efe72e1b85	Merge pull request #10530 from Atlante45/fix/default-scripts ... Ensure user never loses its running scripts	2017-05-25 18:33:11 -07:00
Chris Collins	f8b92b6666	Merge pull request #10536 from misslivirose/fix/check-extension-running-scripts ... Fix/check extension running scripts	2017-05-23 22:15:50 -07:00
Liv	b2bbf21fb0	style fixes	2017-05-23 15:21:21 -07:00
Liv	09c7a61599	Fix from string equals to contains to account for working formats not correctly detected with suffix	2017-05-23 14:42:07 -07:00
Liv	3340211455	Cleanup and better error handling	2017-05-23 13:54:38 -07:00
Liv	e9fac38bbb	Add function hasValidScriptSuffix and check if script extensions are JavaScript or JSON files	2017-05-23 13:08:50 -07:00
Atlante45	10eb353126	Ensure user never loses its running scripts	2017-05-22 18:55:58 -07:00
Liv	1fa3e6bda2	Revert "Initial check that the script url has a supported extension, currently JS only" ... This reverts commit d50bdd6aa9.	2017-05-22 17:47:16 -07:00
Liv	d50bdd6aa9	Initial check that the script url has a supported extension, currently JS only	2017-05-22 16:53:41 -07:00
Ryan Huffman	3c9205d0b2	Remove invalid comment and unnecessary check from ScriptEngine ... This removes an invalid comment - waitTillDoneRunning is not only called from the main thread - and remove a check to make sure thread() is not null because it should no longer be deleted before ScriptEngine.	2017-05-22 15:46:43 -07:00