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
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
samcake
0bfad4a549
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
2016-05-09 11:33:47 -07:00
howard-stearns
3f3233da66
Merge branch 'master' of https://github.com/highfidelity/hifi into hand-controller-pointer
2016-05-09 09:26:28 -07:00
samcake
a8347cac6e
Getting the unlit to work from the pipeline, and found the isLinear for texture bug!
2016-05-06 18:36:55 -07:00
Zach Pomerantz
0fbbbaa985
Add tex loadPerfTest.js
2016-05-06 15:08:45 -07:00
Zach Pomerantz
eee487723c
Fix headers of scriptableResource tests
2016-05-06 15:08:44 -07:00
Zach Pomerantz
83fad4c52f
Fix equalities in scriptableResource tests
2016-05-06 15:08:44 -07:00
James B. Pollack
97e1621776
increase width
2016-05-05 15:02:16 -07:00
James B. Pollack
d1755649b1
order
2016-05-05 14:55:41 -07:00
James B. Pollack
67b1015f4a
re add users to default, default to visible friends only
2016-05-05 14:54:04 -07:00
Seth Alves
9db839bc13
don't allow someone else to delete an action that I own. reset dynamic property when releasing and entity, even if refCount isn't 0
2016-05-04 15:01:00 -07:00
Seth Alves
44beca1687
try having all spring derived actions agree on a target
2016-05-04 11:29:17 -07:00
howard-stearns
fdf9c0a217
Fix offset so that non-full-size window can be located anywhere on screen.
2016-05-03 16:26:45 -07:00
howard-stearns
eb0517f3cd
fix updateSeeking
2016-05-03 14:36:52 -07:00
Seth Alves
6f395cd97a
Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes
2016-05-03 14:36:33 -07:00
howard-stearns
adb11c9266
Merge branch 'master' of https://github.com/highfidelity/hifi into hand-controller-pointer
2016-05-03 14:03:10 -07:00
Howard Stearns
5bd77bf343
Matching "final" version of test script.
2016-05-03 13:23:04 -07:00
Brad Hefta-Gaub
d2889dbda4
Merge pull request #7804 from imgntn/diceFix2
...
Move Dice GUI
2016-05-03 13:05:46 -07:00
Seth Alves
99ffb6b79d
Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes
2016-05-03 10:29:41 -07:00
