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

33501 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
6902f5c54f Merge pull request #6130 from sethalves/grab 
grab script changes
 2015-10-21 09:02:41 -07:00
Andrew Meadows
a6ee1d0edb Merge pull request #6132 from ZappoMan/improveFindEntities 
improved findEntities(sphere) to check against Non-AABBox of entities
 2015-10-20 21:56:22 -07:00
Brad Hefta-Gaub
d34ad2af42 improved findEntities(sphere) to check against Non-AABBox of entities 2015-10-20 21:01:20 -07:00
Seth Alves
f85ef9267b oops 2015-10-20 18:29:27 -07:00
Seth Alves
311254c395 require user-data to have wantsTrigger in it before non-colliding calls will happen 2015-10-20 18:26:12 -07:00
Stephen Birarda
fa69b1cf54 Merge remote-tracking branch 'huffman/baseball' into baseball 2015-10-20 18:11:13 -07:00
Seth Alves
7dcbb5849a another bug 2015-10-20 17:44:12 -07:00
Seth Alves
ed480f651f missed a line 2015-10-20 17:43:31 -07:00
Seth Alves
f16b62df83 - grab script: possible fix for line disappearing 
- grab script: go from 3 pickrays back to 1
- grab script: put "sphere" test back in, but with fixed distance test
 2015-10-20 17:34:35 -07:00
Stephen Birarda
014e62e25a allow assignment client to use AssetClient for ATP downloads 2015-10-20 17:11:37 -07:00
Seth Alves
d0118e80a7 Merge pull request #6129 from imgntn/grab_two_hand_and_debugging 
[Scripts] handControllerGrab.js - add some logic for two-handed situations, add debugging visualization
 2015-10-20 17:04:29 -07:00
Ryan Huffman
c67eafffba Add pitching.js 2015-10-20 16:59:03 -07:00
James B. Pollack
8e1c3c32d1 additions to debug and also to handle some two handed situations 2015-10-20 16:24:17 -07:00
Stephen Birarda
5e3fe081ad Merge remote-tracking branch 'clement/baseball' into baseball 2015-10-20 16:19:13 -07:00
Atlante45
8d4d4a555c Add kinematicGrab option in handControllerGrab.js 2015-10-20 16:00:38 -07:00
Brad Davis
f54fe50c79 Merge pull request #6127 from AndrewMeadows/gitattributes 
gitattributes take 2
 2015-10-20 15:48:44 -07:00
James B. Pollack
fcaad60971 Merge branch 'AndrewMeadows-gitattributes' 2015-10-20 14:43:40 -07:00
Andrew Meadows
d02fe784a9 css and cfg filetypes are text in .gitattributes 2015-10-20 13:58:44 -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
4ff05e8c2a fix lin endings of some JS files 2015-10-20 13:26:19 -07:00
Andrew Meadows
502fb9cca5 adding .gitattributes again 2015-10-20 13:12:16 -07:00
Brad Hefta-Gaub
9717a53b07 Merge pull request #6126 from jherico/marge 
Removing .gitattributes until we can tackle consistent line endings without impacting the team
 2015-10-20 12:48:06 -07:00
Brad Davis
630bad5433 Removing .gitattributes until we can tackle consistent line endings without impacting the team 2015-10-20 12:46:54 -07:00
James B. Pollack
b0ae55ee63 update cat purr header 2015-10-20 11:28:04 -07:00
James B. Pollack
771e5a4f9d add toybox ac scripts, write headers for them, organize 2015-10-20 11:21:09 -07:00
James B. Pollack
af09871bed fix basketball solidity in toybox 2015-10-20 11:08:28 -07:00
Stephen Birarda
de0decb9fd Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-10-20 10:26:29 -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
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
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
Atlante45
1c46f2aa75 Fix autoresizing log spam 2015-10-19 18:22:44 -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