134 commits

Author	SHA1	Message	Date
Sam Gateau	3519a72f8a	Merge pull request #10190 from samcake/ambient-bis ... Introducing a tool to debug the current Zone Stack	2017-04-14 13:28:59 -07:00
Thijs Wenker	6f58e91d76	Merge pull request #10121 from birarda/bug/recording-cache ... cleanup Agent RSI handling, make loadRecording async	2017-04-14 21:35:51 +02:00
Stephen Birarda	7b48feca66	address code review comments	2017-04-14 11:53:53 -07:00
samcake	4a47737d0b	REfining the Config behavior, trying to pr next	2017-04-10 19:01:49 -07:00
Sam Cake	b65448bcbe	Trying to improve the Job/Task classes and testing it with the ZoneRenderer	2017-04-09 11:08:35 -07:00
samcake	f82310545c	Revert "Revert "Fixing the rendering bug triggered with Nvidia driver 381.65""	2017-04-07 02:03:58 -07:00
samcake	ab3d39951e	Revert "Fixing the rendering bug triggered with Nvidia driver 381.65"	2017-04-07 02:03:31 -07:00
Sam Cake	b1a4bc329b	Introducing a fix to the graphics bug	2017-04-07 01:10:18 -07:00
Sam Cake	da1355dc32	Introducing a fix to the graphics bug	2017-04-07 01:03:07 -07:00
Stephen Birarda	1b24538756	modify scripts to use new recording API	2017-04-05 11:18:52 -07:00
Seth Alves	d1827cf12c	Merge pull request #10002 from fayeli/tablet-photobooth ... Photobooth Improvements: Using Tablet & Ability to Rotate Model	2017-04-03 16:05:13 -07:00
Faye Li	2ca4203d85	fix for submerge in floor issue	2017-04-03 12:57:51 -07:00
Faye Li	d726bd352d	fix for locked camera state issue	2017-04-03 12:14:29 -07:00
samcake	a03d3a1ca8	Clean up the utilities scrips of the render folder	2017-03-28 16:00:18 -07:00
Faye Li	8cb771d9a8	fix conflict	2017-03-24 14:46:24 -07:00
Faye Li	405be471c3	button state change	2017-03-24 13:47:19 -07:00
Faye Li	ccd4fdb540	naming	2017-03-24 10:46:52 -07:00
Faye Li	067faad9cd	Fix careless math mistake	2017-03-24 10:22:08 -07:00
Seth Alves	902e3d41d6	merge from upstream	2017-03-24 08:20:35 -07:00
Triplelexx	c7b9492620	revert removing rightUnitVec ... .....	2017-03-22 19:14:20 +00:00
Triplelexx	2d1ca99e2e	change variable names that use Quat.getForward	2017-03-22 17:00:12 +00:00
Triplelexx	a964edee91	change all references of Quat.getFront to Quat.getForward in scripts directory	2017-03-21 22:25:30 +00:00
Seth Alves	424af2255b	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-19 21:17:30 -08:00
Seth Alves	a5d19439f9	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-16 16:32:07 -07:00
samcake	4ef7fc61f0	Merge branch 'master' of https://github.com/highfidelity/hifi into red	2017-03-16 10:43:07 -07:00
samcake	ea2f1359bc	Expose rendering in wireframe mode	2017-03-15 12:23:44 -07:00
Thijs Wenker	097db9a7f9	- debug message removal (oops) ... - smaller timer textbox, allows you to grab around the edges and still drag the toolbar	2017-03-08 01:41:20 +01:00
Thijs Wenker	b21bd3afa9	Make the time and slider follow the record.js toolbar	2017-03-08 01:14:11 +01:00
Thijs Wenker	6b26f5f3a3	Fix the timer display	2017-03-08 00:09:56 +01:00
Seth Alves	f594689fa8	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 09:24:50 -08:00
David Rowe	55963c4418	Style audio stats dialog button	2017-03-03 17:46:12 +13:00
David Rowe	3285816fca	Fix up audio stats displayed in tablet	2017-03-03 16:45:35 +13:00
David Rowe	02a2bb6fc3	Rename QML file	2017-03-03 16:25:15 +13:00
David Rowe	2b53cb4722	Display audio stats in tablet	2017-03-03 11:31:41 +13:00
Faye Li	dae3d55985	rotate model by the slider	2017-02-28 14:43:51 -08:00
Faye Li	dedadd0aea	created slider ui	2017-02-28 13:22:32 -08:00
Faye Li	bd10b5d48f	fix camera drop down issue	2017-02-28 11:34:07 -08:00
sam	709c2e4240	Fixing the emissive on overlayfor models	2017-02-27 02:52:00 -08:00
Thijs Wenker	15518e9aa1	remove debugger line	2017-02-21 20:20:23 +01:00
Thijs Wenker	13b2b6086f	Fix recorder.js playback in interface	2017-02-21 19:47:26 +01:00
Faye Li	0e8d008b8c	only have one instance of photobooth at a time	2017-02-17 13:38:23 -08:00
Faye Li	27b619030d	ability to hide tablet and take picture	2017-02-17 11:32:53 -08:00
Faye Li	217ec46222	able to switch camera and clean up code	2017-02-17 10:54:40 -08:00
Faye Li	1e5090ad27	end of day commit	2017-02-15 16:47:06 -08:00
Faye Li	19bff20ebf	event handling - can now load models	2017-02-15 16:19:56 -08:00
Faye Li	2c77580ee9	use the new tablet event bridge	2017-02-15 15:58:11 -08:00
Faye Li	f3fdb7c315	added top bar title	2017-02-15 15:02:10 -08:00
Faye Li	3149f02de6	display HTML in tablet instead of overlay web window	2017-02-15 14:25:57 -08:00
Faye Li	18db5f1724	add a tablet button for photobooth	2017-02-15 14:19:03 -08:00
samcake	3c56bd2960	Adding support for disabling texturing from the material	2017-01-30 15:03:04 -08:00