Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 04:27:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr

Browse source
This commit is contained in:
samcake 2015-12-03 11:21:00 -08:00
commit b5a6880369
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/resources/controllers/hydra.json
View file

@ -13,12 +13,11 @@
{ "from": "Hydra.RB", "to": "Standard.RB" },
{ "from": "Hydra.RS", "to": "Standard.RS" },
{ "from": [ "Hydra.L3", "Hydra.L4" ], "to": "Standard.LeftPrimaryThumb" },
{ "from": [ "Hydra.L1", "Hydra.L2" ], "to": "Standard.LeftSecondaryThumb" },
{ "from": [ "Hydra.R3", "Hydra.R4" ], "to": "Standard.RightPrimaryThumb" },
{ "from": [ "Hydra.R1", "Hydra.R2" ], "to": "Standard.RightSecondaryThumb" },
{ "from": [ "Hydra.L1", "Hydra.L2", "Hydra.L3", "Hydra.L4" ], "to": "Standard.LeftPrimaryThumb" },
{ "from": [ "Hydra.L0" ], "to": "Standard.LeftSecondaryThumb" },
{ "from": [ "Hydra.R1", "Hydra.R2", "Hydra.R3", "Hydra.R4" ], "to": "Standard.RightPrimaryThumb" },
{ "from": [ "Hydra.R0" ], "to": "Standard.RightSecondaryThumb" },
{ "from": "Hydra.LeftHand", "to": "Standard.LeftHand" },
{ "from": "Hydra.RightHand", "to": "Standard.RightHand" }

1
unpublishedScripts/hiddenEntityReset.js
View file

@ -1027,6 +1027,7 @@
y: -9.8,
z: 0
},
restitution: 0,
dimensions: {
x: 0.08,
y: 0.21,

1
unpublishedScripts/masterReset.js
View file

@ -1007,6 +1007,7 @@ MasterReset = function() {
y: -9.8,
z: 0
},
restitution: 0,
dimensions: {
x: 0.08,
y: 0.21,