James B. Pollack
|
6e8d505726
|
updates
|
2015-10-23 14:38:17 -07:00 |
|
James B. Pollack
|
63d18acf91
|
bow updates
|
2015-10-23 14:12:56 -07:00 |
|
James B. Pollack
|
ca0aad7d3b
|
update after updating models
|
2015-10-22 17:25:15 -07:00 |
|
James B. Pollack
|
9d49843114
|
Merge branch 'master' into bow
|
2015-10-22 15:52:34 -07:00 |
|
James B. Pollack
|
cd2559f1cc
|
Merge pull request #6153 from ZappoMan/addKeyholeRadiusToEntityViewer
Add Ability to set keyhole radius on EntityViewer
|
2015-10-22 14:06:07 -07:00 |
|
Brad Hefta-Gaub
|
ea917f85f4
|
added ability to set keyhole radius on EntityViewer
|
2015-10-22 12:56:45 -07:00 |
|
Brad Hefta-Gaub
|
4a7f5751f4
|
Merge pull request #6151 from samcake/color
Fix the dark diffuse color for material without texture
|
2015-10-22 12:23:41 -07:00 |
|
samcake
|
b2461a8e4e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into color
|
2015-10-22 12:06:20 -07:00 |
|
Brad Davis
|
0755ba8ba4
|
Merge pull request #6150 from birarda/qt-5.5
final fixes required for successful Qt 5.5.1 build
|
2015-10-22 11:51:15 -07:00 |
|
samcake
|
a44ac4cbfd
|
Fiing the dark colors for surfaces without texture
|
2015-10-22 11:40:56 -07:00 |
|
Stephen Birarda
|
a8d591166e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into qt-5.5
|
2015-10-22 11:13:28 -07:00 |
|
Stephen Birarda
|
695f0a75b0
|
fixes for builds with qt 5.5
|
2015-10-22 11:12:51 -07:00 |
|
samcake
|
613b509ba1
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-10-21 16:40:18 -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
|
b8f0972228
|
move bow into toybox
|
2015-10-21 14:00:51 -07:00 |
|
James B. Pollack
|
4e8c306f66
|
Merge branch 'master' into bow
|
2015-10-21 14:00:19 -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 |
|
James B. Pollack
|
cf10277f2d
|
Merge branch 'master' into bow
|
2015-10-21 13:47:19 -07:00 |
|
James B. Pollack
|
5b417a1ba5
|
use updated hand controller
|
2015-10-21 13:47:17 -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 |
|
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 |
|
James B. Pollack
|
8e1c3c32d1
|
additions to debug and also to handle some two handed situations
|
2015-10-20 16:24:17 -07:00 |
|
James B. Pollack
|
fd0dc3cd49
|
bow and grab
|
2015-10-20 16:22:30 -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
|
d01faad9ed
|
Merge branch 'master' into bow
|
2015-10-20 14:49:55 -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 |
|