Brad Davis
5cbb2562cd
Move GL utilities out to their own library
2015-10-27 15:53:42 -07:00
howard-stearns
cbade6a095
Do not shut down hydra when it says there are no devices. Count to
...
allowedHydraFailures in settings.
2015-10-26 19:27:22 -07:00
Anthony J. Thibault
485e36d824
Bug fix for hand IK when using the Owen avatar.
...
The IK was assiming that the "Hips" bone index was always 0.
This was not the case for Owen. Now we lookup the Hips index
and cache it for use during the hipsOffset computation.
2015-10-26 17:17:46 -07:00
Brad Hefta-Gaub
ea917f85f4
added ability to set keyhole radius on EntityViewer
2015-10-22 12:56:45 -07:00
samcake
b2461a8e4e
Merge branch 'master' of https://github.com/highfidelity/hifi into color
2015-10-22 12:06:20 -07:00
samcake
a44ac4cbfd
Fiing the dark colors for surfaces without texture
2015-10-22 11:40:56 -07:00
Stephen Birarda
a8d591166e
Merge branch 'master' of https://github.com/highfidelity/hifi into qt-5.5
2015-10-22 11:13:28 -07:00
Stephen Birarda
695f0a75b0
fixes for builds with qt 5.5
2015-10-22 11:12:51 -07:00
Brad Hefta-Gaub
856af8c764
fix EntityItemID dependency
2015-10-21 14:33:12 -07:00
Brad Hefta-Gaub
246e46b69a
implement improvement in sphere test
2015-10-21 10:46:50 -07:00
Brad Hefta-Gaub
954afe45d3
Merge pull request #6112 from ericrius1/rayPickAdditions
...
Moved whitelist and raypicking code out of octree, fixed small bug with polylines
2015-10-21 09:08:56 -07:00
Brad Hefta-Gaub
d34ad2af42
improved findEntities(sphere) to check against Non-AABBox of entities
2015-10-20 21:01:20 -07:00
Stephen Birarda
14aab4871d
Merge pull request #6119 from Atlante45/baseball
...
Fix autoresizing log spam
2015-10-20 13:45:50 -07:00
Andrew Meadows
7fa069cf30
fix line endings grumble gruble
2015-10-20 09:38:25 -07:00
ericrius1
0373a481f8
Using EntityItemIDs instead of QUuids
2015-10-20 09:22:16 -07:00
Andrew Meadows
341bc3666f
Merge pull request #6093 from sethalves/hold-action-changes
...
Hold action changes
2015-10-20 09:19:48 -07:00
Philip Rosedale
282485d412
Merge pull request #6116 from AndrewMeadows/reduced-hips-shift-from-hand-targets
...
hack to reduce hand influence of hips in HMD mode
2015-10-19 22:31:50 -07:00
Atlante45
1c46f2aa75
Fix autoresizing log spam
2015-10-19 18:22:44 -07:00
samcake
b977a094d3
Merge pull request #6115 from ZappoMan/fixLOD
...
fix model LOD behavior
2015-10-19 16:16:48 -07:00
Seth Alves
bddbe89c86
don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action
2015-10-19 16:13:53 -07:00
Seth Alves
9e24542c0b
don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action
2015-10-19 16:05:56 -07:00
Seth Alves
00594f0cce
don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action
2015-10-19 16:05:10 -07:00
Andrew Meadows
97b41957f7
Merge pull request #6113 from hyperlogic/tony/blender-fbx-fix
...
Joint rotation fix for FBX files exported from Blender.
2015-10-19 15:59:51 -07:00
Seth Alves
a1cfebc173
don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action
2015-10-19 15:57:15 -07:00
Brad Hefta-Gaub
0b2bf8bda8
remove some dead code
2015-10-19 15:23:45 -07:00
Brad Hefta-Gaub
110adc5c22
fix model LOD behavior
2015-10-19 15:21:25 -07:00
Andrew Meadows
917bfbf64e
hack to reduce hand influence of hips in HMD mode
2015-10-19 15:19:32 -07:00
Seth Alves
6f30a3c178
new method -- ObjectMotionState::getBodyLinearVelocityGTSigma
2015-10-19 13:56:30 -07:00
Anthony J. Thibault
62c89eaf7d
Joint rotation fix for FBX files exported from Blender.
...
This isn't a great fix. But it will at least allow people to export avatars from Blender.
2015-10-19 13:49:13 -07:00
ericrius1
dcb37ccd73
Removed whitelist and raypicking code from octree, fixed a small bug with polylines
2015-10-19 13:14:19 -07:00
Seth Alves
113321184d
if model RegistrationPoint doesn't match entityItem's, update it
2015-10-19 12:21:26 -07:00
Seth Alves
ac99005602
reverting a change to try to see sticking problem again
2015-10-19 12:13:08 -07:00
Seth Alves
f96e9eb1e8
fuck you, const!
2015-10-19 12:04:55 -07:00
ericrius1
8c229d88a8
moving whitelist code out of octree
2015-10-19 11:59:44 -07:00
Seth Alves
46e5bf0435
take entity-server clock-skew into account when handling action expiration times
2015-10-19 11:59:03 -07:00
Seth Alves
5c031a38c7
try another way of fixing held object snagging at slow velocity
2015-10-19 10:29:30 -07:00
Seth Alves
c5a5f26e6a
try another way of fixing held object snagging at slow velocity
2015-10-19 10:27:35 -07:00
Seth Alves
2bdcb256d8
try another way of fixing held object snagging at slow velocity
2015-10-19 10:26:37 -07:00
Seth Alves
26dcaeb056
try another way of fixing held object snagging at slow velocity
2015-10-19 10:10:43 -07:00
Seth Alves
fbe3cb9511
try another way of fixing held object snagging at slow velocity
2015-10-19 09:56:51 -07:00
Seth Alves
742e48b0c8
try another way of fixing held object snagging at slow velocity
2015-10-19 09:48:34 -07:00
Brad Hefta-Gaub
bddb0e1e7b
ifdef out buggy texture map code
2015-10-19 09:43:08 -07:00
Brad Davis
282cdadf63
Fixing line endings
2015-10-18 22:55:14 -07:00
Seth Alves
1f3b92577d
update _model's location anytime it doesn't match the entity's location
2015-10-17 20:08:25 -07:00
Seth Alves
353f92f1ba
Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes
2015-10-17 13:09:52 -07:00
Atlante45
1da68e0214
Fix particle bug by having lifetimes increase
2015-10-16 18:11:22 -07:00
David Rowe
8c22db17cc
Fix reading of QVector<float> from models files - polyline strokeWidths
2015-10-16 15:43:23 -07:00
Seth Alves
937959c1c1
cleanups
2015-10-16 09:57:27 -07:00
Seth Alves
d2b7e5c4eb
Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes
2015-10-16 09:54:26 -07:00
Seth Alves
8338491c3b
Merge pull request #6095 from Atlante45/master
...
Fix export bug
2015-10-16 07:32:56 -07:00
