Anthony J. Thibault
|
a66f31bb20
|
Added AnimBlendLinearMove node
AnimBlendLinearMove is now in use by forward, backward and strafe movements.
Tuned rig moving average speeds to be more sensitive.
|
2015-10-22 16:33:31 -07:00 |
|
Anthony J. Thibault
|
a9ed033b20
|
Merge branch 'master' into tony/anim-sync-blend
|
2015-10-22 11:18:30 -07:00 |
|
Anthony J. Thibault
|
c83af43d0e
|
Added strafe and backward blending
|
2015-10-21 17:34:09 -07:00 |
|
Andrew Meadows
|
27c6624f0c
|
Merge pull request #6142 from ZappoMan/fixEntityItemDependency
fix EntityItemID dependency
|
2015-10-21 14:57:07 -07:00 |
|
Brad Hefta-Gaub
|
856af8c764
|
fix EntityItemID dependency
|
2015-10-21 14:33:12 -07:00 |
|
James B. Pollack
|
03d740914d
|
Merge pull request #6136 from imgntn/cleanup_toybox
[Scripts] Toybox Cleanup & Organization
|
2015-10-21 13:59:13 -07:00 |
|
Brad Hefta-Gaub
|
8f90cdf98c
|
Merge pull request #6137 from sethalves/fix-kinematic-grab
Fix kinematic hold-action transmission
|
2015-10-21 12:44:05 -07:00 |
|
Seth Alves
|
47d48d8cd1
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-kinematic-grab
|
2015-10-21 12:29:35 -07:00 |
|
Seth Alves
|
c0eccca6d3
|
relay 'kinematic' mode of a hold to other interfaces
|
2015-10-21 12:29:26 -07:00 |
|
James B. Pollack
|
b302244a08
|
Merge pull request #6134 from ZappoMan/improveFindEntities
implement improvement in sphere test
|
2015-10-21 12:11:20 -07:00 |
|
James B. Pollack
|
384a6a8154
|
rename /toys to /toybox, remove non toybox scripts, update master refs
|
2015-10-21 11:36:49 -07:00 |
|
Eric Levin
|
970d189262
|
Merge pull request #6125 from imgntn/toybox_ac
[Scripts] Add Toybox AC Scripts, cleanup their headers, organize
|
2015-10-21 11:24:59 -07:00 |
|
James B. Pollack
|
f3181054c9
|
Merge pull request #6133 from ericrius1/grabFixes
Added wantsTrigger to userData for a couple toys to avoid breakage …
|
2015-10-21 11:16:35 -07:00 |
|
James B. Pollack
|
0b06cf1dfb
|
cleanup
|
2015-10-21 10:53:32 -07:00 |
|
James B. Pollack
|
68d43dc576
|
reduce number of toybox sound scripts
|
2015-10-21 10:50:37 -07:00 |
|
Brad Hefta-Gaub
|
246e46b69a
|
implement improvement in sphere test
|
2015-10-21 10:46:50 -07:00 |
|
ericrius1
|
1c5dc0374a
|
Added wantsTrigger to user data for a couple items to avoid breakage with new grab script changes
|
2015-10-21 10:16:31 -07:00 |
|
James B. Pollack
|
80fb12b1a4
|
Merge branch 'master' into toybox_ac
|
2015-10-21 09:58:49 -07:00 |
|
Brad Hefta-Gaub
|
6465bb85dd
|
Merge pull request #6124 from imgntn/bball_fixes
[Scripts] Fix Basketball Solidity in Toybox
|
2015-10-21 09:11:12 -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
|
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 |
|
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 |
|
Anthony J. Thibault
|
41cce4320a
|
Merge branch 'tony/anim-sync-blend' into test
|
2015-10-20 17:39:13 -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 |
|
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 |
|
Anthony J. Thibault
|
5cd2786c1d
|
First pass at Rig timeScaling and blending between slow, walk and run.
|
2015-10-20 16:37:05 -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 |
|
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 |
|
Anthony J. Thibault
|
11f2d29bf8
|
AnimBlendLinear: bugfixes for sync flag added timeScale
|
2015-10-20 10:36:37 -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 |
|