Commit graph

114 commits

Author SHA1 Message Date
sabrina-shanman
fcaa64b9ef Fix teleport collision picks always enabled if user never enters HMD 2019-07-16 17:46:59 -07:00
r3tk0n
1ec887ffc2 Fix teleportation play area indicator not hiding on cancel. 2019-02-27 10:51:38 -08:00
r3tk0n
fcdfae5a67 Fix notion of hand dominance. 2019-02-27 08:39:35 -08:00
r3tk0n
ebbf48a11b Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-02-19 12:02:50 -08:00
SamGondelman
7677e3bf44 just in case 2019-02-16 20:41:57 -08:00
SamGondelman
71653f95d7 working on overlay bugs 2019-02-16 20:08:36 -08:00
r3tk0n
1751864042 Fix this references in module run function. 2019-01-29 16:13:11 -08:00
r3tk0n
4d2ee07512 Change deactivation criteria as per conversation between Joshua and Mukul. 2019-01-29 12:02:23 -08:00
r3tk0n
80abfbab5e Modify teleport to 'superpower' spec. 2019-01-24 14:22:01 -08:00
Dante Ruiz
deaf3e8e44 adding option to disable teleportring 2018-12-11 11:06:13 -08:00
Andrew Meadows
b38c263e60 use correct capsule dimensions in teleport.js 2018-11-06 12:44:14 -08:00
Wayne Chen
d12ee393d7 Merge branch 'fix-some-more-interstitial-issues' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes 2018-10-22 10:27:13 -07:00
Brad Hefta-Gaub
0e0542ec6e
Merge pull request #13890 from sethalves/grab-properties-1
move grab pseudo-properties (userData) into first-class EntityItemProperties
2018-10-17 13:29:20 -07:00
Dante Ruiz
451142f9a3 fixing some more interstittial issues 2018-10-11 11:33:19 -07:00
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
Seth Alves
834699fa12 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
David Rowe
84a06fbe64 Don't immediately hide occlusion highlights after teleporting 2018-10-02 16:11:01 +13: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
7560a2a923 Short circuit unnecessary repetition 2018-09-29 16:00:44 +12:00
David Rowe
7f518d0aa1 Make teleport parabolas semi-transparent 2018-09-28 16:13:25 +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
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
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
luiscuenca
b517808bc2 Fix smaller size avatar capsule and land on detailed mesh 2018-09-12 21:24:19 -07:00
luiscuenca
fedea6e84d Comply with review comments 2018-09-11 12:23:25 -07:00
luiscuenca
82b662d08e Add pick offset 2018-09-11 09:34:36 -07:00
luiscuenca
13de22adb3 Fix radius scale 2018-09-11 07:22:59 -07:00
luiscuenca
a9f676354b Only invisible pointers and scale fix 2018-09-10 08:54:53 -07:00
luiscuenca
d09391faa5 Fix invisible error 2018-09-07 12:17:40 -07:00
luiscuenca
01424b8179 Head Collision Pick added 2018-09-06 09:39:33 -07:00
luiscuenca
abb632afda Update capsule when scale/load and teleport without safe landing 2018-09-05 16:51:34 -07:00
luiscuenca
99e6e3d112 Collision Pick added to teleport.js 2018-09-04 17:18:26 -07:00