Commit graph

28 commits

Author SHA1 Message Date
SamGondelman
7eb22b372f merge with master 2017-11-15 14:35:30 -08:00
luiscuenca
7dfdc8da59 Redesign and clean of unused lineWidths 2017-11-09 17:50:38 -07:00
luiscuenca
332cb48a41 Lasers and teleport scale with avatar 2017-11-07 16:57:55 -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
David Rowe
fc4e440dc4 Update system scripts to use new properties 2017-10-14 08:32:14 +13:00
Zach Fox
0eafdeab14 Fix hover -> unhover overlay behavior 2017-09-22 13:32:11 -07:00
druiz17
c20c5ee2b5 fixed tablet grabbing issue 2017-09-20 14:10:10 -07:00
druiz17
2ce6dcf89d fixing spelling error 2017-09-20 11:45:42 -07:00
druiz17
5d87036f32 make changes requests and slight fixes 2017-09-20 11:41:31 -07:00
druiz17
9c66a25d83 fixing and cleanup tablet inputs 2017-09-19 17:03:53 -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
druiz17
b634292261 fixing some small issues 2017-09-12 10:53:04 -07:00
druiz17
e33012e522 laser on tablet update 2017-09-08 13:30:30 -07:00
druiz17
f0c12e50dd some small bug fixes 2017-09-08 11:50:19 -07:00
druiz17
ef050a09f9 made requested changes and also allow entities/overlays to be grabbed by the grip button 2017-09-07 14:42:46 -07:00
druiz17
2948061904 code cleanup 2017-08-31 22:30:30 -07:00
Dante Ruiz
7cf27c18d3 code cleanup and fix broken features 2017-08-31 18:06:55 -07:00
Dante Ruiz
3960ec7d5a finish main handControllerGrab refactoring 2017-08-30 15:20:03 -07:00
Renamed from scripts/system/controllers/controllerModules/web3DOverlayLaserInput.js (Browse further)