Brad Davis
|
630bad5433
|
Removing .gitattributes until we can tackle consistent line endings without impacting the team
|
2015-10-20 12:46:54 -07:00 |
|
Brad Hefta-Gaub
|
ea297166d8
|
Merge pull request #6123 from AndrewMeadows/fix-line-endings
fix line endings in files that have mixed DOS/unix endings
|
2015-10-20 10:12:10 -07:00 |
|
Andrew Meadows
|
7fa069cf30
|
fix line endings grumble gruble
|
2015-10-20 09:38:25 -07:00 |
|
Seth Alves
|
d64034c015
|
Merge pull request #6122 from ZappoMan/fixLaserLifetime
fix laser lifetimes
|
2015-10-20 09:33:06 -07:00 |
|
Brad Hefta-Gaub
|
dfe3e5b1cb
|
fix laser lifetimes
|
2015-10-20 09:30:27 -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 |
|
Brad Hefta-Gaub
|
f68d897104
|
Merge pull request #6120 from jherico/marge
Fixing a bug in the gitattributes file
|
2015-10-19 20:16:23 -07:00 |
|
Brad Davis
|
380b10ab8d
|
Fixing a bug in the gitattributes file
|
2015-10-19 19:32:27 -07:00 |
|
Clément Brisset
|
62923beef1
|
Merge pull request #6118 from ZappoMan/fixWarningsInMaster
fix warning in master
|
2015-10-19 18:23:30 -07:00 |
|
Brad Hefta-Gaub
|
9f17f10d6a
|
fix warning in master
|
2015-10-19 17:56:38 -07:00 |
|
Seth Alves
|
4feb9dc8c6
|
prepare for possible future coding standard
|
2015-10-19 17:46:34 -07:00 |
|
Seth Alves
|
41f7ef1e2e
|
cleanups
|
2015-10-19 16:53:27 -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
|
2b24ef2c83
|
Merge pull request #6114 from Atlante45/vhacd_fix
Fix vhacd for models with quads
|
2015-10-19 16:11:28 -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 |
|
Seth Alves
|
6138775270
|
put back support for spatialKey
|
2015-10-19 15:40:14 -07:00 |
|
Brad Hefta-Gaub
|
0b2bf8bda8
|
remove some dead code
|
2015-10-19 15:23:45 -07:00 |
|
Atlante45
|
47d8afa6a8
|
Fix vhacd for models with quads
|
2015-10-19 15:22:10 -07:00 |
|
Brad Hefta-Gaub
|
110adc5c22
|
fix model LOD behavior
|
2015-10-19 15:21:25 -07:00 |
|
Seth Alves
|
5a968e3c96
|
tweak
|
2015-10-19 15:20:04 -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
|
8fbf081223
|
git rid of sphere test
|
2015-10-19 14:51:18 -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 |
|
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 |
|
samcake
|
2cd6d7c8a5
|
Merge pull request #6110 from ZappoMan/textureMapHack
ifdef out buggy texture map code
|
2015-10-19 12:09:37 -07:00 |
|
Seth Alves
|
f96e9eb1e8
|
fuck you, const!
|
2015-10-19 12:04:55 -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 Hefta-Gaub
|
c04cdc4964
|
Merge pull request #6109 from jherico/marge
Fixing line endings and adding git attribute files
|
2015-10-19 08:33:02 -07:00 |
|
Brad Davis
|
282cdadf63
|
Fixing line endings
|
2015-10-18 22:55:14 -07:00 |
|
Brad Davis
|
82c041d06a
|
Adding git attributes file
|
2015-10-18 22:54:04 -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 |
|
Brad Hefta-Gaub
|
4289d54bd9
|
Merge pull request #6102 from Atlante45/master
Fix particle bug by having lifetimes increase
|
2015-10-17 12:21:47 -07:00 |
|
Ryan Huffman
|
29a29d997d
|
Merge pull request #6100 from imgntn/edit_better
[Scripts] Edit.js - Add color bars below XYZ inputs to indicate world axis
|
2015-10-16 22:17:37 -07:00 |
|
Atlante45
|
1da68e0214
|
Fix particle bug by having lifetimes increase
|
2015-10-16 18:11:22 -07:00 |
|
Eric Levin
|
6738455a5a
|
Merge pull request #6099 from ctrlaltdavid/20709
QA for 20709 - Fix reading of QVector<float> from models files - polyline strokeWidths
|
2015-10-16 17:12:18 -07:00 |
|