Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 23:40:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45666 commits 76 branches 59 tags 1.2 GiB
Commit graph

45666 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
SamGondelman
b794259b7d fixed procedural entity fade 2016-08-05 16:15:10 -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
Sam Gondelman
84b7f9b186 Merge pull request #8375 from SamGondelman/loadingFade 
remove polyvox fade, fix web fade, add light fade
 2016-08-05 11:53:15 -07:00
SamGondelman
8494400047 don't use web entity texel color alpha as per tony's suggestion 2016-08-05 11:27:56 -07:00
SamGondelman
f2ee57f2de light fade 2016-08-05 11:17:02 -07:00
SamGondelman
b13edc7b6a fixed web fade fo' real 2016-08-05 10:48:09 -07:00
Seth Alves
84ce29eb90 Merge branch 'master' of github.com:highfidelity/hifi into fsm-arrows-dont-walk 2016-08-05 10:44:46 -07:00
SamGondelman
130e64aaba remove polyvox fade, possibly fix web fade 2016-08-05 10:36:48 -07:00
Sam Gondelman
ffa540c0e5 Merge pull request #8374 from ZappoMan/fadeFinalizeModels 
implement support for updating the render items of models when they finish their fade
 2016-08-05 10:34:48 -07:00
David Kelly
e0973f3c29 Merge pull request #8370 from howard-stearns/simple-snapshot-confirmation 
simple snapshot confirmation
 2016-08-05 10:21:00 -07:00
Brad Hefta-Gaub
83280aa3f2 implement support for updating the render items of models when they finish their fade 2016-08-05 10:11:07 -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
howard-stearns
fed775ff83 simple snapshot confirmation 2016-08-04 15:52:39 -07:00
Brad Hefta-Gaub
67cf105720 Merge pull request #8369 from SamGondelman/loadingFade 
Loading fade progress
 2016-08-04 15:24:37 -07:00
Ryan Huffman
d775a92dab Update implementation of ConnectionMonitor timeout 2016-08-04 14:45:10 -07:00
Ryan Huffman
26b9da7eef Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-connection-display 2016-08-04 14:41:03 -07:00
Ryan Huffman
a37bcdafda Remove debug logging in ConnectionMonitor 2016-08-04 14:40:41 -07:00
Ryan Huffman
8044910bf2 Add show-address-bar when disconnected from domain 2016-08-04 14:39:53 -07:00
SamGondelman
3107d63ad8 one more warning 2016-08-04 14:31:44 -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
SamGondelman
b6e73e06a2 merge from master 2016-08-04 13:34:38 -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
SamGondelman
004b0158a4 fix warnings on osx 2016-08-04 13:09:09 -07:00
howard-stearns
8a7bbbaaed limit user stories to first 100 2016-08-04 12:37:09 -07:00
SamGondelman
ac9a80131a refactoring _fadeStartTime and isTransparent, make simple renderables switch to transparent when fade finishes 2016-08-04 12:34:46 -07:00
howard-stearns
04bd98b15f new assets. remove margins between buttons (letting the graphics do the 
work)
 2016-08-04 12:33:50 -07:00
howard-stearns
1ecb01feac center the scroll 2016-08-04 12:06:07 -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
howard-stearns
f5d07f4186 helper text size and italic 2016-08-04 11:55:31 -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