Commit graph

32293 commits

Author SHA1 Message Date
Ken Cooke
4dc2c9a58f Create symbol files on Windows release builds. Added --release to windeployqt.exe, otherwise it gets confused and copies debug DLLs instead of release. 2015-09-29 18:42:52 -07:00
Ryan Downe Karpf
64ad3c9e0e Merge pull request #5931 from ZappoMan/flickeringLightScript
new flickering light script
2015-09-29 12:06:15 -07:00
Brad Hefta-Gaub
3cf7553c2a new flickering light script 2015-09-29 11:51:26 -07:00
samcake
a7e3ec58b9 Merge pull request #5927 from ZappoMan/fixSkybox
fix skybox not always loading when you haven't moved or if the texture is slow in loading
2015-09-29 10:04:49 -07:00
Brad Hefta-Gaub
dccf121cd3 Merge pull request #5928 from jherico/homer
Disabling vertex attrib format due to crashes
2015-09-29 10:01:36 -07:00
Brad Hefta-Gaub
c201ed1b04 Merge pull request #5926 from samcake/calvin
HIghlight issue not solved, but a few fixes along the way
2015-09-29 10:00:30 -07:00
Brad Davis
daf803e8ea Disabling vertex attrib format due to crashes 2015-09-29 09:52:41 -07:00
samcake
73b458c72e Cleaning the normal texture load path 2015-09-29 09:38:01 -07:00
Brad Hefta-Gaub
2040fb4507 fix skybox not always loading when you haven't moved or if the texture is slow in loading 2015-09-29 09:32:34 -07:00
samcake
103e1c76b3 Member initialization respecting the standard 2015-09-29 09:26:29 -07:00
samcake
8a8411c8d1 Merge branch 'master' of https://github.com/highfidelity/hifi into calvin 2015-09-29 09:15:53 -07:00
Brad Hefta-Gaub
8da52e2f17 Merge pull request #5906 from kencooke/audio-src
Algorithmic optimization of new resampler
2015-09-28 20:44:27 -07:00
samcake
833c31a6a6 Merge pull request #5923 from jherico/lisa
Fix broken textures in stereo/HMD
2015-09-28 18:21:08 -07:00
samcake
1e9c19d535 Clean the Material FBX code and how we use the factor components for diffuse and specular 2015-09-28 17:46:48 -07:00
Brad Davis
adee97b95c Merge pull request #5922 from ZappoMan/fixFlicker
fix the slight flicker that's being caused by error in calculating the model inverse matrix
2015-09-28 17:37:32 -07:00
Brad Hefta-Gaub
670df7e443 fix coding standard issue and comment 2015-09-28 17:36:42 -07:00
Brad Hefta-Gaub
bd52b17861 Merge pull request #5914 from jherico/homer
Remove duplicate DeferredBufferWrite.slh
2015-09-28 17:29:33 -07:00
samcake
202d2944ab Merge branch 'master' of https://github.com/highfidelity/hifi into calvin 2015-09-28 17:24:59 -07:00
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
Brad Davis
375d783997 Better fix for texture issues in stereo 2015-09-28 17:13:51 -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
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
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
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
Anthony J. Thibault
c51ce79205 Updated comment on MyAvatar::updateFromHMDSensorMatrix() 2015-09-28 15:30:21 -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
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
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
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
Ken Cooke
aa01dca0a8 Fix compiler warnings 2015-09-27 19:14:31 -07:00