SamGondelman
|
0117950546
|
can edit drawHUDLayer property
|
2017-07-25 12:57:52 -07:00 |
|
SamGondelman
|
3149c3e16c
|
warnings
|
2017-07-25 10:16:50 -07:00 |
|
SamGondelman
|
3c8b964cc9
|
replace setHandLasers with drawHUDLayer overlay property
|
2017-07-24 18:16:40 -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
|
c6b3f69db0
|
teleport third eye laser on invalid hand pose
|
2017-07-19 11:51:31 -07:00 |
|
SamGondelman
|
55a025b827
|
initial code review
|
2017-07-18 12:43:34 -07:00 |
|
SamGondelman
|
298faa9f0f
|
threading pass
|
2017-07-18 12:13:16 -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 |
|
SamGondelman
|
6f970fd7a0
|
Merge remote-tracking branch 'upstream/master' into sharks
|
2017-07-14 09:37:11 -07:00 |
|
SamGondelman
|
3c719b26b1
|
working on renderstates
|
2017-07-13 17:43:44 -07:00 |
|
SamGondelman
|
3a35cd128f
|
fix dirOffset, expose intersection type to JS
|
2017-07-13 16:09:21 -07:00 |
|
SamGondelman
|
783750a0bc
|
update jointraypicks from joints, dirOffset needs work
|
2017-07-13 14:47:24 -07:00 |
|
Howard Stearns
|
17fcfad957
|
Merge pull request #10875 from highfidelity/spectator-camera
Spectator Camera
|
2017-07-13 13:57:18 -07:00 |
|
Seth Alves
|
59d88cb564
|
Merge pull request #10941 from sethalves/audio-injector-smart-pointers
Audio injector smart pointers
|
2017-07-13 11:00:02 -07:00 |
|
David Kelly
|
60751f07bd
|
Merge pull request #10961 from davidkelly/dk/hmdPreviewFix
hmd preview fix
|
2017-07-13 10:32:33 -07:00 |
|
Brad Hefta-Gaub
|
b063c2f45d
|
Merge pull request #10942 from AndrewMeadows/cleanup-entity-transmission
Cleanup OctreeSendThread::packetDistributor()
|
2017-07-13 09:58:28 -07:00 |
|
SamGondelman
|
916a99c670
|
added JS/C++ RayPickResult, working on RayPickManager::update
|
2017-07-12 17:12:25 -07:00 |
|
David Kelly
|
4b3cf5ee2e
|
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreviewFix
|
2017-07-12 16:50:51 -07:00 |
|
David Kelly
|
88a449c1af
|
Fixes hmd preview when resizing
|
2017-07-12 16:49:26 -07:00 |
|
Zach Fox
|
dc1b4b5324
|
New icons
|
2017-07-12 16:48:04 -07:00 |
|
SamGondelman
|
ea65a04f28
|
expose RayPickMask to JS, move everything to interface/src/raypick to prevent dependency issues, start working on RayPickManager::update (needs testing)
|
2017-07-12 14:20:39 -07:00 |
|
SamGondelman
|
3ac369d782
|
framework for LaserPointers and abstracted RayPicking on C++ side, including JS API
|
2017-07-12 14:20:39 -07:00 |
|
Zach Fox
|
8553277c56
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-07-12 14:18:50 -07:00 |
|
Seth Alves
|
59ad3d50ec
|
Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers
|
2017-07-12 12:45:58 -07:00 |
|
Seth Alves
|
ddf2312dc6
|
code review
|
2017-07-12 12:45:52 -07:00 |
|
Zach Fox
|
bd4fe416b4
|
Cleanup; no magic numbers for default cam params
|
2017-07-12 12:08:36 -07:00 |
|
Zach Fox
|
9fe6fbd811
|
View frustums are strange.
|
2017-07-12 11:37:18 -07:00 |
|
Andrew Meadows
|
364600c447
|
fix rendering of simulation ownership debug icons
|
2017-07-12 11:12:47 -07:00 |
|
Zach Fox
|
79cf242fc9
|
Make far clip plane distance equal to main camera's
|
2017-07-12 10:51:14 -07:00 |
|
Stephen Birarda
|
f6d9a79fb5
|
Revert "Revert "fix for invisible avatars after radius ignore""
|
2017-07-12 10:36:53 -07:00 |
|
Tingjin
|
80916b62bb
|
Remove unnecessary code
Remove two lines of unnecessary code.
|
2017-07-11 20:52:28 -07:00 |
|
Seth Alves
|
c52e7e180a
|
use const AudioInjectorPointer& in some places
|
2017-07-11 19:42:03 -07:00 |
|
Seth Alves
|
dbd46fc4b8
|
Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers
|
2017-07-11 17:48:29 -07:00 |
|
Zach Fox
|
d786820670
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-07-11 16:16:37 -07:00 |
|
Andrew Meadows
|
782155e9ea
|
Merge pull request #10876 from Atlante45/fix/ac-crash
Fix AC crash (buffer overflow)
|
2017-07-11 14:26:08 -07:00 |
|
Seth Alves
|
ead461dca7
|
Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers
|
2017-07-11 14:25:12 -07:00 |
|
Seth Alves
|
3670a04d8e
|
switch bare pointers to AudioInjector objects to be QSharedPointers
|
2017-07-11 14:24:58 -07:00 |
|
Dante Ruiz
|
2f192fd48a
|
added scroll fix for qt 5.6
|
2017-07-11 21:19:06 +01:00 |
|
Dante Ruiz
|
01ca192613
|
fixed tablet scrolling
|
2017-07-11 21:16:13 +01:00 |
|
Zach Fox
|
ea62ef165c
|
Fix image container background
|
2017-07-10 16:13:45 -07:00 |
|
Zach Fox
|
4a74522884
|
Ensure tablet button shows up; protections for controller mapping
|
2017-07-10 15:16:16 -07:00 |
|
David Kelly
|
fcf4bfd59a
|
spacing issue
|
2017-07-10 13:25:33 -07:00 |
|