James Pollack
7ce086396c
Merge branch 'master' into ericrius1-toybox
2015-09-28 15:31:03 -07:00
James Pollack
68a1c4927e
Merge remote-tracking branch 'upstream/master'
2015-09-28 15:30:14 -07:00
James Pollack
65031d8788
Merge branch 'toybox' of https://github.com/ericrius1/hifi into ericrius1-toybox
2015-09-28 15:25:17 -07:00
Ryan Huffman
cf6f77425f
Merge pull request #5915 from birarda/test-3.3
...
fix for polyvox external CMakeLists in CMake 3.3.2
2015-09-28 15:04:59 -07:00
Howard Stearns
e6b9cbacf7
Merge pull request #5910 from hyperlogic/tony/small-anim-debug-improvements
...
Fix for Head when switching between HMD and Desktop mode
2015-09-28 14:13:03 -07:00
Brad Hefta-Gaub
ae73a7e97f
Merge pull request #5904 from imgntn/grab_updates_1
...
[Scripts] Add ability for entities to declare themselves ungrabbable
2015-09-28 12:55:51 -07:00
samcake
e032ed4811
Merge pull request #5917 from jherico/lisa
...
Fix for bad textures when using _glActiveBindTexture
2015-09-28 12:41:48 -07:00
Brad Davis
203c601e95
Fix for bad textures when using _glActiveBindTexture
2015-09-28 12:26:11 -07:00
Stephen Birarda
2976520061
remove an extra debug in root CMake
2015-09-28 14:53:53 -04:00
Stephen Birarda
386df86fd1
use the OS X version as the desired SDK
2015-09-28 14:52:17 -04:00
Stephen Birarda
3744632122
allow SDK fallback if 10.9 not present
2015-09-28 14:37:59 -04:00
Stephen Birarda
06ca4dfbde
fix polyvox double name change command
2015-09-28 14:26:53 -04:00
Anthony J. Thibault
a495a45ed0
unset "lean" when headParams.enableLean is false
...
Also added AnimVariantMap::dump() which will print out all the
currently set anim vars and their values.
2015-09-28 11:10:22 -07:00
ericrius1
45281f8aae
modified spraypaint can to spray out particles but no paint
2015-09-28 10:34:03 -07:00
ericrius1
660490d754
removed magBalls
2015-09-28 10:29:12 -07:00
James B. Pollack
affb0253db
Update handControllerGrab.js
...
added a semicolon to the end of a return statement
2015-09-28 10:26:52 -07:00
James B. Pollack
2d477ad3b9
Merge pull request #5908 from highfidelity/imgntn-patch-1
...
[Scripts] Update collectHifiStats.js
2015-09-28 10:21:53 -07:00
Philip Rosedale
0b450e0bee
Merge pull request #5905 from thoys/20694
...
CR for Job #20694 - Add audio packet loss to the stats collection capability
2015-09-28 10:20:15 -07:00
ericrius1
1b096d1573
Merge branch 'master' into toybox
2015-09-28 09:31:49 -07:00
ericrius1
bab3c6fcf2
adjust lastFrame
2015-09-28 09:31:11 -07:00
Anthony J. Thibault
c970ff0c0c
Reset joint priorities back to 0 for new animation system.
...
Added Rig::clearJointStatePriorities() to do this.
2015-09-27 18:25:28 -07:00
Anthony J. Thibault
4b31d87bf5
renamed magic constant to FRAMES_PER_SECOND.
2015-09-27 17:52:53 -07:00
Anthony J. Thibault
5a24a020ca
Fix for HMD rotation sticking between 2d & HMD mode
...
The main fix for this was to set the JointState animation priority to 3.0
The secondary fix was only noticed when we changed the animation priority
Basically, the debugRendering was using the JointStates after they were
manipulated by SkeletonModel to 'relax' them toward thier default pose for
IK purposes.
2015-09-27 17:44:54 -07:00
Anthony J. Thibault
a2562c92f4
Small changes to Anim System for Debugging
...
* Added constant for Rig animation fade time
* Added index output for AnimSkeleton::dump()
2015-09-27 16:24:55 -07:00
James B. Pollack
a49c4756dd
Merge remote-tracking branch 'highfidelity/master'
2015-09-26 11:10:45 -07:00
James B. Pollack
ad42b4da51
Merge branch 'master' of https://github.com/imgntn/hifi
2015-09-26 11:09:55 -07:00
James B. Pollack
b254353b38
Update collectHifiStats.js
...
Clears the current batch after we send it to the endpoint.
2015-09-26 07:09:41 -07:00
Thijs Wenker
14fc39ffa3
Added JS access to the variables
...
Stats.audioPacketlossUpstream
Stats.audioPacketlossDownstream
Which contain a floating point with the value between 0.0f and 1.0f which is the percentage of packet loss.
2015-09-26 02:36:01 +02:00
ericrius1
bcd2171491
updated chair model
2015-09-25 16:28:12 -07:00
ericrius1
534cffcf85
fixed animation bug with doll
2015-09-25 16:23:35 -07:00
Howard Stearns
a820682816
Merge pull request #5901 from hyperlogic/tony/gangsta-lean
...
Threshold based walking/leaning while in HMD.
2015-09-25 15:51:39 -07:00
Howard Stearns
9e001f0b4b
Merge pull request #5903 from AndrewMeadows/ik-repairs-006
...
enforce target rotation during IK calculations
2015-09-25 15:50:59 -07:00
ericrius1
e94d9b39fd
made pots and chair not grabbable
2015-09-25 15:42:13 -07:00
James B. Pollack
a6c3a601ae
Merge pull request #5896 from thoys/20672
...
Worklist job #20672 - Create a script to record a users stats
2015-09-25 15:30:55 -07:00
James Pollack
1f7914766c
Add ability to prevent an object from being grabbable by specifying a custom key grabbableKey to grabbable:false
2015-09-25 15:26:29 -07:00
Andrew Meadows
a97f556958
enforce IK target rotation
2015-09-25 15:13:57 -07:00
Thijs Wenker
5fc053cf97
Merge pull request #1 from imgntn/thoys-20672
...
Update stat collection to occur in batches
2015-09-26 00:04:25 +02:00
James Pollack
2c0c2a0979
Merge remote-tracking branch 'upstream/master' into thoys-20672
2015-09-25 14:49:31 -07:00
Anthony J. Thibault
402573dbf1
Remove unused local
2015-09-25 14:11:33 -07:00
ericrius1
c53ad3c534
combined arm chair
2015-09-25 12:34:35 -07:00
James Pollack
9626bed8ca
Merge remote-tracking branch 'upstream/master'
2015-09-25 12:24:39 -07:00
ericrius1
f5e44675bb
removed start and end frame
2015-09-25 12:11:22 -07:00
Thijs Wenker
9ed1397a63
Merge branch 'master' of https://github.com/worklist/hifi into 20672
2015-09-25 21:09:38 +02:00
ericrius1
65169da64d
removed old doll script
2015-09-25 11:58:05 -07:00
ericrius1
9227676275
Merge branch 'master' into toybox
2015-09-25 11:50:34 -07:00
ericrius1
ccc6a343fc
updated lights to use newly named grab events
2015-09-25 11:49:51 -07:00
ericrius1
7789d8b3a8
fixed potted plant bug
2015-09-25 11:37:04 -07:00
Anthony J. Thibault
fc9b270951
Merge branch 'master' into tony/gangsta-lean
2015-09-25 11:36:58 -07:00
ericrius1
d29c337e95
moved light switches up
2015-09-25 11:32:41 -07:00
ericrius1
a629701362
couch
2015-09-25 11:15:19 -07:00
