samcake
2a487a79a3
Getting something done today
2015-09-28 17:24:31 -07:00
Eric Levin
e8e9957846
Merge pull request #5911 from ZappoMan/rayIntersectionWork
...
adding surface normals to ray intersection
2015-09-28 17:21:40 -07:00
ericrius1
3f83d5a99a
Animation playing for doll, but looping
2015-09-28 17:14:35 -07:00
Brad Davis
375d783997
Better fix for texture issues in stereo
2015-09-28 17:13:51 -07:00
ericrius1
d47f938f8d
blocks
2015-09-28 17:05:58 -07:00
ericrius1
afcd59a549
Moved cat to stool
2015-09-28 17:04:03 -07:00
ericrius1
a21530282b
logging frame
2015-09-28 16:56:46 -07:00
ericrius1
5e28462e2a
testing doll animation
2015-09-28 16:51:23 -07:00
unknown
56a0456f70
Adjust force multiplier and timestep
2015-09-28 16:49:55 -07:00
Brad Davis
7b1c04512a
Adding support for accessing IPD in scripts
2015-09-28 16:24:38 -07:00
Seth Alves
89ab1f626f
Merge pull request #5921 from huffman/import-export-fix
...
Import/Export entities fix
2015-09-28 16:21:18 -07:00
Brad Davis
88d48994ed
Disabling glVertexAttribFormat for now because of an issue with instancing
2015-09-28 16:17:56 -07:00
unknown
5c7cf76035
Distance grab works with walking and turning
2015-09-28 16:13:35 -07:00
Brad Hefta-Gaub
32b56a4bf7
fix the slight flicker that's being caused by error in calculating the model inverse matrix
2015-09-28 16:09:57 -07:00
James Pollack
f79414649e
add gravity to fences
2015-09-28 15:57:53 -07:00
Howard Stearns
2e05ede524
Merge pull request #5920 from hyperlogic/tony/oculus-judder-fix
...
Fix for Oculus timewarp judder introduced by 20d784ba39
2015-09-28 15:57:47 -07:00
James Pollack
020950edbb
finish merge
2015-09-28 15:57:25 -07:00
James Pollack
09a53d553a
Add fences to Toybox master script, add gravity to bubble wand
2015-09-28 15:55:25 -07:00
Ryan Huffman
42c33ba699
Fix edit.js import on Windows
...
Forcefully prepend "file:///" to the local file url used for importing
2015-09-28 15:40:37 -07:00
James Pollack
7ce086396c
Merge branch 'master' into ericrius1-toybox
2015-09-28 15:31:03 -07:00
Anthony J. Thibault
c51ce79205
Updated comment on MyAvatar::updateFromHMDSensorMatrix()
2015-09-28 15:30:21 -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
1a9cd59339
Fix ClipboardScriptingInterface to call methods on main app thread
2015-09-28 15:05:48 -07:00
Ryan Huffman
dde1c8b42f
Fix use of EntityTree in import/export operations
...
The EntityTree needs to be references by a shared_ptr somewhere.
The EntityTree does not start with a root element by default, which some
operations rely on to work as expected.
2015-09-28 15:05:48 -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
Anthony J. Thibault
e32eb38c3b
Fix for Oculus timewarp judder introduced by 20d784ba39
...
Moved myAvatar->updateFromHMDSensorMatrix from Application::update
back into Application::paintGL, so it occurs between
displayPlugin->preRender() and displayPlugin->display().
We should render with the most up-to-date camera position as possible,
and sample it at the same frequency as the display rate.
2015-09-28 14:38:03 -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 Davis
e284cbe355
Remove duplicate DeferredBufferWrite.slh
2015-09-28 13:24:47 -07:00
unknown
5fc7965042
Throw held objects with velocity from fingertip
2015-09-28 13:04:58 -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
728a4cb112
Adding the comment to the glActiveBindTexture call
2015-09-28 12:45:39 -07:00
samcake
95ea874d43
Minor fixes to the way the specular color is interpreted
2015-09-28 12:43:15 -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
Brad Hefta-Gaub
3e758f3c6b
fix Triangle::getNormal, add normal display to rayPickExample
2015-09-28 09:05:39 -07:00
Brad Hefta-Gaub
ce3da099f6
normalize the surface normal from the triangle, coding standard fix, update example
2015-09-28 08:30:49 -07:00
Brad Hefta-Gaub
430cbcca7e
first cut at adding surface normals to ray intersection
2015-09-27 21:57:50 -07:00
