Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 12:33:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33636 commits 71 branches 56 tags 1.2 GiB
Commit graph

33636 commits

This branch
This branch
All branches
Author SHA1 Message Date
AlessandroSigna
ae2f7f6ff6 Fix paddleBall.js 2015-10-22 18:50:23 -07:00
Brad Davis
103fe3c545 Merge pull request #6155 from ZappoMan/fixScripts 
fix airGuitar.js
 2015-10-22 18:19:26 -07:00
Brad Davis
79426f8679 Merge pull request #6157 from samcake/controllers 
Controllers: Adding the velocity information to the pose coming from the Hydra
 2015-10-22 18:17:16 -07:00
Brad Hefta-Gaub
978d248c9e Merge pull request #6156 from jherico/controllers 
Minor cleanup and fix for broken conditional strafe
 2015-10-22 18:16:47 -07:00
samcake
3e4bada313 remove uneeded var 2015-10-22 18:03:47 -07:00
samcake
9015e98b70 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-22 16:13:54 -07:00
samcake
0ad4634eac Check that the velocity information is passed correctly and fixed clap.js 2015-10-22 16:13:12 -07:00
Brad Davis
51c8d48c8c Fix broken conditional caused by invalid route ordering 2015-10-22 16:12:31 -07:00
samcake
2db87e0d2d Remove hydramove.js and expose the velocity and angular Velocity for hydra 2015-10-22 15:55:36 -07:00
Brad Davis
a9aea9b477 Working on TestController display 2015-10-22 15:53:19 -07:00
Brad Davis
e40741b5cb Removing overrides / loopback support, adding route debugging 2015-10-22 15:52:10 -07:00
Brad Davis
d1da2f5aab Adding more items to the standard controller abstraction 2015-10-22 15:51:09 -07:00
Brad Davis
8c163a52e9 Attempting to fix log graphs 2015-10-22 15:49:58 -07:00
Brad Davis
471f43899d Moving aliases / bisected versions below main actions 2015-10-22 15:49:27 -07:00
Brad Hefta-Gaub
c826b48c92 fix airGuitar.js 2015-10-22 15:05:59 -07:00
Brad Davis
5227c40298 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-22 12:15:41 -07:00
samcake
2ebf862da9 Merge pull request #6148 from jherico/controllerFunctions 
Fixing controller functions & makeAxis
 2015-10-22 11:56:58 -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
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
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
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
Andrew Meadows
27c6624f0c Merge pull request #6142 from ZappoMan/fixEntityItemDependency 
fix EntityItemID dependency
 2015-10-21 14:57:07 -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
856af8c764 fix EntityItemID dependency 2015-10-21 14:33:12 -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
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
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