Anthony J. Thibault
|
d36e60bbaa
|
eslintrc: accept spaces after function keyword in anonymous functions
Anonymous functions `function () {}` and `function() {}` will both be accepted by eslint.
|
2016-08-08 15:20:58 -07:00 |
|
Chris Collins
|
f0338ceb49
|
Merge pull request #8373 from sethalves/groups-handle-camelcase-usernames
Fix some group-related code to handle CamelCase usernames
|
2016-08-05 09:53:43 -07:00 |
|
Seth Alves
|
7aa7cdf642
|
Merge branch 'master' of github.com:highfidelity/hifi into groups-handle-camelcase-usernames
|
2016-08-05 07:42:49 -07:00 |
|
Seth Alves
|
3ca1ee1d82
|
Fix some group-related code to handle CamelCase usernames
|
2016-08-04 17:39:41 -07:00 |
|
Brad Davis
|
49ad0951dd
|
Merge pull request #8364 from sethalves/fix-settings-missing-key
fix bug which caused getValue for a non-existent key to return the integer 2
|
2016-08-04 16:39:49 -07:00 |
|
Seth Alves
|
a2441ca84c
|
back out some uneeded chagnes
|
2016-08-04 14:09:12 -07:00 |
|
Seth Alves
|
981a8d76fa
|
code review
|
2016-08-04 13:47:43 -07:00 |
|
Seth Alves
|
45c21ca523
|
make UNSET_VALUE still work while still returning and empty string value for undefined keys
|
2016-08-04 13:37:08 -07:00 |
|
Seth Alves
|
2ac0a0d343
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-settings-missing-key
|
2016-08-04 13:29:32 -07:00 |
|
Chris Collins
|
be87f294d8
|
Merge pull request #8351 from thoys/fix-handcontrollergrab-grab-message
fix remote triggering handControllerGrab
|
2016-08-04 11:55:48 -07:00 |
|
Seth Alves
|
4c258b9568
|
fix bug which caused getValue for a non-existent key to return the integer 2
|
2016-08-04 10:16:08 -07:00 |
|
Brad Hefta-Gaub
|
a1dc9beddb
|
Merge pull request #8348 from ZappoMan/beltAndSuspenders
implement codec renegotiation in client
|
2016-08-03 21:22:28 -07:00 |
|
Chris Collins
|
2473bbf1db
|
Merge pull request #8313 from imgntn/tweak_lazers
Tweak Teleport + Hand Lasers
|
2016-08-03 16:40:28 -07:00 |
|
Seth Alves
|
7740420b96
|
Merge pull request #8361 from hyperlogic/bug-fix/avatar-debug-draw
Bug fix for avatar debug marker rendering.
|
2016-08-03 16:07:49 -07:00 |
|
Anthony J. Thibault
|
f24c92f3a1
|
Bug fix for avatar debug marker rendering.
"Developer > Hands > Show Hand Targets" works again
"Developer > Avatar > Draw Position" works again
|
2016-08-03 15:43:31 -07:00 |
|
Philip Rosedale
|
f0c944b0c3
|
Merge pull request #8350 from sethalves/ignore-touch
if the oculus HMD isn't on someone's head, don't take input from the controllers
|
2016-08-03 15:21:43 -07:00 |
|
Philip Rosedale
|
98e40d54e1
|
Merge pull request #8355 from SamGondelman/touchDeadZone
Added dead zones to Hydra and Oculus Touch joysticks
|
2016-08-03 15:17:15 -07:00 |
|
James B. Pollack
|
e012d3cebb
|
Merge branch 'tweak_lazers' of github.com:imgntn/hifi into tweak_lazers
|
2016-08-03 15:00:05 -07:00 |
|
James B. Pollack
|
7a41ed25db
|
Merge remote-tracking branch 'upstream/master' into tweak_lazers
|
2016-08-03 14:59:51 -07:00 |
|
Seth Alves
|
707fa2cafe
|
Merge branch 'master' of github.com:highfidelity/hifi into ignore-touch
|
2016-08-03 14:51:28 -07:00 |
|
Brad Hefta-Gaub
|
eb230071a0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into beltAndSuspenders
|
2016-08-03 11:53:28 -07:00 |
|
SamGondelman
|
458e43fadc
|
added dead zones to hydras, style fixes
|
2016-08-03 10:18:57 -07:00 |
|
Seth Alves
|
9962d47173
|
Merge pull request #8326 from birarda/kick
kick
|
2016-08-03 09:21:09 -07:00 |
|
Brad Hefta-Gaub
|
754eae98c2
|
Merge pull request #8353 from birarda/fake-atp-url
fix for disabled physics with unloadable entity
|
2016-08-03 09:10:41 -07:00 |
|
Brad Hefta-Gaub
|
70cb3d3393
|
Merge pull request #8354 from AlexanderOtavka/remove-web-debug
Remove url change debug info for WebView
|
2016-08-03 09:10:10 -07:00 |
|
Seth Alves
|
cc7322a0de
|
Merge pull request #8334 from ctrlaltdavid/21015
refresh file dialog when directory content changes
|
2016-08-03 08:11:40 -07:00 |
|
James B. Pollack
|
5ad5899140
|
revert pointer changes
|
2016-08-02 21:26:48 -07:00 |
|
James B. Pollack
|
fed39d9056
|
cleanup dead code
|
2016-08-02 21:26:04 -07:00 |
|
Chris Collins
|
b2a354ddb9
|
Merge pull request #8331 from huffman/feat/progress-updates
progress.js updates
|
2016-08-02 21:10:54 -07:00 |
|
Seth Alves
|
8f76c43bc1
|
if call to ovr_GetSessionStatus fails, also don't take input from controllers
|
2016-08-02 19:49:58 -07:00 |
|
Seth Alves
|
ed4b3cde6b
|
Merge branch 'master' of github.com:highfidelity/hifi into ignore-touch
|
2016-08-02 19:44:28 -07:00 |
|
James B. Pollack
|
9d56c697e7
|
no delay!
|
2016-08-02 19:02:20 -07:00 |
|
James B. Pollack
|
364eb992fb
|
no teleport while moving
|
2016-08-02 18:53:36 -07:00 |
|
James B. Pollack
|
88ebeaa4cb
|
start no movement mode. using actual keys since avatar speed doesnt work with gtting stuck
|
2016-08-02 18:46:47 -07:00 |
|
Brad Hefta-Gaub
|
193f0bbb99
|
Merge pull request #8345 from ctrlaltdavid/web-window-signals
add OverlayWebWindow resized, moved, and closed signals
|
2016-08-02 18:41:49 -07:00 |
|
Brad Hefta-Gaub
|
0d1034914d
|
Merge pull request #8352 from AlexanderOtavka/fix-confirm
Fix confirm dialog
|
2016-08-02 18:41:08 -07:00 |
|
SamGondelman
|
1ce7623f41
|
added deadzones to oculus touch movements
|
2016-08-02 18:19:58 -07:00 |
|
Seth Alves
|
8c43c12249
|
clear pose before short-circuiting update
|
2016-08-02 16:49:24 -07:00 |
|
Zander Otavka
|
3c30743d0d
|
Remove url change debug info for WebView
|
2016-08-02 16:48:39 -07:00 |
|
Ryan Huffman
|
adbd9ff854
|
Add constants for progress bar offset
|
2016-08-02 16:34:57 -07:00 |
|
Stephen Birarda
|
5d3e125a06
|
make failed geomtetry request not hold physics
|
2016-08-02 16:32:41 -07:00 |
|
Ryan Huffman
|
1f2e34d59b
|
Remove 3d overlay from progress.js
|
2016-08-02 16:29:40 -07:00 |
|
Ryan Huffman
|
79a243b171
|
Clean up progress.js
|
2016-08-02 16:19:38 -07:00 |
|
Zander Otavka
|
38ba54e481
|
Fix confirm dialog
|
2016-08-02 16:04:54 -07:00 |
|
Thijs Wenker
|
3a2b0ffa08
|
Fixes the handControllerGrab Hifi-Hand-Grab message. Was broken since the hotspot changes to handControllerGrab.js.
|
2016-08-03 00:47:28 +02:00 |
|
James B. Pollack
|
8541d4bd41
|
small change to protect
|
2016-08-02 15:41:28 -07:00 |
|
James B. Pollack
|
d00c1f62fc
|
fixes
|
2016-08-02 15:40:19 -07:00 |
|
Seth Alves
|
03a47af628
|
if the HMD isn't on someone's head, don't take input from the controllers
|
2016-08-02 15:38:04 -07:00 |
|
Brad Hefta-Gaub
|
ca3a194454
|
implment coded renegotiation in client if for some reason unexpected audio codecs come in to inbound stream
|
2016-08-02 15:30:03 -07:00 |
|
James B. Pollack
|
f6984aaff8
|
clear timeout one more place
|
2016-08-02 14:42:21 -07:00 |
|