769 commits

Author	SHA1	Message	Date
Ryan Huffman	a5e3fa45c3	Fix advanced movement being disabled	2016-10-07 10:30:18 -07:00
Ryan Huffman	c74df965ba	Fix misnamed function and duplicate onFinish in tutorial	2016-10-07 10:30:18 -07:00
Ryan Huffman	fec8049226	Add proper disabling to advanced movement script	2016-10-07 10:30:18 -07:00
Ryan Huffman	827506e929	Disable 180 spin in tutorial	2016-10-07 10:30:18 -07:00
Ryan Huffman	a4ffa7b23f	Add disabling of right click menu with vive	2016-10-07 10:30:18 -07:00
Ryan Huffman	14323a06b3	Add interface to disable hand controller grab functionality	2016-10-07 10:30:18 -07:00
Ryan Downe Karpf	ed2571704f	Merge pull request #8735 from huffman/feat/teleport-improvements ... Update teleport.js to ignore invisible or collisionless objects and disallow teleporting to certain surfaces	2016-10-07 09:56:30 -07:00
David Rowe	e2e762f9e7	Merge branch 'master' into 21055 ... Conflicts: interface/resources/qml/AddressBarDialog.qml	2016-10-07 11:27:35 +13:00
Ryan Huffman	d50689b795	Remove disabling of teleport in hand grab	2016-10-04 20:25:46 -07:00
Ryan Huffman	d0ba53a069	Change name of isTooCloseToTeleport to be more descriptive	2016-10-04 20:22:22 -07:00
Ryan Huffman	1e6aba1928	Fix teleport not removing overlay on teleport	2016-10-04 20:21:32 -07:00
Ryan Huffman	2ef7c9a57a	Disable smooth movement in teleport.js	2016-10-04 20:21:32 -07:00
Ryan Huffman	53623f7583	Make teleport.js normal rejection more lenient	2016-10-04 20:21:30 -07:00
Ryan Huffman	813ed59f00	Update teleport to not collide with non collidable entities	2016-10-04 20:19:54 -07:00
Ryan Huffman	75265cff6e	Update teleport to not let you teleport into walls	2016-10-04 20:19:54 -07:00
Ryan Huffman	b0c7e91737	Disable ray picking against invisible objects in far grab and teleport	2016-10-04 20:19:51 -07:00
Ryan Huffman	17c63eb722	Add the ability to ignore invisible entities in findRayIntersection	2016-10-04 20:19:32 -07:00
Ryan Huffman	8343cfd687	Add grip to unequip	2016-10-04 16:34:18 -07:00
Ryan Huffman	289cd6ba2b	Adjust hand controller unequip rotation threshold	2016-10-04 16:34:18 -07:00
David Rowe	caf1a93354	Merge branch 'master' into 21055 ... Conflicts: libraries/entities-renderer/src/RenderableWebEntityItem.cpp	2016-10-04 10:51:14 +13:00
Brad Hefta-Gaub	546d4ff986	remove mic and window resize notifications	2016-10-02 09:10:12 -07:00
David Rowe	ad5d525340	Fix keyboard status when switching between entities editor tabs	2016-09-30 14:13:35 +13:00
David Rowe	5e842843c6	Set alphabetic/numeric keyboard per field entered	2016-09-30 11:54:32 +13:00
David Rowe	e3be34528f	Fix keyboard flickering when select entities ... Fix entities list footer count of selected entities in the process.	2016-09-29 16:53:20 +13:00
David Rowe	8e44096981	Fix last entities properties not scrolling when keyboard raised	2016-09-29 15:59:24 +13:00
David Rowe	f8572096b1	Merge branch 'master' into 21055	2016-09-28 20:00:04 +13:00
David Rowe	b60f649e0a	Scroll HTML window if necessary when raise keyboard	2016-09-28 19:27:16 +13:00
David Rowe	a94d77ee12	Raise and lower keyboard in entities editor	2016-09-28 17:57:53 +13:00
Seth Alves	785e187a27	edit.js uses notification.js to indicate errors instead of a modal dialog. in HMD, notification messages no longer jitter around	2016-09-21 11:39:25 -07:00
Brad Hefta-Gaub	2b01c60a55	Merge pull request #8615 from davidkelly/dk/1264 ... Make the equip sphere emissive	2016-09-19 16:33:55 -07:00
Anthony J. Thibault	aefe224215	Fix for jittery far-grab at low update rates ... Clamp the blendFactor used to smooth out the motion of the far-grabbed object. This prevents the newTargetPosition from over shooting it's goal.	2016-09-19 10:51:46 -07:00
David Kelly	22d80914e2	whitespace	2016-09-16 14:17:44 -07:00
David Kelly	ade17e6456	PR feedback	2016-09-16 14:15:14 -07:00
David Kelly	2ddd46f30b	Switch to the cool looking model instead	2016-09-16 10:56:59 -07:00
David Kelly	1acfe017e1	Make the equip sphere emissive ... maybe this will make it visible in low ambient light situations?	2016-09-15 17:12:35 -07:00
Chris Collins	84ffda5281	Merge pull request #8608 from huffman/fix/particle_explorer ... Fix eventBridgeLoader path in particle explorer	2016-09-15 16:51:41 -07:00
Ryan Huffman	6a32ef29dc	Fix eventBridgeLoader path in particle explorer	2016-09-15 13:07:00 -07:00
howard-stearns	03a8af76e3	don't do hand-controller edit object-selection when pointed at a HUD ... element	2016-09-14 12:02:33 -07:00
Seth Alves	e5e9bb0052	Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments	2016-09-14 11:28:10 -07:00
David Rowe	fa0aeb4563	Display render info values only when valid provided	2016-09-13 13:03:47 +12:00
David Rowe	d61e4c5c11	Display textures size in MB	2016-09-13 10:52:19 +12:00
David Rowe	fe8b3b4d0d	Merge branch 'master' into 21040	2016-09-13 09:12:47 +12:00
David Rowe	44282499c5	New glyph for "has transparent"	2016-09-10 14:37:09 +12:00
David Rowe	a06f49f791	Fix footer entities count not being updated when change filter value	2016-09-10 11:14:23 +12:00
David Rowe	487cb7d893	Use findInFrustum in entities list and filter results per search radius	2016-09-09 18:58:38 +12:00
Seth Alves	ecb0669972	try to keep far grab from getting stuck if the entity is brought very near to the grab-point	2016-09-08 17:02:29 -07:00
Seth Alves	0f98c51d89	distance-grabbed things collide with static entities	2016-09-08 16:13:22 -07:00
Seth Alves	9e99cc1f78	fix mod.js	2016-09-08 07:35:52 -07:00
David Rowe	28cfca993f	Add and wire up "search in view" JavaScript API stub	2016-09-08 14:58:48 +12:00
David Rowe	a4b5f5395d	Add "in view" button	2016-09-08 12:56:41 +12:00