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

58497 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
c67fcc1384 Add RedirectFail to ResourceRequest::getResultString() 2017-09-01 10:41:31 -07:00
Ryan Huffman
5ee33085a5 Add handling of failedLastBake error in getAssetStatus 2017-09-01 10:37:28 -07:00
Ryan Huffman
7a68788c8c Fix warning for non-const default in AssetServer 2017-08-31 16:22:46 -07:00
Ryan Huffman
bf53161a0b Fix comparison between signed and unsigned int in MappingRequest 2017-08-31 15:55:27 -07:00
Ryan Huffman
25f64e1aa9 Merge branch 'feat/auto-bake' of github.com:highfidelity/hifi into feat/bake-meta-errors 2017-08-31 15:17:40 -07:00
Ryan Huffman
d2c7235fed Fix update to count width in GetAllMappings 2017-08-31 14:41:29 -07:00
Stephen Birarda
b1bc899121 Merge pull request #11270 from birarda/feat/auto-bake 
refuse to perform mapping operations in /.baked/
 2017-08-31 13:06:28 -07:00
Ryan Huffman
0cd8a5cd41 Merge branch 'feat/auto-bake' of github.com:highfidelity/hifi into feat/bake-meta-errors 2017-08-31 12:09:21 -07:00
Ryan Huffman
9ce0f03aa2 Fix mapping comparision in getAssetStatus being done against path 2017-08-31 11:58:03 -07:00
Stephen Birarda
da8ae23756 move default to the bottom of bakingStatusToString 2017-08-31 11:52:42 -07:00
Stephen Birarda
84b5afaa4d mark task dispatcher as override 2017-08-30 17:28:17 -07:00
Ryan Huffman
2aa39e7da4 Fix baking library not automatically being built 2017-08-30 16:53:51 -07:00
Ryan Huffman
d68338f0b0 Add error handling to asset server baking 2017-08-30 16:53:31 -07:00
Stephen Birarda
4e1e483e27 link DL libs with FBX SDK for baking 2017-08-30 16:50:20 -07:00
Stephen Birarda
81fdc27ca8 use 2017.1 FBX SDK on all platforms, change linux location 2017-08-30 16:46:43 -07:00
Stephen Birarda
ed21ad11d2 add baking to default build, add default to baking status 2017-08-30 15:14:53 -07:00
Ryan Huffman
70430c009d Fix ATP requests not keeping track of all mapping redirects 2017-08-30 14:35:12 -07:00
Stephen Birarda
3abca67f1a remove use of auto in TextureBaker for OS X compile 2017-08-30 14:30:11 -07:00
Stephen Birarda
f2997c0997 refuse to perform mapping operations in /.baked/ 2017-08-30 14:30:08 -07:00
Ryan Huffman
31345e4264 Fix ATP requests not keeping track of all mapping redirects 2017-08-30 13:15:14 -07:00
Ryan Huffman
f89459525e Merge pull request #11257 from birarda/feat/delete-baked-with-original 
add deletion of baked content when original removed
 2017-08-29 13:18:58 -07:00
Ryan Huffman
e8a57e3b35 Merge pull request #11256 from birarda/feat/auto-bake 
fail bake of partially baked FBX that references KTX
 2017-08-29 13:17:05 -07:00
Stephen Birarda
e735c12e70 Merge pull request #11258 from huffman/feat/auto-bake-2 
Fix loading standalone baked textures from Asset Server
 2017-08-29 13:16:02 -07:00
Ryan Huffman
e9258ec97a Fix loading standalone baked textures from Asset Server 
NetworkTexture was not properly handling redirected ATP files. For
instance, if going from .jpg -> .ktx, the NetworkTexture class needs to
be aware of this so it can stop the current request and make multiple
requests for the individual mip levels.
 2017-08-28 15:54:40 -07:00
Stephen Birarda
6992bd6f48 add deletion of baked content when original removed 2017-08-28 15:38:31 -07:00
Stephen Birarda
ba34a0ddef fail bake of partially baked FBX that references KTX 2017-08-28 15:01:31 -07:00
Atlante45
ca62e7168c Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-08-28 11:41:23 -07:00
Chris Collins
d675ee9427 Merge pull request #11250 from jherico/thread_safety 
Additional locking in model entities
 2017-08-28 09:22:30 -07:00
Sam Gateau
a98d861600 Merge pull request #11242 from SamGondelman/tabletLayer2 
Web overlays and entities are always non anti-aliased
 2017-08-28 09:10:14 -07:00
Stephen Birarda
79231cdee0 fix switched signature for completed bake handling 2017-08-25 17:10:09 -07:00
Stephen Birarda
cc7dd2162b fixes for OS X build 2017-08-25 17:03:52 -07:00
Atlante45
0755b77615 Fix for mac build 2017-08-25 16:32:32 -07:00
druiz17
06ab8ddbb2 Merge pull request #11251 from elisa-lj11/blocks 
Blocks app accommodates updated Blocks website
 2017-08-25 16:32:14 -07:00
Atlante45
065721d23f Merge branch 'feat/auto-bake' of https://github.com/huffman/hifi into feat/auto-bake 2017-08-25 16:22:14 -07:00
Ryan Huffman
7d08a5788f Move outputFiles from FBXBaker to Baker 2017-08-25 16:21:00 -07:00
Atlante45
700b11e28b Fix bad conditional 2017-08-25 16:17:37 -07:00
Atlante45
a36ddf7b6d Fix failed connection 2017-08-25 16:13:29 -07:00
Atlante45
eaa2b9fda8 Fix packet version conflict 2017-08-25 15:36:33 -07:00
Atlante45
8a291f16ff Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-08-25 15:26:38 -07:00
Atlante45
7d103d24f4 Integrate my and Huffman's work 2017-08-25 15:21:08 -07:00
David Kelly
5bbe3c5a94 Merge pull request #11246 from davidkelly/dk/encryptionBug 
security image bug
 2017-08-25 14:14:22 -07:00
Zach Fox
3fdfe3fe68 Merge pull request #11249 from zfox23/commerce_walletStatus 
Huge cleanup of Wallet logic
 2017-08-25 13:53:17 -07:00
Brad Davis
3ad32af975 Additional locking in model entities 2017-08-25 11:49:45 -07:00
David Kelly
0f722992a5 add delete to client of decryptFile 2017-08-25 11:24:37 -07:00
Elisa Lupin-Jimenez
4c40e3bdf4 fixed weird info box display of filenames 2017-08-25 11:21:07 -07:00
Elisa Lupin-Jimenez
7cee80f0cf my own objects (or rather objects with low poly count) download now 2017-08-25 11:09:11 -07:00
Zach Fox
453897b9e2 Huge cleanup! 2017-08-25 10:56:53 -07:00
Atlante45
348be788f7 Add BakingEnabled protocol 2017-08-25 10:56:27 -07:00
Atlante45
9e6502fe92 More UI work 2017-08-25 10:54:34 -07:00
Atlante45
28c9aa031c Setup script model status 2017-08-25 10:54:34 -07:00