sam
|
b133556c14
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-08-07 18:55:44 -07:00 |
|
sam
|
d1105b8102
|
Still trying
|
2016-08-07 18:10:03 -07:00 |
|
sam
|
e92e69d963
|
More changes
|
2016-08-06 11:54:54 -07:00 |
|
Chris Collins
|
6585be036c
|
Merge pull request #8381 from sethalves/unhide-advanced-button
remove hidden attribute from advanced settings button
|
2016-08-06 08:08:23 -07:00 |
|
Philip Rosedale
|
da8b075d34
|
Merge pull request #8378 from sethalves/fix-auto-unequip
fix auto-unequip
|
2016-08-05 18:19:11 -07:00 |
|
Seth Alves
|
f348b56106
|
remove hidden attribute from advanced settings button
|
2016-08-05 18:16:48 -07:00 |
|
Seth Alves
|
090a0a6e9a
|
only use hand-sphere vs equipped-item bounding box when deciding to auto-unequip
|
2016-08-05 18:01:48 -07:00 |
|
Brad Hefta-Gaub
|
652bea8cd0
|
Merge pull request #8363 from birarda/no-temp-ice-update
Avoid DS heartbeats with non-metaverse domain ID
|
2016-08-05 16:48:00 -07:00 |
|
Brad Hefta-Gaub
|
452c0218da
|
Merge pull request #8358 from AlexanderOtavka/inline-e-script
Fix parsing of embedded entity scripts
|
2016-08-05 16:46:02 -07:00 |
|
Brad Hefta-Gaub
|
3f3dda6356
|
Merge pull request #8360 from sethalves/no-accidental-fly
don't accidently fly
|
2016-08-05 16:45:48 -07:00 |
|
Brad Hefta-Gaub
|
7cbc0bcabe
|
Merge pull request #8366 from kencooke/master
optimized distance-attnuation calculation
|
2016-08-05 16:45:35 -07:00 |
|
Seth Alves
|
e59c010642
|
speling
|
2016-08-05 15:39:20 -07:00 |
|
Seth Alves
|
dc22b579f7
|
adjust code that auto-unequips items when they are pulled too far from the equipping hand
|
2016-08-05 15:28:37 -07:00 |
|
Chris Collins
|
1e2d77a99b
|
Merge pull request #8346 from sethalves/default-when-av-fails
use default avatar when avatar-url is bogus
|
2016-08-05 15:13:58 -07:00 |
|
Brad Hefta-Gaub
|
82119f7f0b
|
Merge pull request #8336 from ctrlaltdavid/21018
close file browser dialog immediately after selecting asset to upload
|
2016-08-05 14:39:35 -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 |
|
sam
|
e96fd92f32
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-08-05 09:28:45 -07:00 |
|
sam
|
92c0fa2e7a
|
Testiung more variations
|
2016-08-05 09:26:48 -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
|
aeadbda1e1
|
adjust ground-to-fly logic
|
2016-08-04 11:34:42 -07:00 |
|
Ken Cooke
|
7629e34586
|
optimized distance-attnuation calculation
|
2016-08-04 11:05:34 -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 |
|
Seth Alves
|
905c6147cf
|
Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails
|
2016-08-04 09:56:32 -07:00 |
|
Seth Alves
|
e1c7ced652
|
increase GROUND_TO_AUTOFLY_THRESHOLD
|
2016-08-04 09:54:26 -07:00 |
|
Seth Alves
|
1930bde005
|
Merge branch 'master' of github.com:highfidelity/hifi into no-accidental-fly
|
2016-08-04 09:52:18 -07:00 |
|
Stephen Birarda
|
f3e30221f0
|
only force a new temp name if already a temp domain-server
|
2016-08-04 09:33:31 -07:00 |
|
Stephen Birarda
|
ba49fd2c61
|
don't heartbeat immediately unless metaverse domain
|
2016-08-04 09:33:31 -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 |
|
Zander Otavka
|
a826f4eca1
|
Fix console errors for javascript: urls
|
2016-08-03 15:55:51 -07:00 |
|
samcake
|
b4e5b60656
|
fixing ao
|
2016-08-03 15:45:22 -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 |
|
Seth Alves
|
78e59106b4
|
adjust threshold for how far above the ground will cause the avatar to auto-fly
|
2016-08-03 15:21:49 -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 |
|
Zander Otavka
|
f9b6db12e3
|
Fix parsing of embedded entity scripts
Now correctly identifies when scripts are not urls as well as
javascript: urls.
|
2016-08-03 13:48:27 -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 |
|
Seth Alves
|
c743cf379e
|
use loadCollisionModelURLFinished when collisions model is finished
|
2016-08-03 11:31:51 -07:00 |
|
Seth Alves
|
b48d4f6d2d
|
Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails
|
2016-08-03 10:42:26 -07:00 |
|