David Rowe
54d658798a
Add border overlay
2016-05-13 11:22:10 +12:00
David Rowe
991f7fe873
Fix up syntax per JSLint
2016-05-13 10:20:50 +12: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
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
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
howard-stearns
3f3233da66
Merge branch 'master' of https://github.com/highfidelity/hifi into hand-controller-pointer
2016-05-09 09:26:28 -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
Howard Stearns
773770a7fc
All but origin-correction.
2016-05-03 07:01:23 -07:00
Brad Hefta-Gaub
49d02b802a
Merge pull request #7719 from zzmp/feat/resource-prefetch
...
Add prefetching to exposed caches
2016-05-02 18:04:26 -07:00
James B. Pollack
a9ab531e27
clear up toolbar name
2016-05-02 17:01:44 -07:00
James B. Pollack
e971da7dcb
move dice GUI
2016-05-02 16:54:32 -07:00
Brad Hefta-Gaub
44fb572248
Merge pull request #7775 from ctrlaltdavid/20896
...
Use UI Toolkit border styles for various dialogs
2016-05-02 10:11:29 -07:00
Zach Pomerantz
29e0744b89
Fix equality in scriptableResource/lib
2016-05-02 09:40:08 -07:00
Seth Alves
ec554c3c0b
Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes
2016-05-01 17:28:20 -07:00
Eric Levin
f1de590835
updated script
2016-04-30 14:45:28 -07:00
James B. Pollack
fc82780512
move toolbars to production
2016-04-29 11:04:04 -07:00
James B. Pollack
e61f8524c1
update dice path
2016-04-29 11:01:19 -07:00
Brad Hefta-Gaub
647ec69aaf
Merge pull request #7789 from imgntn/movetemplates
...
Move developer templates into a different location
2016-04-28 17:02:42 -07:00
Brad Hefta-Gaub
e881cba502
Merge pull request #7777 from ctrlaltdavid/20897
...
Move directory, examples, and edit toolbar buttons down a bit
2016-04-28 17:00:49 -07:00
Brad Hefta-Gaub
5314755e0d
Merge pull request #7782 from ctrlaltdavid/20898
...
Automatically upgrade toolbar position to bottom center of window
2016-04-28 16:37:34 -07:00
Brad Hefta-Gaub
6488744bd5
Merge pull request #7780 from imgntn/defaultScripts
...
Remove directory.js from default scripts
2016-04-28 16:28:33 -07:00
James B. Pollack
851f9b0914
move dev templates into a dif location
2016-04-28 16:23:32 -07:00
James B. Pollack
e68909ce3e
re add local paths
2016-04-28 13:48:09 -07:00
James B. Pollack
aafed4e1b8
fix horizontal typo in examples
2016-04-28 13:42:10 -07:00
James B. Pollack
b52406e127
horizontal
2016-04-28 13:40:58 -07:00
