diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-15 17:09:45 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-15 17:09:45 -0400 |
| commit | 6ad93b573ed6e9b4b339fa0d746bf21b8f827fdb (patch) | |
| tree | fbf11caca0273f4a95aa3152bb8f2e76e1ff55b0 /public/assets/javascripts/mx/extensions | |
| parent | 86121b6f8ad112c35a07bc98b161572648517f12 (diff) | |
help messages on button, starting drag stuff
Diffstat (limited to 'public/assets/javascripts/mx/extensions')
| -rw-r--r-- | public/assets/javascripts/mx/extensions/mx.movements.js | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js index b158625..40e786d 100644 --- a/public/assets/javascripts/mx/extensions/mx.movements.js +++ b/public/assets/javascripts/mx/extensions/mx.movements.js @@ -129,9 +129,19 @@ MX.Movements = function (cam) { } else if (app.controller.mediaViewer && app.controller.mediaViewer.$el.hasClass("active")) { app.controller.mediaViewer.hide() + $(".inuse").removeClass("inuse") } else if (app.controller.lightControl.$el.hasClass('active')) { app.controller.lightControl.hide() + $(".inuse").removeClass("inuse") + } + else if (app.controller.wallpaperPicker.$el.hasClass('active')) { + app.controller.wallpaperPicker.hide() + $(".inuse").removeClass("inuse") + } + else if (app.controller.presets.$el.hasClass('active')) { + app.controller.presets.hide() + $(".inuse").removeClass("inuse") } else { app.controller.toolbar.toggleMap() @@ -242,7 +252,7 @@ MX.Movements = function (cam) { var ry = cam.rotationY var s = creeping ? scale * creepFactor : scale - var vrrrr = creeping ? vr * creepFactor * 5 : vr + var vrrrr = creeping ? vr * creepFactor * 5 : vr * 0.5 var moving = moveForward || moveBackward || moveRight || moveLeft || moveUp || moveDown || turnLeft || turnRight || turnUp || turnDown vx = vz = 0 |