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

45673 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
28b3ff9bca Update generation of srgb to linear lookup to include python script 2016-08-08 12:04:06 -07:00
James B. Pollack
bde46adee8 update description 2016-08-08 11:31:43 -07:00
SamGondelman
f311907982 fix merge mistake 2016-08-08 11:08:01 -07:00
James B. Pollack
f8c1d8f123 change property order and cleanup 2016-08-08 11:01:03 -07:00
SamGondelman
0ec1da4a0d Merge remote-tracking branch 'upstream/master' into loadingFade 2016-08-08 10:55:20 -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
Seth Alves
38314b180b Merge branch 'master' of github.com:highfidelity/hifi into fsm-arrows-dont-walk 2016-08-08 06:30:18 -07:00
Andrew Meadows
4e23ecfb2c count the _translucent_ pixels and fix break logic 2016-08-07 10:50:25 -07:00
Andrew Meadows
f759fd1033 early exit when determining if alpha mask possible 
also don't bother scanning for alpha for cube maps
 2016-08-07 08:54:20 -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
Andrew Meadows
4f2c00af46 faster TextureUsage::process2DImageColor() 2016-08-05 23:38:45 -07:00
David Rowe
38b5314322 Disable Asset Browser's right-click popup menu if in HMD mode 2016-08-06 17:53:59 +12:00
SamGondelman
b23d3cd35a fixed messed up transparency on edit selection of shapes 2016-08-05 18:35:16 -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
SamGondelman
dd51e0e38f merge from master 2016-08-05 17:04:45 -07:00
SamGondelman
771e105fa2 Merge remote-tracking branch 'upstream/master' into loadingFade 2016-08-05 16:52:01 -07:00
Sam Gondelman
debda37567 Merge pull request #8379 from SamGondelman/loadingFade 
fixed procedural entity fade
 2016-08-05 16:48:51 -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
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
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