Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 22:48:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
84260 commits 25 branches 0 tags 1.1 GiB
Commit graph

56 commits

Author SHA1 Message Date
Alezia Kurdis
1ce338d972
Support for "Rotate as the Next Clicked Surface" 
Support for "Rotate as the Next Clicked Surface"
Add "surfaceNormal" in the returned data.
 2020-12-24 22:55:09 -05:00
David Rowe
5e51ba051a Improve code responsibilities 2018-11-22 11:12:22 +13:00
David Rowe
44efd18882 Make Create and Shapes lasers ignore tablet while editing 2018-11-21 08:38:30 +13:00
David Rowe
b24c482743 Terminate Create far grab etc. upon laser intersecting tablet 2018-11-16 16:29:57 +13:00
Dante Ruiz
501746b156 3D Keyboard 2018-11-08 09:58:53 -08:00
David Rowe
71ec5f3612 Fix tablet highlighting when using the Create and Shapes apps 2018-10-20 11:57:46 +13:00
David Rowe
490c085eb8 Merge branch 'master' into M16440 
# Conflicts:
#	scripts/system/controllers/controllerModules/hudOverlayPointer.js
#	scripts/system/controllers/controllerModules/inVREditMode.js
 2018-10-19 09:06:33 +13:00
David Rowe
3bc1c2963d Fix HUD laser while in Shapes app 2018-10-04 13:15:33 +13:00
David Rowe
209d1535c2 Fix HUD laser while in Create app 2018-10-04 10:42:17 +13:00
Seth Alves
834699fa12 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07: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
Dante Ruiz
d4450ac780 fix equip and keeping new functionallity 2018-09-21 15:59:00 -07:00
David Back
46c8083fb9 only call selectEntity one time per trigger 2018-09-19 10:13:15 -07:00
Wayne Chen
222391532a Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-08-21 11:18:17 -07:00
Dante Ruiz
269afb9a49 remove tablet material entities code remove create 2018-08-07 11:19:22 -07:00
David Back
4a722a62f7 use click handler only, remove triggerClicked 2018-07-31 11:51:16 -07:00
David Back
cd842afc1c prevent both hands triggering same time, allow one to trigger after other 2018-07-26 17:52:25 -07:00
David Back
82e5d6ad29 use triggerClicks from controllers for edit handles 2018-07-26 16:38:25 -07:00
Wayne Chen
89f9cd089f Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-07-23 11:51:39 -07:00
Wayne Chen
eb7bde1bfc switching near grab priority to be before web surface laser 2018-07-17 15:38:56 -07:00
Dante Ruiz
df4d81277f clean up tablet material entities and don't show them in edit 2018-07-09 16:59:32 -07:00
David Back
bc06b88afc tabs 2018-06-15 14:31:18 -07:00
David Back
9b33e6757f prevent edit press events when pointing at desktop window or tablet 2018-06-15 14:29:47 -07:00
David Rowe
801a4b9aba Make laser click in sky deselect entity 2018-05-17 15:09:23 +12:00
Dante Ruiz
0e92bb41bf fix-another-highlighting-issue 2018-05-04 14:30:38 -07:00
Andrew Meadows
27c6e7915e purge LaserPointers refs from scripts that don't use it 2018-03-01 08:43:30 -08:00
David Rowe
adb6f66a05 Handle tablet entities and overlays not being available 2018-02-08 09:51:48 +13:00
David Rowe
5431b7137b Code review 2018-01-06 08:27:24 +13:00
Dante Ruiz
b9f60aff2a fix-edit 2017-11-30 13:22:26 -08:00
Dante Ruiz
8779d52ad3 making requested changes 2017-11-14 13:04:09 -08:00
Dante Ruiz
5852224a31 clean up code and finialize changes 2017-11-13 13:37:53 -08:00
Dante Ruiz
43c6d71236 fix stylus module 2017-11-10 17:28:55 -08:00
Dante Ruiz
ef55e3181d moveing controllerDispatchaer pointers to pointerUtils.js 2017-11-09 16:48:52 -08:00
Dante Ruiz
86439eff07 fixing merge conflict 2017-11-09 13:07:55 -08:00
SamGondelman
5a78c9ebfe integrated stylus into pointer system, need to update controller module 2017-11-09 11:59:17 -08:00
Dante Ruiz
0580e23686 fixed edit mode and allow to scroll off tablet 2017-11-01 15:16:02 -07:00
Dante Ruiz
66f07cb21b eslint controller modules 2017-11-01 11:36:36 -07:00
Dante Ruiz
30332c3d00 removing more laserPointers 2017-10-31 14:13:42 -07:00
Brad Davis
befe583c5e Merge remote-tracking branch 'upstream/master' into HEAD 2017-10-24 11:50:07 -07:00
SamGondelman
7686948daf resolve conflicts and cleanup 2017-10-20 15:23:17 -07:00
SamGondelman
fb969964f3 generalized scripting interfaces 2017-10-20 14:37:10 -07:00
Brad Hefta-Gaub
26ea8bea6a Merge pull request #11612 from highfidelity/pointers 
Fix tablet intersection bug and start of Pointer migration work (WIP)
 2017-10-20 13:53:52 -07:00
Melissa Brown
1a3821e984 Merge pull request #11591 from ctrlaltdavid/21568 
Add some Quat and Uuid JavaScript helper properties
 2017-10-18 22:07:06 -07:00
SamGondelman
58172cfbd4 merge from master 2017-10-17 18:05:59 -07:00
David Rowe
8d4e979dc8 Replace usages of AVATAR_SELF_ID previously missed 2017-10-17 16:38:05 +13:00
SamGondelman
429905de51 update scripts to use ignoreItems, fix caching bug 2017-10-16 15:52:17 -07:00
SamGondelman
aee817fbbc scale end sphere in c++ for controller modules 2017-10-16 13:31:25 -07:00
Anthony J. Thibault
0757f513af Merge branch 'master' into feature/ant-man 2017-09-18 11:36:39 -07:00
Seth Alves
39e6605f6f fix grab entity methods + jshint cleanups 2017-09-15 10:50:46 -07:00
Anthony J. Thibault
9a9f4a0d24 Fix controllerModules with appropriate IPD scale changes 2017-09-13 18:23:54 -07:00