468 commits

Author	SHA1	Message	Date
sabrina-shanman	2ef85dfdba	Merge branch 'master' into stt_parenting2	2018-10-03 11:39:00 -07:00
David Rowe	2bdd8bfdc7	Update play area and sensor overlay models and raise a little	2018-10-03 11:09:04 +13:00
David Rowe	488599dbb0	Update teleport play area FBX model to be visible from below	2018-10-03 09:31:11 +13:00
David Rowe	c0231057f8	Revert foot calc scaling change	2018-10-03 09:28:19 +13:00
David Rowe	f7fd76b316	Merge branch 'master' into M18586 ... # Conflicts: # interface/src/scripting/HMDScriptingInterface.h	2018-10-02 16:49:16 +13:00
David Rowe	84a06fbe64	Don't immediately hide occlusion highlights after teleporting	2018-10-02 16:11:01 +13:00
sabrina-shanman	67dc526ee2	Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2	2018-10-01 17:17:32 -07:00
John Conklin II	9cbd819a39	Merge pull request #13965 from ctrlaltdavid/M17428-f ... Mini tablet in palm	2018-10-01 16:56:36 -07:00
David Rowe	87ff6dd56d	Fix play area sizing and positioning for different base avatar sizes	2018-10-02 10:53:31 +13:00
David Rowe	6ccd73ea47	Merge branch 'master' into M18586	2018-10-02 10:17:24 +13:00
David Rowe	7560a2a923	Short circuit unnecessary repetition	2018-09-29 16:00:44 +12:00
John Conklin II	130e8dfbe9	Merge pull request #14023 from dback2/selectEntityEveryFrameFix ... Only call selectEntity once triggered when using edit handles	2018-09-28 16:38:10 -07:00
David Rowe	545c2591e3	Merge branch 'master' into M18586	2018-09-28 16:19:44 +12:00
David Rowe	7f518d0aa1	Make teleport parabolas semi-transparent	2018-09-28 16:13:25 +12:00
David Rowe	7b7447739a	Remove unused code noticed in passing	2018-09-28 14:23:20 +12:00
David Rowe	45993ba475	Provide mini tablet details via API instead of messages	2018-09-28 14:23:08 +12:00
sabrina-shanman	411dbbbad3	Make scripts use the default scaleWithParent when creating ray/parabola ... picks	2018-09-27 17:34:06 -07:00
David Rowe	d98e7cea4e	Fix not being able to grab tablet with other hand	2018-09-28 11:09:16 +12:00
David Rowe	2456fd0e99	Merge branch 'master' into M17428-f	2018-09-28 08:41:57 +12:00
David Rowe	3284b2a90e	Immediately hide fading overlays if other hand starts teleporting	2018-09-27 15:20:43 +12:00
David Rowe	6ae206677d	Add Settings > Controls option for displaying play area	2018-09-27 14:55:53 +12:00
David Rowe	b9c6811fdc	Restructure post-teleport fading code	2018-09-27 14:44:30 +12:00
David Rowe	496e0a6304	Update teleport FBX models	2018-09-26 17:20:56 +12:00
David Rowe	a00cacc03e	Fix post-teleport display; hide immediately avatar moves	2018-09-25 16:02:19 +12:00
David Rowe	03f0b95a3f	Fix unwanted hexagonal occlusion artefact	2018-09-25 12:03:41 +12:00
David Rowe	7396bf0dbe	Immediately hide post-teleport play area if start teleporting again	2018-09-25 11:39:41 +12:00
David Rowe	06b4f51a08	Misc fixes	2018-09-25 11:33:08 +12:00
David Rowe	90ef109476	Remove superseded Pointers API functions	2018-09-25 11:11:53 +12:00
David Rowe	4927ffece3	Misc fixes	2018-09-25 10:33:49 +12:00
David Rowe	991ceb643c	Fix teleport not working after script reload in HMD mode	2018-09-25 10:18:52 +12:00
David Rowe	858abaf6fc	Fix sensor overlays not displaying after re-enter HMD mode	2018-09-25 09:49:11 +12:00
David Rowe	5ff2c36917	Get play area displaying and working again	2018-09-24 15:53:47 +12:00
David Rowe	e29b403abc	Merge branch 'master' into M18586 ... # Conflicts: # interface/src/raypick/PointerScriptingInterface.cpp # interface/src/raypick/PointerScriptingInterface.h # interface/src/raypick/StylusPointer.h # libraries/pointers/src/Pointer.h # scripts/system/controllers/controllerModules/teleport.js	2018-09-24 11:44:28 +12:00
Dante Ruiz	d4450ac780	fix equip and keeping new functionallity	2018-09-21 15:59:00 -07:00
David Rowe	eac1666e01	Disable grabbing the mini tablet with the grip button	2018-09-21 12:44:55 +12:00
David Rowe	5719b7020d	Merge branch 'master' into M17428-f	2018-09-21 10:47:56 +12:00
David Back	46c8083fb9	only call selectEntity one time per trigger	2018-09-19 10:13:15 -07:00
John Conklin II	65ef04ae75	Merge pull request #13937 from luiscuenca/stt_teleport_wip ... Safe Teleport Target	2018-09-14 15:11:18 -07:00
luiscuenca	04e6225a95	Threshold back	2018-09-14 11:22:47 -07:00
luiscuenca	8c9173b639	Safe landing for discrepancies	2018-09-14 11:06:30 -07:00
luiscuenca	fb37e13aae	fix hat stand fail	2018-09-13 18:21:22 -07:00
David Rowe	bbfb2b1374	Merge branch 'master' into M17428-f	2018-09-14 10:36:49 +12:00
luiscuenca	b517808bc2	Fix smaller size avatar capsule and land on detailed mesh	2018-09-12 21:24:19 -07:00
Wayne Chen	521361293a	moving comment locations inside conditionals	2018-09-12 11:03:00 -07:00
Wayne Chen	acf34dcfdf	one more unused variable	2018-09-12 10:58:05 -07:00
Wayne Chen	8bef0d0de4	removing unused variables	2018-09-12 10:55:40 -07:00
Wayne Chen	b9f0af63e1	changing check for near grabbing modules - fixes grabbing for dynamic	2018-09-12 10:38:21 -07:00
Wayne Chen	045ac4cb0d	allowing grip button for interrupting web scroll	2018-09-11 17:43:03 -07:00
Wayne Chen	b6c5ae2a68	staging changes	2018-09-11 15:23:40 -07:00
luiscuenca	fedea6e84d	Comply with review comments	2018-09-11 12:23:25 -07:00