Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 12:51:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33568 commits 75 branches 59 tags 1.2 GiB
Commit graph

13467 commits

Author SHA1 Message Date
Brad Davis
ac2a60befb Adding primary/secondary thumb abstraction 2015-10-21 11:16:51 -07:00
Brad Davis
21a3079a39 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-21 10:05:32 -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 Davis
f0edc302bf Fixing filters creation 2015-10-20 22:06:08 -07:00
Brad Davis
a124d3b433 Moving to InputEndpoint, fixing build problem 2015-10-20 22:00:16 -07:00
Brad Davis
de57c3b4d6 Merge remote-tracking branch 'upstream/controllers' into controllers 
Conflicts:
	libraries/controllers/src/controllers/UserInputMapper.cpp
 2015-10-20 21:59:00 -07:00
Brad Hefta-Gaub
d34ad2af42 improved findEntities(sphere) to check against Non-AABBox of entities 2015-10-20 21:01:20 -07:00
samcake
da26d0dee1 Adding the hand poses channels in the controller mapping files 2015-10-20 18:19:44 -07:00
samcake
e0615309bb Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-20 17:48:38 -07:00
Brad Davis
cd940325c2 Merge remote-tracking branch 'upstream/controllers' into controllers 2015-10-20 17:48:29 -07:00
Brad Davis
0e419e3fbb Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-20 17:47:37 -07:00
samcake
6f7719e9e9 Finally getting the merge to work 2015-10-20 17:44:24 -07:00
samcake
da55011c2a Trying to merge 2015-10-20 16:38:41 -07:00
Brad Davis
eacd6af032 Get conditional routes working 2015-10-20 16:32:00 -07:00
Stephen Birarda
14aab4871d Merge pull request #6119 from Atlante45/baseball 
Fix autoresizing log spam
 2015-10-20 13:45:50 -07:00
Brad Davis
22139931f2 Warning fixes 2015-10-20 10:48:23 -07:00
Brad Davis
bea6fdd890 Working on JSON parsing and cleanup 
Conflicts:
	libraries/controllers/src/controllers/Route.cpp
	libraries/controllers/src/controllers/ScriptingInterface.cpp
	libraries/controllers/src/controllers/StandardController.cpp
	libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
 2015-10-20 10:20:28 -07:00
samcake
16f96715a3 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-20 10:16:08 -07:00
samcake
07aac6b2c7 Merging with upstream 2015-10-20 10:13:47 -07:00
Brad Davis
8d0148a1ca Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-20 10:13:31 -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
samcake
8701d73ee9 DOing the groundwork to pass along the pose 
still not working
 2015-10-19 19:05:37 -07:00
Atlante45
1c46f2aa75 Fix autoresizing log spam 2015-10-19 18:22:44 -07:00
Brad Hefta-Gaub
9acff9497c fix several warnings 2015-10-19 17:34:59 -07:00
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
Brad Hefta-Gaub
56f625d376 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-19 16:53:25 -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
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
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