Commit graph

33467 commits

Author SHA1 Message Date
Andrew Meadows
35d2a5b5ea track tipRotation for HmdHead target 2015-10-12 11:39:54 -07:00
Andrew Meadows
5f1068c404 cleanup and optimization of IK loop 2015-10-12 11:39:54 -07:00
Andrew Meadows
6a96d5f0c5 don't bother to create targets with bad types 2015-10-12 11:39:54 -07:00
Andrew Meadows
bc48f70877 move IKTarget into its own files 2015-10-12 11:39:54 -07:00
Andrew Meadows
56f038d5a7 simpler logic for tracking hips offset 2015-10-12 11:39:54 -07:00
Andrew Meadows
03eaa95258 initial hip translation from IK
works for 2D 3rd person but probably not well for HMD
2015-10-12 11:39:54 -07:00
ericrius1
8dddf0e17a Added findRayIntersection, and confirmed judder grew a lot worse 2015-10-12 11:15:04 -07:00
ericrius1
96fd634138 Pre- ray cast 2015-10-12 11:02:47 -07:00
ericrius1
56a2aa101c baseline judder test for whiteboard painting- pre entity ray test 2015-10-12 10:44:18 -07:00
ericrius1
fb4aad1f32 adding whiteboard 2015-10-12 10:11:46 -07:00
Thijs Wenker
a6da91ee35 Fix walk.js script 2015-10-12 19:03:34 +02:00
Thijs Wenker
309b381bab Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX 2015-10-12 18:51:18 +02:00
ericrius1
08a94189b7 explicitly setting isSpotlight to false 2015-10-12 09:31:12 -07:00
ericrius1
ab32470699 Fixed syntax error in hiddenEntityResetScript 2015-10-12 09:12:33 -07:00
Brad Hefta-Gaub
f8956a853b Merge pull request #6051 from jherico/marge
Cleanup CMake files
2015-10-11 16:22:56 -07:00
Brad Davis
8024d9f017 Merge pull request #6055 from ZappoMan/newControllerInterface
implement StandardController and expose it to JS as Controller.Standard.*
2015-10-11 16:10:42 -07:00
Brad Hefta-Gaub
21a473035e more CR feedback 2015-10-11 15:37:17 -07:00
Brad Hefta-Gaub
312bbf6167 CR feedback 2015-10-11 15:15:20 -07:00
Brad Hefta-Gaub
9667a103aa actually add new files 2015-10-11 15:02:11 -07:00
Brad Hefta-Gaub
0986f86c34 implement StandardController and expose it to JS as Controller.Standard.* 2015-10-11 14:55:07 -07:00
Brad Hefta-Gaub
61ab1a1935 Merge pull request #6054 from ZappoMan/fixEdit
temp fix to get editing working again
2015-10-11 14:03:04 -07:00
Brad Hefta-Gaub
e09fe30f05 damn you visual studio 2015-10-11 14:02:33 -07:00
Brad Hefta-Gaub
b5b4c2153a temp fix to get editing working again 2015-10-11 14:00:35 -07:00
Brad Hefta-Gaub
b880855998 Merge pull request #6029 from jherico/homer
Low level support for URL overrides when loading content
2015-10-11 11:34:07 -07:00
Thijs Wenker
7d3b300037 Fix set avatar rotations from scripts (different tread) 2015-10-11 14:51:12 +02:00
Brad Davis
cd1b758534 PR comments 2015-10-11 00:32:31 -07:00
Brad Davis
6f5f6450df Cleanup CMake files 2015-10-11 00:01:03 -07:00
Brad Davis
e5fc2e5525 Low level support for URL overrides when loading content 2015-10-10 23:00:15 -07:00
Thijs Wenker
1906905cb4 Merge branch 'master' of https://github.com/worklist/hifi 2015-10-10 22:54:29 +02:00
Brad Davis
700c11563c Merge pull request #6050 from ZappoMan/newControllerInterface
Expose Controller.Hardware.* constants to JavaScript
2015-10-10 12:43:43 -07:00
Brad Hefta-Gaub
83bf8c8742 Merge branch 'master' of https://github.com/highfidelity/hifi into newControllerInterface 2015-10-10 09:43:07 -07:00
Brad Hefta-Gaub
b7b2c30eaa Merge pull request #6049 from sethalves/less-picky
grab script picks less
2015-10-10 09:41:49 -07:00
Seth Alves
5c95306e8e merge from upstream 2015-10-10 09:34:13 -07:00
Brad Hefta-Gaub
ded677e90f Merge branch 'master' of https://github.com/highfidelity/hifi into newControllerInterface 2015-10-10 09:33:55 -07:00
Brad Hefta-Gaub
25481e0a25 Merge pull request #6038 from Atlante45/asset-drop
Asset file drop
2015-10-10 09:32:58 -07:00
Brad Hefta-Gaub
69d6e5d298 Merge pull request #6046 from sethalves/flip-you-for-real
add a userdata flag to toggle ignoreForCollisions while holding an entity
2015-10-10 09:25:57 -07:00
Brad Hefta-Gaub
63f3156a61 add Controler.Actions 2015-10-09 21:23:19 -07:00
Brad Hefta-Gaub
f55b6115d6 cleanup sanatize name function 2015-10-09 21:11:38 -07:00
Brad Hefta-Gaub
5c5ee8d699 remove debug code 2015-10-09 21:01:44 -07:00
Brad Hefta-Gaub
d3ee9b0f39 more work on exposing device inputs as JavaScript named constants 2015-10-09 20:58:23 -07:00
Brad Hefta-Gaub
e48206f1b5 Merge pull request #6047 from howard-stearns/log-hydra-disconnect
Log when hydra is disconnected.
2015-10-09 20:41:27 -07:00
Seth Alves
7824d03e11 grab script picks 5x per second rather than 60x 2015-10-09 17:56:32 -07:00
Howard Stearns
7ba149fbbd Log when hydra is disconnected. 2015-10-09 16:19:14 -07:00
Brad Hefta-Gaub
37f530f97f first cut at wiring up devices and inputs to JS 2015-10-09 16:15:29 -07:00
Brad Hefta-Gaub
614a47c90d Merge pull request #6044 from Atlante45/json_asset
Fix warnings
2015-10-09 15:46:59 -07:00
Seth Alves
c6c44e8b81 add a userdata flag that allows toggling of the ignoreForCollisions entity property when an item is held. 2015-10-09 15:42:30 -07:00
James B. Pollack
139c396879 Merge pull request #6045 from imgntn/fix_reset
[Script] Fix Master Reset Grabbability Regressions
2015-10-09 15:38:11 -07:00
Howard Stearns
ce82ba87d2 Merge pull request #6011 from hyperlogic/tony/hmd-rest-detection
When HMD is at rest, re-center the body under the avatar.
2015-10-09 15:20:07 -07:00
James B. Pollack
4661b49e3d fix regressions introduced by deciding not to call setEntityCustomData 2015-10-09 14:57:24 -07:00
Stephen Birarda
b84109a781 Merge pull request #6040 from huffman/fix-null-node
Fix case where we deref a null pointer in OctreeInboundPacketProcessor
2015-10-09 14:57:16 -07:00