samcake
|
2ebf862da9
|
Merge pull request #6148 from jherico/controllerFunctions
Fixing controller functions & makeAxis
|
2015-10-22 11:56:58 -07:00 |
|
Brad Davis
|
7ed9ed8500
|
Merge pull request #6149 from ZappoMan/exposeMyAvatarHandsToJS
make handControllerGrab.js work with new API
|
2015-10-22 11:40:48 -07:00 |
|
Brad Hefta-Gaub
|
67f2a0c6c8
|
CR feedback on mappings
|
2015-10-22 11:39:51 -07:00 |
|
Brad Davis
|
6cf0bdcffe
|
Testing function destination and fixing bug in rule ordering for multi-soure
|
2015-10-22 10:00:11 -07:00 |
|
Brad Davis
|
5d4cbfdacb
|
Resolving ambiguity between functions and inputs differently
|
2015-10-22 09:50:24 -07:00 |
|
Brad Davis
|
4938e5ea84
|
Fixing function based routes, makeAxis
|
2015-10-22 09:50:23 -07:00 |
|
Brad Hefta-Gaub
|
7c746462fa
|
Merge pull request #6147 from jherico/controllers
Controllers Branch - Wiring up step yaw
|
2015-10-22 09:45:55 -07:00 |
|
Brad Hefta-Gaub
|
3e7364608b
|
make handControllerGrab.js work with new API
|
2015-10-22 09:17:29 -07:00 |
|
Brad Davis
|
afcec347ff
|
Wiring yaw action to avatar
|
2015-10-21 21:35:19 -07:00 |
|
Brad Davis
|
044a28212d
|
Wiring step yaw to the avatar
|
2015-10-21 20:44:38 -07:00 |
|
Brad Davis
|
637654adea
|
Wiring up step yaw
|
2015-10-21 18:46:09 -07:00 |
|
Brad Davis
|
81df30d9e5
|
Merge pull request #6146 from ZappoMan/exposeMyAvatarHandsToJS
expose MyAvatar.leftHandPosition and MyAvatar.rightHandPosition to JS
|
2015-10-21 18:05:50 -07:00 |
|
Brad Hefta-Gaub
|
68a2985b7a
|
add tip position as well
|
2015-10-21 17:14:48 -07:00 |
|
Brad Hefta-Gaub
|
a3900a954b
|
expose MyAvatar.leftHandePosition and MyAvatar.rightHandPosition to JS
|
2015-10-21 17:03:54 -07:00 |
|
Brad Hefta-Gaub
|
8772b5dbf2
|
Merge pull request #6143 from jherico/controllers
Controllers Branch - Cleanup of enums and JS names
|
2015-10-21 16:24:30 -07:00 |
|
samcake
|
65a5cef3a7
|
Merge pull request #6144 from ZappoMan/fixLeftRightArms
Fix left right arms
|
2015-10-21 16:23:41 -07:00 |
|
Brad Hefta-Gaub
|
63e6452630
|
fix hydra left right arm flip
|
2015-10-21 16:17:58 -07:00 |
|
Brad Hefta-Gaub
|
9b11b2091f
|
fix hydra left right arm flip
|
2015-10-21 16:17:11 -07:00 |
|
Brad Davis
|
4a1df286fd
|
Cleanup of enums and JS names
|
2015-10-21 15:57:37 -07:00 |
|
Brad Hefta-Gaub
|
60f9b3da85
|
Merge pull request #6141 from jherico/controllers
Working on conditional and filter parsing
|
2015-10-21 15:09:00 -07:00 |
|
Brad Davis
|
8cc7527502
|
Merge pull request #6140 from ZappoMan/poseInJS
expose the Pose structure to JS
|
2015-10-21 14:53:34 -07:00 |
|
Brad Davis
|
b9b03bd842
|
Working on conditional and filter parsing
|
2015-10-21 14:40:33 -07:00 |
|
Brad Hefta-Gaub
|
6bd1e59305
|
fix CR feedback
|
2015-10-21 14:31:44 -07:00 |
|
Brad Hefta-Gaub
|
ffd277d4d5
|
fix EntityItemID dependency
|
2015-10-21 14:31:17 -07:00 |
|
Brad Hefta-Gaub
|
3eedfd369e
|
expose the Pose structure to JS
|
2015-10-21 14:01:18 -07:00 |
|
Brad Hefta-Gaub
|
58e5bff9a1
|
Merge pull request #6138 from jherico/controllers
Prevent crash on connecting gamepad
|
2015-10-21 13:19:09 -07:00 |
|
Brad Hefta-Gaub
|
0aab108729
|
Merge pull request #6139 from samcake/controllers
Controllers : Fixing the pose transmission
|
2015-10-21 13:12:28 -07:00 |
|
samcake
|
feeb4b68a6
|
merging and fixing the POse transmission bug
|
2015-10-21 13:07:35 -07:00 |
|
Brad Davis
|
84e2ace0ea
|
Prevent crash on connecting gamepad
|
2015-10-21 12:57:48 -07:00 |
|
Brad Hefta-Gaub
|
d865eb2e24
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
2015-10-21 12:46:26 -07:00 |
|
Brad Hefta-Gaub
|
e2984017d0
|
Merge pull request #6135 from jherico/controllers
Controllers Branch - Adding primary/secondary thumb abstraction
|
2015-10-21 12:44:52 -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 |
|
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 |
|
Brad Davis
|
ac2a60befb
|
Adding primary/secondary thumb abstraction
|
2015-10-21 11:16:51 -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 |
|
Brad Davis
|
21a3079a39
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
2015-10-21 10:05:32 -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 |
|
Brad Hefta-Gaub
|
5466fa1de8
|
Merge pull request #6128 from jherico/controllers
Controllers Branch - Get conditional routes working
|
2015-10-21 09:00:26 -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 |
|
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 |
|
samcake
|
053aca2e36
|
fixing the cast bug on osx
|
2015-10-20 21:12:46 -07:00 |
|