54103 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	c05954ee4b	Add logAction() method to UserActivityLogger JavaScript API	2017-04-25 13:40:57 +12:00
ZappoMan	d179135a87	remove dead code	2017-04-24 18:21:22 -07:00
ZappoMan	95a3e0a092	fix whitespace	2017-04-24 18:06:33 -07:00
ZappoMan	382645ddd0	more cleanup	2017-04-24 18:01:54 -07:00
Andrew Lowry	5ffb8eba86	Initialize background color for color picker correctly.	2017-04-24 20:37:43 -04:00
ZappoMan	aa955ee360	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-24 17:36:30 -07:00
ZappoMan	c9aad6b762	new approach to the tpose fix, as well as other improvements	2017-04-24 17:36:05 -07:00
Dante Ruiz	ef03ca2a2c	tablet cpp ownership	2017-04-24 17:21:18 -07:00
Dante Ruiz	0705f23009	remove debug statments	2017-04-24 17:21:09 -07:00
Dante Ruiz	d03f44ff24	crash fix	2017-04-24 17:20:47 -07:00
Dante Ruiz	adc0c8086e	check for null when we dont	2017-04-24 17:20:32 -07:00
Clément Brisset	77cd2d08b2	Merge pull request #10106 from MrRoboman/W-21204-tetherball-toy ... Added tetherball create and entity scripts	2017-04-24 16:36:21 -07:00
humbletim	6f178ee1ec	initial checkin of doppleganger module and tablet app scripts	2017-04-24 19:28:03 -04:00
humbletim	3641ca3816	add support for jointRotations/jointTranslations to ModelOverlay	2017-04-24 19:24:54 -04:00
humbletim	28b3eef7aa	add getJointTranslations() methods	2017-04-24 19:22:02 -04:00
Atlante45	24f4107c92	Unload script when replaced with empty URL	2017-04-24 15:56:37 -07:00
Atlante45	d292451f91	Remove unnecessary const	2017-04-24 15:43:36 -07:00
Dante Ruiz	2a997f2a4d	fix for ubuntu build error	2017-04-24 23:08:02 +01:00
Dante Ruiz	b023356fb7	added javascript file	2017-04-24 22:29:13 +01:00
Dante Ruiz	8705db07e5	removed dead code	2017-04-24 22:22:49 +01:00
Dante Ruiz	249862141a	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-24 22:09:09 +01:00
Dante Ruiz	367a6ac03c	first prototype	2017-04-24 22:09:01 +01:00
Triplelexx	d689a43678	changes from CR	2017-04-24 22:07:51 +01:00
David Rowe	c0a258f9b3	Disable "load" button while making a recording	2017-04-25 09:04:26 +12:00
Triplelexx	d63c4d11c7	enable grabbable property for all newly created entities	2017-04-24 21:33:08 +01:00
David Rowe	d73fd6e08d	Update AC script URL in info	2017-04-25 07:42:21 +12:00
Seth Alves	aea8b020d2	Merge pull request #10254 from druiz17/tablet-crash ... Potential fix for crash for TabletScriptingInterface::getTabletWindow	2017-04-24 12:35:04 -07:00
David Rowe	d52125e2f5	Merge branch 'master' into 21249	2017-04-25 07:19:56 +12:00
Dante Ruiz	f69691afd5	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-24 19:57:48 +01:00
Dante Ruiz	d057dfebf0	got input recording to work	2017-04-24 19:57:38 +01:00
Andrew Lowry	6a218eaca9	Embeds colpick color picker in dat.GUI for particle explorer. ... Cleans up eslint for particleExplorer.js.	2017-04-24 13:35:37 -04:00
Andrew Lowry	aea89824c5	Switches tablet edit tab to particle explorer when particle entities are ... selected or created.	2017-04-24 13:35:37 -04:00
Andrew Lowry	ecf3826050	Always show hand lasers when in edit mode.	2017-04-24 13:35:37 -04:00
Andrew Lowry	8479d835b2	Adds laser selection of particle systems while in edit mode in HMD.	2017-04-24 13:35:37 -04:00
volansystech	1abbca6737	Merge branch 'master' into 21200	2017-04-24 19:09:02 +05:30
Sam Gateau	b1a3b1f48b	Merge pull request #10227 from samcake/brown ... Introducing support for the ResourceBuffer binding point in the gpu lib, the Batch and the backends	2017-04-22 08:51:54 -07:00
Philip Rosedale	92368d981b	Half Duplex script	2017-04-21 18:22:53 -07:00
Seth Alves	17b83dd64c	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-21 17:19:47 -07:00
sam gateau	733e268391	FIx the SSBO usage on amd, needed a bit more explanation on the glsl side	2017-04-21 16:17:18 -07:00
Andrew Meadows	3f9f16cc98	Merge pull request #10223 from kunalgosar/blendshapesbug ... Make setBlendshape changes persist	2017-04-21 16:11:13 -07:00
David Rowe	7fe0ba19b5	Don't display the "Record" button as pressed while recording	2017-04-22 10:05:02 +12:00
Dante Ruiz	64fcfd33a4	working on loading files	2017-04-21 22:38:53 +01:00
sam gateau	0a615f35a7	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-04-21 14:31:15 -07:00
ZappoMan	da68c49dc1	more cleanup	2017-04-21 13:31:40 -07:00
ZappoMan	f07884602a	more CR feedback	2017-04-21 13:13:29 -07:00
ZappoMan	088cdae320	CR feedback	2017-04-21 11:14:47 -07:00
ZappoMan	ff45ad53a3	some more CR cleanup	2017-04-21 10:40:41 -07:00
Dante Ruiz	50ed4a61f7	Merge branch 'master' of github.com:highfidelity/hifi into tablet-crash	2017-04-21 18:26:37 +01:00
Dante Ruiz	8cfa03fa56	tablet cpp ownership	2017-04-21 18:26:26 +01:00
ZappoMan	f133713d0e	CR feedback	2017-04-21 10:21:34 -07:00