Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-29 19:43:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
20633 commits 6 branches 1 tag 1.1 GiB
Commit graph

55 commits

Author SHA1 Message Date
Atlante45
f77fab2fe0 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
 2015-01-13 11:03:14 -08:00
Atlante45
98dd401ea3 Remove duplicate definition 2015-01-12 11:12:19 -08:00
Andrzej Kapolka
0d07875f94 Fix overflow warning. 2014-12-30 12:54:12 -08:00
Atlante45
2a54ef01ef Set texture limit back to 1024 2014-12-23 15:06:22 -08:00
Atlante45
da636ca918 ModelUploader only has static methods accessible 2014-12-23 14:00:23 -08:00
Atlante45
f317b54017 Broke down ModelUploader::zip() 2014-12-23 13:48:13 -08:00
Atlante45
879c3e2fd0 Add entity model upload 2014-12-23 12:30:00 -08:00
Atlante45
296c0025de Switched to auto and changed macro 2014-12-18 15:42:38 -08:00
Atlante45
2039895898 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/renderer/GlowEffect.cpp
	interface/src/renderer/TextureCache.cpp
 2014-12-16 14:27:50 -08:00
ZappoMan
94cf8b3384 reduce calls to DependencyManager::get<> where possible 2014-12-15 11:43:30 -08:00
ZappoMan
e0a017e963 make GeometryCache work with DependancyManager 2014-12-15 10:49:34 -08:00
ZappoMan
7d75d2d1bf make TextureCache work with DependancyManager 2014-12-15 10:34:16 -08:00
ZappoMan
4ac673fe63 more render util cleanup 2014-12-15 08:16:42 -08:00
ZappoMan
e9ea6b20ce use TextureCache::getInstance() instead of Application::getInstance()->getTextureCache() 2014-12-15 08:16:18 -08:00
Sam Gateau
764ad72471 adding the light map support from FBX 2014-11-20 09:54:41 -08:00
Andrzej Kapolka
14eb87aefd Eliminate wacky scales in favor of newfangled "meters." 2014-11-14 12:23:47 -08:00
Andrzej Kapolka
c979ace924 Read the unit scale factor and include it in the offset scale. 2014-10-17 17:34:27 -07:00
Andrzej Kapolka
1940fe67a0 Add jointEyeLeft/jointEyeRight/jointNeck to list of nodes we check for on 
upload.
 2014-10-17 16:57:15 -07:00
Andrzej Kapolka
1b9b0f9fc9 Look for and store the "Skeleton" type flag so that we can offer only skeleton 
joints in the dropdown.
 2014-10-17 16:51:55 -07:00
Stephen Birarda
e9bcc90166 handle remaining conversions for AccountManager passing QNetworkReply 2014-10-14 16:16:54 -07:00
Andrzej Kapolka
6a0b3fa202 Ryan's new blendshape mappings for Mixamo. 2014-09-15 13:16:17 -07:00
Brad Hefta-Gaub
b209b70094 Merge pull request #3404 from birarda/data-web-domain-lookup 
initial transition to new metaverse API
 2014-09-12 13:45:40 -07:00
Stephen Birarda
1f2020d169 some url handling repairs, move existing error reply handlers to new format 2014-09-12 10:13:33 -07:00
Andrzej Kapolka
870b0c80cf Default blendshape mappings for Mixamo models. 2014-09-11 15:24:23 -07:00
Atlante45
f6221abb71 Switch ModelUploader to NetworkAccessManager 2014-07-02 10:52:08 -07:00
Stephen Birarda
01e8d775f2 change node auth URL to data.highfidelity.io 2014-05-22 14:24:19 -07:00
Andrzej Kapolka
363f545f7c After uploading, refresh the uploaded files so that they are immediately 
redownloaded.
 2014-05-09 17:50:08 -07:00
Andrzej Kapolka
55b677dd02 Provide options for model translation: by default, pivot about mesh bounds' 
center; allow numeric translation or pivot about joint position.
 2014-05-07 12:53:38 -07:00
Andrzej Kapolka
d0537e7ead Specular map support. 2014-05-06 17:32:10 -07:00
Andrzej Kapolka
432df1b65f Only add each texture once. 2014-05-06 12:41:31 -07:00
Andrzej Kapolka
e0400dbd9c Working on allowing attachment models to be uploaded. 2014-05-04 15:23:31 -07:00
Andrzej Kapolka
b458cd1297 Default joint mappings for Makehuman models. 2014-05-02 17:29:38 -07:00
Andrzej Kapolka
4c49d00683 Scale adjustment for Makehuman models. 2014-05-02 17:01:07 -07:00
Andrzej Kapolka
9d13740979 Better default scale, get eye positions from skeleton. 2014-05-02 14:06:54 -07:00
Andrzej Kapolka
28b9033373 Recode textures on upload if they're uncompressed or bigger than our maximum 
size.
 2014-05-01 18:51:57 -07:00
Andrzej Kapolka
b7e91e4fff Need to open the temporary file in order to get the path. 2014-05-01 16:27:50 -07:00
Andrzej Kapolka
02c757c940 Forgot to remove debugging code. 2014-05-01 16:13:03 -07:00
Andrzej Kapolka
6caa928e64 More work on avatar customization. 2014-05-01 16:12:20 -07:00
Andrzej Kapolka
c8877c31fe More work on setting model properties before upload. 2014-05-01 13:25:23 -07:00
Andrzej Kapolka
66e0cbf6ad Working on FBX uploads (i.e., without FST). 2014-04-30 18:34:43 -07:00
Atlante45
c664b4a087 Fixed JSON parsing 2014-04-18 17:04:38 -07:00
Atlante45
1121773154 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-18 16:56:34 -07:00
Atlante45
a040c997d8 ModelUploader update 2014-04-17 16:30:23 -07:00
Andrzej Kapolka
197127fbde Added ability to read FBX textures embedded in FBX files. 2014-04-17 15:42:23 -07:00
Andrzej Kapolka
a2dc58f7f9 Moved FBX code to its own library so that we can use it for bots. 2014-04-14 17:15:58 -07:00
Atlante45
ea93be15f1 Fixed dometime using wrong texdir 2014-04-10 12:44:51 -07:00
Atlante45
ef89b8c386 Removed extra line 2014-04-09 17:37:37 -07:00
Atlante45
fad71266a1 Merge branch 'master' of https://github.com/highfidelity/hifi into persistant_script_location 2014-04-09 17:35:12 -07:00
Atlante45
2b44b03a27 Added temp fix to ModelUploader dialog too 2014-04-09 17:34:17 -07:00