Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 17:47:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
34009 commits 25 branches 0 tags 1.1 GiB
Commit graph

34009 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Howard Stearns
913842ac30 Thread check, for consistency. 2015-10-22 15:31:17 -07:00
Howard Stearns
f0a4e25e89 Name change per comments. 2015-10-22 15:25:14 -07:00
Howard Stearns
ecc920199d Return id suitable for use with remover, per comments. 2015-10-22 15:24:24 -07:00
Howard Stearns
1d0464ede5 Name change and thread checks per comments. 2015-10-22 15:15:10 -07:00
Howard Stearns
759e652506 Thread test per comments. 2015-10-22 15:13:14 -07:00
Brad Hefta-Gaub
c826b48c92 fix airGuitar.js 2015-10-22 15:05:59 -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
Howard Stearns
dbf5072814 Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars 2015-10-22 13:35:30 -07:00
Howard Stearns
624ed7c711 fix comment 2015-10-22 13:14:38 -07:00
Howard Stearns
0d514ad645 Thread-safe avatar list access 2015-10-22 13:02:08 -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
Brad Davis
5227c40298 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-22 12:15:41 -07:00
samcake
b2461a8e4e Merge branch 'master' of https://github.com/highfidelity/hifi into color 2015-10-22 12:06:20 -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
EdgarPironti
09cdc01599 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-22 11:50:45 -07:00
Howard Stearns
30429e8138 Don't use late-breaking results that got reported after the handler was removed. 2015-10-22 11:43:22 -07:00
Howard Stearns
b5ccd49959 Make ubuntu happy. 2015-10-22 11:42:50 -07:00
samcake
a44ac4cbfd Fiing the dark colors for surfaces without texture 2015-10-22 11:40:56 -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
howard-stearns
86c1483862 Merge branch 'expose-anim-vars' of https://github.com/howard-stearns/hifi into expose-anim-vars 2015-10-22 10:52:45 -07:00
howard-stearns
ba948dd5ea Merge branch 'master' into expose-anim-vars 2015-10-22 10:49:36 -07:00
Howard Stearns
a58539be82 Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars 2015-10-22 10:39:54 -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
Howard Stearns
9fd61907f5 Call back to Javascript asynchronously, so that we don't block and the script's engine doesn't have thread conflicts. 2015-10-21 20:50:07 -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
samcake
613b509ba1 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-10-21 16:40:18 -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