Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 11:29:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33610 commits 25 branches 0 tags 1.1 GiB
Commit graph

33610 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
0068af4cb6 fix several warnings 2015-10-19 17:31:42 -07:00
Brad Hefta-Gaub
7669f9ed2c fix several warnings 2015-10-19 17:26:57 -07:00
Seth Alves
41f7ef1e2e cleanups 2015-10-19 16:53:27 -07:00
Brad Hefta-Gaub
56f625d376 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-19 16:53:25 -07:00
Brad Davis
5a0bb4c31b Fixing line endings 2015-10-19 16:51:31 -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
Brad Davis
052ad1236c Merge pull request #6111 from samcake/controllers 
Avoid to create a route when the source is not defined
 2015-10-19 13:15:24 -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
samcake
3d8b7f9d10 Avoid to create a route when the source is not defined 2015-10-19 12:56:06 -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
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
samcake
9ae1da371e Merge pull request #6108 from jherico/controllers 
Controllers Branch - Breaking up UserInputMapper, restoring some mappings
 2015-10-19 11:16:13 -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
Brad Davis
22602fb6f6 Fixing line endings 2015-10-19 10:00:16 -07:00
Brad Davis
edd2ce27f8 Merge remote-tracking branch 'upstream/controllers' into controllers 2015-10-19 09:59:37 -07:00
Brad Davis
1de811c754 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-19 09:59:03 -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
Brad Davis
a8e707ced2 Correcting update order to fix mouse 2015-10-18 22:46:14 -07:00
Brad Davis
184303d3c9 Using JS mappings for joystick, updating test code 2015-10-18 20:44:32 -07:00
Brad Davis
734a39f962 Breaking up UserInputMapper, restoring some mappings 2015-10-18 18:58:03 -07:00
Brad Hefta-Gaub
a75316f27b Merge pull request #6107 from jherico/controllers 
Move controller test to app
 2015-10-18 14:42:32 -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
Brad Davis
57be59935d Move controller test to app 2015-10-17 19:13:38 -07:00