Brad Hefta-Gaub
18613908df
Merge pull request #7800 from sethalves/no-fly-zones
...
No fly zones
2016-05-20 16:59:55 -07:00
Brad Hefta-Gaub
5906f88226
Merge pull request #7952 from sethalves/fix-walking-far-grab
...
fix distance-grabbing and walking at the same time
2016-05-20 16:54:52 -07:00
Seth Alves
a24d63a39c
make distance-grab work better when avatar is walking
2016-05-20 15:45:00 -07:00
Chris Collins
8dbc6af719
Merge pull request #7944 from Atlante45/fix/edit-js
...
fix edit.js to handle userData that's not in JSON
2016-05-20 15:14:13 -07:00
howard-stearns
c299aef8f2
fix 588, 558
2016-05-20 12:15:30 -07:00
Atlante45
0353e562e4
entityProperties.html handles non object userData
2016-05-20 10:18:32 -07:00
Brad Hefta-Gaub
8ff7af28be
Merge pull request #7925 from sethalves/overlay-or-grab-not-both
...
fix mouse-grab moving both an overlay and an entity at the same time
2016-05-19 17:38:32 -07:00
Seth Alves
74520f5c92
Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones
2016-05-19 09:49:44 -07:00
Brad Hefta-Gaub
53956c8210
reduce log spam
2016-05-19 07:50:06 -07:00
Seth Alves
b4df7cada7
don't mouse-grab things through an overlay
2016-05-18 16:16:31 -07:00
Brad Davis
e431fd3d65
Merge pull request #7921 from howard-stearns/turn-off-hand-controller-pointer-when-no-focus
...
turn off hand-controller pointer when Interface doesn't have focus
2016-05-18 14:45:35 -07:00
howard-stearns
fa90d823d5
Turn off hand-controller pointer when Interface doesn't have focus.
2016-05-18 11:49:12 -07:00
Brad Hefta-Gaub
52445115dd
Merge pull request #7906 from howard-stearns/improve-hand-controller-edit
...
improve hand-controller edit
2016-05-18 11:35:00 -07:00
Brad Hefta-Gaub
9a3b6bf081
Merge pull request #7858 from Atlante45/remove-deprecated-entity-props
...
removed dead code for overlays/entities glow level
2016-05-18 09:14:26 -07:00
Atlante45
4b1497fdf4
Remove dead code highlight entity in edit.js
2016-05-16 16:25:40 -07:00
howard-stearns
3f17852244
Merge branch 'master' of https://github.com/highfidelity/hifi into improve-hand-controller-edit
2016-05-16 12:35:48 -07:00
howard-stearns
acb56d0603
Larger edit handles, and more tolerance in click (vs drag).
2016-05-16 12:35:05 -07:00
Seth Alves
a0c3224705
Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones
2016-05-16 10:56:09 -07:00
Brad Hefta-Gaub
cf59fa8a46
Merge pull request #7885 from ctrlaltdavid/20918
...
make users.js movable
2016-05-16 10:16:32 -07:00
Atlante45
5acbed647c
Remove glowLevel references in scripts
2016-05-14 14:49:31 -07:00
Brad Hefta-Gaub
87aa90de08
Merge pull request #7878 from howard-stearns/vive-buttons-out-of-pause
...
More buttons to get out of away/pause.
2016-05-14 09:12:16 -07:00
David Rowe
33e2cde266
Change default position to be bottom left of HMD recommended rectangle
2016-05-14 12:08:19 +12:00
David Rowe
ccd821118e
Merge branch 'master' into 20918
2016-05-14 11:21:04 +12:00
Brad Hefta-Gaub
987b3483a8
Merge pull request #7876 from sethalves/fix-grab-fixes
...
fix grab-fixes
2016-05-13 15:26:31 -07:00
David Rowe
1928f51b3e
Restore window position at script start
2016-05-13 13:56:31 +12:00
David Rowe
ec74cb4aec
Maintain offset of bottom with nearest display edge if Interface resized
2016-05-13 13:22:03 +12:00
David Rowe
8445c9fbc7
Update max window height before it scrolls, according to its position
2016-05-13 13:08:45 +12:00
David Rowe
93ead174aa
Click and drag border to move users window
2016-05-13 12:51:39 +12:00
David Rowe
54d658798a
Add border overlay
2016-05-13 11:22:10 +12:00
howard-stearns
41dc9a23a8
More buttons to get out of away/pause.
2016-05-12 15:41:15 -07:00
David Rowe
991f7fe873
Fix up syntax per JSLint
2016-05-13 10:20:50 +12:00
Brad Davis
85272a87ba
Merge pull request #7859 from samcake/lemon
...
Introduce the "Unlit" shading model support and apply it to Web Enitities
2016-05-12 15:09:50 -07:00
Seth Alves
009c288745
revert a change from previous fixes -- non-dynamic things should have to opt-into being grabbable. dynamic things have to opt-out
2016-05-12 13:29:40 -07:00
Seth Alves
c9c619916c
Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones
2016-05-11 19:37:57 -07:00
Brad Davis
ba357721bf
Merge pull request #7864 from hyperlogic/tony/vive-controller-improvements
...
Fix for vive controllers sometimes not working
2016-05-11 14:32:33 -07:00
Anthony J. Thibault
95ef543f25
viveTouchpadTest.js: don't throw if there is no Vive controller attached.
2016-05-11 13:35:17 -07:00
samcake
99dcfef5a8
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
2016-05-11 10:47:38 -07:00
Anthony J. Thibault
09a4e0eaa8
Fix for vive controllers sometimes not working
...
* Fixed bug with input devices that where added, removed then re-added.
The default mappings were being ignored on the second add.
* Fixed potential crash when hardware inputPlugin device poses were polled from the JavaScript thread
by taking the UserInputManager lock during pluginUpdate.
* Renamed Controller.Hardware.Vive.LB & RB to LeftGrip and RightGrip, to better match Oculus touch.
* Updated resource/controller/vive.json to reflect this new mapping.
* Exposed touch pad capacitive touch events to JavaScript as
Controller.Hardware.Vive.LSTouch and RSTouch.
* Added viveTouchpadTest.js script to test LSTouch and RSTouch events.
2016-05-10 19:32:08 -07:00
Brad Hefta-Gaub
757eea16a6
Merge pull request #7809 from howard-stearns/hand-controller-pointer
...
Hand controller pointer
2016-05-10 16:37:26 -07:00
samcake
303cade547
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
2016-05-10 09:56:05 -07:00
Howard Stearns
64dc31cd61
switch statement whitespace
2016-05-10 09:43:00 -07:00
Howard Stearns
2b3f6506b7
more whitespace
2016-05-10 09:38:39 -07:00
Brad Hefta-Gaub
6f84268593
Merge pull request #7850 from sethalves/nbody-example
...
Philip's gravity example
2016-05-10 07:48:25 -07:00
Andrew Meadows
ffc3123467
Merge pull request #7658 from sethalves/grab-fixes
...
Grab fixes
2016-05-09 15:30:37 -07:00
Seth Alves
9fe827a93b
d'oh
2016-05-09 15:28:25 -07:00
Brad Hefta-Gaub
22081a8606
Merge pull request #7833 from zzmp/fix/scriptable-resource
...
Fix prefetching
2016-05-09 15:09:20 -07:00
Seth Alves
7ab52b8869
don't check fbx files into sourc
2016-05-09 14:58:26 -07:00
Seth Alves
ced7a56e39
Philip's gravity example
2016-05-09 14:43:24 -07:00
howard-stearns
9edd18c017
Fix mouse seek bugs.
2016-05-09 14:05:59 -07:00
howard-stearns
6f4204ca5b
Remove alert for route remapping on hardware change.
2016-05-09 11:41:00 -07:00
