2359 commits

Author	SHA1	Message	Date
Seth Alves	04a334fd07	unmangle merge	2017-03-21 11:02:18 -08:00
Seth Alves	1da6349505	merge from upstream	2017-03-21 10:26:02 -07:00
Ryan Huffman	13222468e3	Merge pull request #9712 from huffman/feat/edit-particle-icon ... Add particle system overlay in edit.js	2017-03-21 10:02:52 -07:00
Seth Alves	cc4ddd1387	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 08:43:35 -08:00
Brad Hefta-Gaub	b7f48644af	Merge pull request #9955 from druiz17/tablet-edit-selecting ... Fix edit.js from deselecting an object when trying to delete it	2017-03-21 09:27:30 -07:00
Seth Alves	bc90e9081b	Merge pull request #9957 from hyperlogic/bug-fix/tablet-scale ... Tablet scale settings now take effect soon after they are changed.	2017-03-20 15:05:47 -08:00
Anthony J. Thibault	f5c3d41f2c	Tablet scale settings now take effect soon after they are changed.	2017-03-20 14:51:47 -07:00
Dante Ruiz	de24023a21	Fix edit.js from deselecting an object when trying to delete it	2017-03-20 20:43:32 +01:00
Seth Alves	8988110c3b	Merge pull request #9953 from fayeli/edit-export-entities ... Adding Export Entities Functionality in Tablet Edit	2017-03-20 11:35:18 -08:00
Faye Li	f57905fbb3	remove code for jump to selection	2017-03-20 10:23:55 -07:00
Seth Alves	2e29ff3114	Merge pull request #9934 from fayeli/edit-import-entities ... Adding Import Entities button on the Create tab of Edit	2017-03-20 09:13:08 -08:00
Brad Hefta-Gaub	af790d8474	Merge pull request #9875 from birarda/bug/spin-strafe ... fix double snap turn strafing	2017-03-20 10:08:05 -07:00
Ryan Huffman	df644edde4	Fix hand controller not able to select light/particle icons	2017-03-20 09:45:50 -07:00
Chris Collins	308c134119	Merge pull request #9686 from humbletim/21114-part3 ... CR 21114 -- Implement modules/require support into hifi	2017-03-20 06:22:35 -07:00
Seth Alves	424af2255b	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-19 21:17:30 -08:00
samcake	e1a0984fed	Merge pull request #9906 from samcake/red ... Expose rendering in wireframe mode	2017-03-17 17:09:44 -07:00
Faye Li	197a06c423	changes in TWO entityList.js to register the export event	2017-03-17 16:17:21 -07:00
Faye Li	1a46f18aa3	adding export button + hiding jump to selection	2017-03-17 15:56:55 -07:00
Faye Li	6531efffbc	hook up qml button to edit.js	2017-03-17 11:22:07 -07:00
Seth Alves	df84ff27e9	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui	2017-03-17 07:52:22 -07:00
Atlante45	698791295a	Expose DriveKeys enum to JS	2017-03-16 20:03:27 -07:00
Seth Alves	a5d19439f9	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-16 16:32:07 -07:00
Atlante45	42316e713d	CR drive keys	2017-03-16 16:24:52 -07:00
Atlante45	3e9474e878	CR	2017-03-16 16:24:36 -07:00
Atlante45	35dd45ddf9	Capture drive keys while avatar is seated	2017-03-16 15:44:18 -07:00
Clément Brisset	21c5e7b0b2	Merge pull request #9880 from Atlante45/feat/sit ... Fix avatars stuck in the sitting position after a domain disconnect	2017-03-16 15:42:29 -07:00
humbletim	758c07c7d4	Merge branch 'master' into 21114-part3	2017-03-16 14:29:17 -04:00
samcake	4ef7fc61f0	Merge branch 'master' of https://github.com/highfidelity/hifi into red	2017-03-16 10:43:07 -07:00
Seth Alves	31e0cfe296	Merge pull request #9825 from thoys/record-fixes ... Avatar Recorder and Playback Fixes	2017-03-16 07:27:42 -08:00
humbletim	52a571558c	* changes per CR feedback ... * revert JSON content-type workaround * add specific error check / advice for unanchored module ids * update unit tests	2017-03-16 01:23:23 -04:00
samcake	ea2f1359bc	Expose rendering in wireframe mode	2017-03-15 12:23:44 -07:00
Dante Ruiz	a5f1fb9e9a	fixed notification spelling error	2017-03-15 19:45:30 +01:00
Dante Ruiz	dac16af1df	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-notifcation	2017-03-15 19:27:11 +01:00
Dante Ruiz	4bc050e583	added tablet notification	2017-03-15 19:26:50 +01:00
Stephen Birarda	d13752a7c6	use the correct property name for useAdvancedMovementControls	2017-03-15 10:34:43 -07:00
Stephen Birarda	bfc51d8222	use property not function for advanced movement controls	2017-03-15 10:25:06 -07:00
Seth Alves	96a3e2a6d3	Merge pull request #9898 from ctrlaltdavid/21214 ... Load controller scripts in their own script engine	2017-03-15 08:42:20 -08:00
Seth Alves	b5919d89a5	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-15 08:26:10 -08:00
David Rowe	cb4bd58381	Load controller scripts in their own script engine	2017-03-15 14:31:13 +13:00
Stephen Birarda	7ddb5ff770	use correct boolean when changing AMC	2017-03-14 18:09:17 -07:00
Stephen Birarda	188530590a	add missing curly brace to script	2017-03-14 17:16:49 -07:00
Stephen Birarda	490cb83489	move advanced movement control changes to MyAvatar	2017-03-14 15:03:01 -07:00
Atlante45	b14a4faf61	Guard against script loading before avatar	2017-03-14 10:54:22 -08:00
Atlante45	9e6312ba0e	Make sit script more stable.	2017-03-13 18:06:32 -08:00
Atlante45	f0d971fc6f	Put avatar in front of chair on situp to avoid infinite collisions	2017-03-13 18:06:32 -08:00
Atlante45	1a375432e0	Only grab primary clicks	2017-03-13 18:06:32 -08:00
Atlante45	34889d38c9	Override all roles instead of just fly	2017-03-13 18:06:32 -08:00
Ryan Huffman	8246dbafab	Update particle explorer to work outside of entity list	2017-03-13 15:15:36 -07:00
Stephen Birarda	0926b2df2a	add LX snap turn to standard mapping	2017-03-13 15:14:20 -07:00
Ryan Huffman	9880d40cfb	Update edit.js light icons to now use the name entityIcon	2017-03-13 14:38:56 -07:00