Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-01 08:20:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9464 from sethalves/tablet-ui

Browse source 
Tablet ui
This commit is contained in:
Seth Alves 2017-01-20 14:51:16 -08:00 committed by GitHub
commit ff17aa7745
4 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/tablet/TabletRoot.qml
View file

@ -19,7 +19,7 @@ Item {
SoundEffect { SoundEffect {
id: buttonClickSound id: buttonClickSound
source: "../../../sounds/button-click.wav" source: "../../../sounds/Gamemaster-Audio-button-click.wav"
} }
function playButtonClickSound() { function playButtonClickSound() {

BIN
interface/resources/sounds/Gamemaster-Audio-button-click.wav Normal file
View file

Binary file not shown.

BIN
interface/resources/sounds/button-click.wav
View file

Binary file not shown.

4
scripts/system/controllers/handControllerGrab.js
View file

@ -2040,8 +2040,8 @@ function MyController(hand) {
this.ensureDynamic = function() { this.ensureDynamic = function() {
// if we distance hold something and keep it very still before releasing it, it ends up // if we distance hold something and keep it very still before releasing it, it ends up
// non-dynamic in bullet. If it's too still, give it a little bounce so it will fall. // non-dynamic in bullet. If it's too still, give it a little bounce so it will fall.
var props = Entities.getEntityProperties(this.grabbedEntity, ["velocity", "dynamic"]); var props = Entities.getEntityProperties(this.grabbedEntity, ["velocity", "dynamic", "parentID"]);
if (props.dynamic) { if (props.dynamic && props.parentID == NULL_UUID) {
var velocity = props.velocity; var velocity = props.velocity;
if (Vec3.length(velocity) < 0.05) { // see EntityMotionState.cpp DYNAMIC_LINEAR_VELOCITY_THRESHOLD if (Vec3.length(velocity) < 0.05) { // see EntityMotionState.cpp DYNAMIC_LINEAR_VELOCITY_THRESHOLD
velocity = { x: 0.0, y: 0.2, z:0.0 }; velocity = { x: 0.0, y: 0.2, z:0.0 };