Zander Otavka
|
3df8aa0dba
|
Suppress repeated ice server connection messages
|
2016-08-08 17:01:32 -07:00 |
|
Brad Hefta-Gaub
|
882ad2f6fb
|
Merge pull request #8311 from huffman/feat/angular-loading
Add priority loading for model entities
|
2016-08-08 13:06:56 -07:00 |
|
Brad Hefta-Gaub
|
b903c974bc
|
Merge pull request #8371 from imgntn/teleport_cancel
Cancel mode for teleporting
|
2016-08-08 13:04:27 -07:00 |
|
James B. Pollack
|
58ccc9581a
|
cleanup
|
2016-08-08 12:20:48 -07:00 |
|
Ryan Huffman
|
fb14628a7e
|
Handle case in entity loading priority function where max dim size is <= 0
|
2016-08-08 10:39:27 -07:00 |
|
Ryan Huffman
|
2a071c4329
|
Fix improperly formatted floats
|
2016-08-08 10:39:06 -07:00 |
|
Ryan Huffman
|
d367583426
|
Clean up priority loading implementation
|
2016-08-08 08:53:06 -07:00 |
|
Ryan Huffman
|
d48bc96cf9
|
Add ability to set number of concurrent downloads
|
2016-08-08 08:53:06 -07:00 |
|
Ryan Huffman
|
4f9be2ae72
|
Fix camera position not being set for angular loading
|
2016-08-08 08:53:06 -07:00 |
|
Ryan Huffman
|
77e993510e
|
Cleanup implementation of angular loading
|
2016-08-08 08:53:05 -07:00 |
|
Ryan Huffman
|
c594dcdf9f
|
Add priority loading for model entities
|
2016-08-08 08:52:29 -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 |
|
Seth Alves
|
7aa7cdf642
|
Merge branch 'master' of github.com:highfidelity/hifi into groups-handle-camelcase-usernames
|
2016-08-05 07:42:49 -07:00 |
|
James B. Pollack
|
80da690680
|
incease distance a bit
|
2016-08-05 00:04:30 -07:00 |
|
James B. Pollack
|
7d37f86337
|
different swapping method
|
2016-08-04 23:45:43 -07:00 |
|
Seth Alves
|
3ca1ee1d82
|
Fix some group-related code to handle CamelCase usernames
|
2016-08-04 17:39:41 -07:00 |
|
James B. Pollack
|
80b6ca2b86
|
single call to istooclose
|
2016-08-04 16:47:10 -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 |
|
James B. Pollack
|
fb8263a882
|
cleanup
|
2016-08-04 16:35:50 -07:00 |
|
James B. Pollack
|
63aa0f8c3f
|
remove weird n
|
2016-08-04 16:18:13 -07:00 |
|
James B. Pollack
|
f93ed56124
|
cleaner code
|
2016-08-04 16:17:21 -07:00 |
|
James B. Pollack
|
c0cfee371e
|
cancel mode for teleporting
|
2016-08-04 16:08:51 -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 |
|