Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 03:13:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33758 commits 71 branches 56 tags 1.2 GiB
Commit graph

33758 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
07c13f4d66 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-28 12:54:46 -07:00
samcake
bbc6d9f5e7 Fixing typo and review comments 2015-10-28 12:52:21 -07:00
samcake
b37a6f689a Fixing typo and review comments 2015-10-28 12:51:22 -07:00
Clément Brisset
3be06a576a Merge pull request #6204 from ZappoMan/hardwareChanged 
emit hardwareChanged signal to scripts
 2015-10-28 12:26:09 -07:00
samcake
fc15c7cd98 Adding the ApplicationStateDevice to the APplication class and add one entry ythere 2015-10-28 12:15:14 -07:00
Brad Hefta-Gaub
457ec76d3d CR feedback 2015-10-28 11:21:53 -07:00
Brad Hefta-Gaub
30f7c44f61 emit hardwareChanged signal to scripts 2015-10-28 09:34:18 -07:00
samcake
57aa89d14f Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-28 09:24:24 -07:00
samcake
37f967bc33 And adding the StateCOntroller class 2015-10-28 09:23:57 -07:00
samcake
92ca658aae Trying to get a state controller to work 2015-10-28 09:23:20 -07:00
Brad Davis
45ba0645d0 Merge pull request #6199 from ZappoMan/myAvatarPalmTweaks 
thread safety clean up of use of PalmData
 2015-10-27 17:20:00 -07:00
Brad Hefta-Gaub
65eae35433 a little more cleanup 2015-10-27 17:09:43 -07:00
samcake
b2a5452f87 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-27 16:57:22 -07:00
samcake
6ec87086bc Adding the state controller 2015-10-27 16:57:06 -07:00
Brad Hefta-Gaub
7f313e7f86 Merge branch 'controllers' of https://github.com/highfidelity/hifi into myAvatarPalmTweaks 2015-10-27 16:47:36 -07:00
Brad Hefta-Gaub
8461e48e83 Merge pull request #6201 from jherico/hydraFix 
Fixing hydras
 2015-10-27 16:47:14 -07:00
Brad Hefta-Gaub
d86f1b50a7 more cleanup 2015-10-27 16:37:43 -07:00
Brad Davis
b8f189dea7 Fixing hydras 2015-10-27 16:37:16 -07:00
Brad Hefta-Gaub
19743c1f39 gak, build busters and more CR feedback 2015-10-27 16:16:03 -07:00
Brad Hefta-Gaub
eb19364129 CR feedback 2015-10-27 15:56:27 -07:00
Brad Hefta-Gaub
133d48ebee CR feedback 2015-10-27 15:53:48 -07:00
Brad Hefta-Gaub
7000350317 Merge branch 'controllers' of https://github.com/highfidelity/hifi into myAvatarPalmTweaks 2015-10-27 14:57:35 -07:00
Brad Hefta-Gaub
5a42991e0c first pass at cleaning up MyAvatars use of PalmData 2015-10-27 13:51:42 -07:00
Brad Hefta-Gaub
00d5c8f682 Merge pull request #6197 from EdgarPironti/controllers 
Fixed standard.json
 2015-10-27 12:23:21 -07:00
EdgarPironti
596b315286 Fixed standard.json 2015-10-27 11:35:30 -07:00
samcake
a0104884f5 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-27 09:59:48 -07:00
samcake
87cf3b237b Supporting a InHMD action and using it to enable COmfort mode 2015-10-27 09:59:22 -07:00
Brad Davis
ef2d71e576 Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	libraries/input-plugins/src/input-plugins/SixenseManager.cpp
 2015-10-27 09:41:58 -07:00
Philip Rosedale
bc07de3892 Merge pull request #6194 from howard-stearns/hydra-hack 
Do not shut down hydra when it says there are no devices.
 2015-10-26 22:04:49 -07:00
Brad Hefta-Gaub
c6f0410f4a Merge pull request #6192 from AlessandroSigna/controllers 
fix keyboard mapping (keyboardMouse.js)
 2015-10-26 20:02:45 -07:00
howard-stearns
cbade6a095 Do not shut down hydra when it says there are no devices. Count to 
allowedHydraFailures in settings.
 2015-10-26 19:27:22 -07:00
AlessandroSigna
5bce95189b fix keyboard mapping (keyboardMouse.js) 2015-10-26 18:14:57 -07:00
Howard Stearns
5e66207bc6 Merge pull request #6190 from hyperlogic/tony/owen-ik-fix 
Bug fix for hand IK when using the Owen avatar.
 2015-10-26 17:42:12 -07:00
Anthony J. Thibault
485e36d824 Bug fix for hand IK when using the Owen avatar. 
The IK was assiming that the "Hips" bone index was always 0.
This was not the case for Owen.  Now we lookup the Hips index
and cache it for use during the hipsOffset computation.
 2015-10-26 17:17:46 -07:00
Brad Hefta-Gaub
55d0b8a99e Merge pull request #6181 from jherico/capi 
Remove new/old value division from endpoint::apply
 2015-10-26 14:58:11 -07:00
Brad Hefta-Gaub
9c4199ef16 Merge pull request #6186 from jherico/pingpong 
Fixing spray can script
 2015-10-26 14:56:06 -07:00
Seth Alves
85a975b1f4 Merge pull request #6185 from Atlante45/cmake 
Remove cmake debug code
 2015-10-26 14:54:01 -07:00
Brad Davis
b2c3311947 Merge pull request #6174 from samcake/controllers 
Controllers : Adding a moving average for the velocity field returned by the Hydra controller
 2015-10-26 13:46:32 -07:00
samcake
990764d855 Really fixing the MovingAverage class... 2015-10-26 13:29:13 -07:00
Brad Davis
d91d0a2027 Fixing spray can script 2015-10-26 12:47:31 -07:00
Brad Hefta-Gaub
aaaee30032 Merge pull request #6183 from jherico/pingpong 
Fixing ping-ping entity script
 2015-10-26 12:20:08 -07:00
Atlante45
9bead94fae Remove cmake debug code 2015-10-26 12:07:12 -07:00
Brad Davis
34b5178393 Fixing ping-ping entity script 2015-10-26 11:55:23 -07:00
samcake
a8872d065b MOve the movingAverage class to shared next to SimpleMovingAverage 2015-10-26 11:23:13 -07:00
Brad Davis
691e5f3be0 Remove new/old value division from endpoint::apply 2015-10-26 11:22:25 -07:00
Brad Hefta-Gaub
88ba6cda24 Merge pull request #6177 from jherico/guns 
Controller Branch - Fix gun.js
 2015-10-26 10:51:08 -07:00
Brad Hefta-Gaub
c2663d5f96 Merge pull request #6179 from jherico/vive 
Adding Vive controller default mapping
 2015-10-26 10:50:14 -07:00
Brad Davis
f38303a9a5 Adding vive default mapping 2015-10-26 10:36:31 -07:00
Brad Davis
75b2ee94b2 PR feedback 2015-10-25 19:37:41 -07:00
Brad Davis
a7547ef11e Adding hysteresis filter, moving filters to individual files 2015-10-25 16:44:43 -07:00