Commit graph

53 commits

Author SHA1 Message Date
Dante Ruiz
4b7e2cb331 made requested changes 2018-03-30 15:15:17 -07:00
Dante Ruiz
c99676b510 atlernate fix for selected entities 2018-03-30 13:44:54 -07:00
SamGondelman
fba06a74aa fix laser and stylus deadspot 2017-12-11 15:51:22 -08:00
SamGondelman
7eb22b372f merge with master 2017-11-15 14:35:30 -08:00
SamGondelman
2fb1981c4a merge with master 2017-11-13 14:34:39 -08:00
luiscuenca
7dfdc8da59 Redesign and clean of unused lineWidths 2017-11-09 17:50:38 -07:00
luiscuenca
536bf6f81d Corrections 2017-11-07 18:34:33 -07:00
luiscuenca
ee3900be4f Corrections 2017-11-07 18:26:41 -07:00
Luis Cuenca
6fb47eef85
Merge branch 'master' into case7587 2017-11-07 17:19:39 -07:00
luiscuenca
332cb48a41 Lasers and teleport scale with avatar 2017-11-07 16:57:55 -07:00
Dante Ruiz
067ed2ffe0 apply coding standard 2017-11-06 16:09:31 -08:00
Dante Ruiz
646e5455ac forgot to remove unused variable 2017-11-06 16:05:44 -08:00
Dante Ruiz
41c6261b74 LaserPointer: made _objectLockEnd into a struct 2017-11-06 16:04:33 -08:00
Dante Ruiz
3b15897b12 fixed farGrab parent grabbing and laser LockEndUUID 2017-11-06 15:21:20 -08:00
SamGondelman
f970eb2302 merge with pointers branch 2017-11-06 14:49:50 -08:00
Dante Ruiz
539cf35f30 saving work 2017-11-03 17:14:27 -07:00
Brad Davis
f061b9c2da Add stylus functionality to pointer manager 2017-11-01 11:27:57 -07:00
SamGondelman
3c779f1528 HUD events WIP, fix entity/overlay hover, no hover for empty renderState 2017-10-31 14:42:31 -07:00
SamGondelman
e9a5acda06 control hovering, preset buttons for clicking, constness, scroll off
surface
2017-10-30 10:28:43 -07:00
SamGondelman
7951826e49 more advanced laser focusing 2017-10-26 16:10:27 -07:00
SamGondelman
cf34fe3345 laserpointers generate pointerevents 2017-10-26 12:01:09 -07:00
SamGondelman
7686948daf resolve conflicts and cleanup 2017-10-20 15:23:17 -07:00
SamGondelman
24ce09f914 generalized pointer, laserpointermanager -> pointermanager 2017-10-20 11:28:48 -07:00
SamGondelman
3572f7f5db non-templated pickresult wip 2017-10-19 13:41:16 -07:00
SamGondelman
58172cfbd4 merge from master 2017-10-17 18:05:59 -07:00
Bradley Austin Davis
3f99e70af0 C++ cleanup for pointers / picking 2017-10-16 14:20:31 -07:00
SamGondelman
aee817fbbc scale end sphere in c++ for controller modules 2017-10-16 13:31:25 -07:00
SamGondelman
6b02cbb911 move locking inside laserpointer and raypick 2017-10-05 13:17:57 -07:00
SamGondelman
97b09d680c fix and improve laser pointer locking 2017-10-02 13:17:53 -07:00
SamGondelman
0e3f1c5149 add setLaserLength, setLockEndUUID doesn't use defaultRenderStates 2017-09-22 16:11:24 -07:00
SamGondelman
cbe621f2b7 add searchRay to RayPickResult, fix precision picking caching with multiple lasers, make laser addition/removal immediate 2017-09-22 15:15:15 -07:00
SamGondelman
a904ae1a8a can set precision picking on lasers/raypicks, EntityTreeRender uses ray pick API 2017-08-22 11:41:20 -07:00
SamGondelman
9bb7e66859 separate raypickscriptinginterface, cleanup 2017-08-15 13:36:41 -07:00
SamGondelman
d0d5ac8dd1 switch to stl wherever possible, use bitset instead of unsigned ints 2017-08-10 15:33:55 -07:00
SamGondelman
684001a756 workaround deadlock in editRenderState 2017-08-08 11:11:19 -07:00
SamGondelman
6d253fcc5f cleaning up 2017-08-07 18:37:55 -07:00
SamGondelman
8b1c24e636 added setLockEndUUID, update handControllerGrab and grab 2017-08-04 18:26:11 -07:00
SamGondelman
5e4a83dad9 defaultRenderStates, handControllerGrab.js, fix teleport.js a little 2017-07-26 17:58:39 -07:00
SamGondelman
3a8ad8b631 switch to QUuids 2017-07-25 15:11:44 -07:00
SamGondelman
ee02a0bff4 fix build error 2017-07-24 12:44:54 -07:00
SamGondelman
c7f0f03fce expanded RayPick JS API 2017-07-20 13:53:39 -07:00
SamGondelman
d156680bc8 ignore/include by ID, simplified caching logic 2017-07-20 12:15:06 -07:00
SamGondelman
bf243d6025 lockEnd, editRenderState, and updated grab.js 2017-07-19 17:45:21 -07:00
SamGondelman
912b417dd4 mouse ray pick 2017-07-19 13:56:18 -07:00
SamGondelman
55a025b827 initial code review 2017-07-18 12:43:34 -07:00
SamGondelman
0c8c6ff5d6 silly me 2017-07-17 15:05:31 -07:00
SamGondelman
7084a0607a fix warnings 2017-07-17 14:26:22 -07:00
SamGondelman
ae99be0350 added faceAvatar and centerEndY, working on updating teleport.js, style fixes 2017-07-17 13:07:42 -07:00
SamGondelman
af12b5a4bf can create static laser pointers, fixed a bug with multiple render states 2017-07-14 18:35:27 -07:00
SamGondelman
8f533636f5 c++ side laserpointer rendering with renderstates 2017-07-14 11:13:40 -07:00