Seth Alves
d554eb8db9
avatar collisions are off during a grab
2015-09-29 15:09:25 -07:00
Seth Alves
b1a133e55c
working on disabling avatar collisions during grab
2015-09-29 14:38:47 -07:00
Brad Hefta-Gaub
07515ce710
Merge pull request #5918 from PhilipRosedale/master
...
Throw held objects with velocity from fingertip
2015-09-29 14:37:44 -07:00
unknown
006650f23b
Fix for PR comments
2015-09-29 14:34:23 -07:00
James B. Pollack
bbc32cdd1e
Merge pull request #5937 from ericrius1/grabFix
...
releaseGrab event now triggered for non physical entities
2015-09-29 14:25:59 -07:00
Brad Hefta-Gaub
00c32fc7cd
Merge pull request #5924 from jherico/marge
...
Support for accessing IPD in scripts
2015-09-29 14:24:53 -07:00
Seth Alves
8c98ab9eb6
Merge pull request #5933 from howard-stearns/quiet-other-default-avatars
...
Quiet once/second logging/updating of other people's default avatars.
2015-09-29 14:24:18 -07:00
Brad Davis
9b13aac37d
PR comments
2015-09-29 14:23:56 -07:00
ericrius1
644687f330
releaseGrab event now triggered for non physical entities
2015-09-29 14:04:03 -07:00
Seth Alves
e9dd165b1d
try calling updateMotionBehaviorFromMenu
2015-09-29 14:00:22 -07:00
Seth Alves
f7b34f63c1
try calling updateMotionBehaviorFromMenu
2015-09-29 13:40:54 -07:00
Seth Alves
49da3c5034
disable avatar collisions while holding something
2015-09-29 13:24:03 -07:00
James B. Pollack
3bbc809710
Merge pull request #5930 from ericrius1/grabFix
...
Setting hand data for close grab of non physical objects
2015-09-29 13:17:21 -07:00
Howard Stearns
96e3c722ed
Quiet once/second logging/updating of other people's default avatars.
2015-09-29 13:04:59 -07:00
ericrius1
06194b6088
fixed formatting
2015-09-29 12:51:01 -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
ericrius1
35e4ec17ea
add which hand for near grab of non physical objects
2015-09-29 10:35:38 -07:00
ericrius1
4a64245ae5
Merge branch 'master' of https://github.com/ericrius1/hifi
2015-09-29 10:33:11 -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
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
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
