1260 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	74f10a1e7f	Merge pull request #9603 from huffman/feat/trace-thread-script ... Add thread names and scripts to chrome traces	2017-02-09 13:00:05 -08:00
Ryan Huffman	026c68c7de	Merge pull request #9625 from huffman/fix/server-script-entity-updates ... Fix Server Entity Script w/ high update rate causing issues	2017-02-09 10:07:32 -08:00
Anthony J. Thibault	b3a46c3518	Bug fix for TabletProxy::loadQMLSource()	2017-02-08 18:56:16 -08:00
Anthony J. Thibault	a209d0372a	First cut of pal on tablet.	2017-02-08 17:34:03 -08:00
Ryan Huffman	f75eceda65	Add entity PPS per script configuration	2017-02-08 13:11:18 -08:00
Dante Ruiz	7db86204d1	general function to load QML for javascript for tablet ... (cherry picked from commit b50e20c545)	2017-02-08 10:25:11 -08:00
Anthony J. Thibault	7d630f6c9a	Added Mat4.createFromColumns	2017-02-07 12:03:28 -08:00
Ryan Huffman	55df6f8f76	Add tracing to ScriptEngine and EntitiesScriptingInterface	2017-02-03 09:45:33 -08:00
Ryan Huffman	f2638637f7	Add thread names to traces	2017-02-03 09:18:58 -08:00
Anthony J. Thibault	85e01e3922	tablet-ui: Added sortOrder property to buttons ... By default user created buttons will appear after system buttons.	2017-02-02 17:18:22 -08:00
Anthony J. Thibault	de55a5dfe6	tablet-ui: reduced volume of button click	2017-02-01 18:47:50 -08:00
Anthony J. Thibault	cf855391af	Added jsdocs for all button properties	2017-01-31 16:54:15 -08:00
Anthony J. Thibault	0542945110	Moved SoundEffect into a separate compilation unit. ... Also, fixed license header in TabletScriptingInterface, to include proper author and date.	2017-01-30 12:46:22 -08:00
Dante Ruiz	006c3a99dc	fix tablet menu crashing	2017-01-27 19:04:53 +00:00
Seth Alves	c317ba8054	merge from upstream	2017-01-25 15:57:53 -08:00
Atlante45	f540c94113	Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr	2017-01-25 13:06:49 -08:00
Dante Ruiz	a147ce3f5f	fixed load script issue	2017-01-25 08:00:41 -08:00
Anthony J. Thibault	bff0eeef75	Added username to tablet header	2017-01-24 14:31:57 -08:00
Seth Alves	3496e4cc7a	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-23 16:50:41 -08:00
Zach Pomerantz	cba0b295e8	connect audio injector signal to scripting	2017-01-23 15:09:08 -05:00
Ryan Huffman	9b1cd52fb4	Add the ability to get the context that a script is running in	2017-01-23 08:58:01 -08:00
Clément Brisset	6da188b6ae	Merge pull request #33 from huffman/feat/entity-server-script-property ... Fix compilation error and move MessageID to CilentServerUtils	2017-01-20 17:37:01 -08:00
Ryan Huffman	be9b19e534	Fix default param ref failing on non-MSVC builds	2017-01-20 16:43:35 -08:00
Dante Ruiz	41bf65ed5e	home button improvments	2017-01-20 16:35:41 -08:00
Clément Brisset	95f07f3917	Merge pull request #32 from huffman/feat/entity-server-script-property ... PR FIxes	2017-01-20 15:39:22 -08:00
Ryan Huffman	888d7ab03d	Add exception information to script status	2017-01-20 15:33:48 -08:00
Stephen Birarda	eb033c797a	fallback if local URL empty when loading default scripts	2017-01-20 10:36:57 -08:00
Seth Alves	6641f9bafd	Merge pull request #9444 from druiz17/homeButtonFix ... Home button is now an overlay	2017-01-20 10:32:31 -08:00
Stephen Birarda	25bd6fa2c1	move recording interface to Agent/Application only	2017-01-20 10:27:08 -08:00
Seth Alves	c492319be2	merge from upstream	2017-01-20 10:14:11 -08:00
Dante Ruiz	1e7e4576cc	comparing with ID instead of strings	2017-01-19 16:38:55 -08:00
Ryan Huffman	c252d80782	Fix EntityScriptDetails having incorrect scriptText	2017-01-19 14:41:56 -08:00
Ryan Huffman	cbb55a06a0	Update ScriptEngine to store full running status off entity scripts	2017-01-19 13:27:44 -08:00
Zach Fox	534fcd9399	Potential fix	2017-01-19 10:20:36 -08:00
Zach Fox	346cfbfe02	First checkpoint	2017-01-18 12:55:24 -08:00
Seth Alves	b6188bb73a	fix warnings	2017-01-18 12:49:25 -08:00
Dante Ruiz	1c13f538f7	removed debug output	2017-01-18 17:08:13 +00:00
Dante Ruiz	fa3bea52cd	fixed bug with menu	2017-01-18 16:45:27 +00:00
Dante Ruiz	baff07b0f9	controller with menus finally work	2017-01-18 07:41:25 -08:00
Dante Ruiz	9a61b6030b	tabletFocus update	2017-01-18 07:40:15 -08:00
Dante Ruiz	d3fa7651c9	some what working d-pad	2017-01-18 07:40:15 -08:00
dante ruiz	865a78a8c8	saving work	2017-01-18 07:40:14 -08:00
Seth Alves	b57803057d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 06:38:44 -08:00
Seth Alves	0abb41ca2d	Merge pull request #9413 from hyperlogic/tablet-ui ... clara.io marketplace works on tablet	2017-01-18 06:37:55 -08:00
Anthony J. Thibault	56fc42a2bd	clara.io marketplace works on tablet	2017-01-17 15:38:44 -08:00
Atlante45	5db37fff95	More entity script server work	2017-01-17 13:47:45 -08:00
David Kelly	9b1aaf3bfe	CR feedback	2017-01-17 12:09:47 -08:00
Seth Alves	6bace4f451	merge from upstream	2017-01-17 09:29:30 -08:00
David Kelly	6c701bb0f0	remove ignored avatars from PAL when they disconnect	2017-01-16 18:22:53 -08:00
Zach Fox	b0b6aeac6c	Ken's feedback	2017-01-13 13:00:03 -08:00