Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-05 15:59:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
22954 commits 25 branches 0 tags 1.1 GiB
Commit graph

74 commits

Author SHA1 Message Date
David Rowe
3d11dde8ad Check that the user configures a skeleton root joint 
Instead of just checking that the model has a "Hips" joint.
 2015-03-10 20:27:31 -07:00
David Rowe
e57d63b20e Merge branch 'master' into 20369 2015-03-10 18:55:27 -07:00
ZappoMan
89f3a091f1 remove debugging 2015-03-10 09:02:35 -07:00
ZappoMan
2a5d25e010 more hacking on mixamo pipeline files 2015-03-09 16:02:07 -07:00
David Rowe
ba92254385 Fix skeleton detection when uploading avatar model 2015-03-09 13:31:54 -07:00
ZappoMan
559945c0c6 temporarily remove skeleton check from upload 2015-03-09 10:50:09 -07:00
Brad Hefta-Gaub
80675f8459 Merge pull request #4391 from ZappoMan/fbxFixes 
different mixamo detection
 2015-03-08 11:42:29 -07:00
Brad Hefta-Gaub
e2a367607a Merge pull request #4384 from ctrlaltdavid/20369 
CR for Job #20369 - Uploaded avatars without skeletons crash Interface
 2015-03-08 11:42:07 -07:00
ZappoMan
7088c0287a different mixamo detection 2015-03-06 18:29:22 -08:00
ZappoMan
ffab6ffe48 tweaks to hacks for detecting mixamo files 2015-03-06 15:11:02 -08:00
David Rowe
8686e090c9 Don't upload skeletonless avatar model to HiFi servers 2015-03-03 22:34:07 -08:00
Brad Hefta-Gaub
de58c4a007 Merge pull request #4217 from Atlante45/master 
Fix for fps bug/field of view
 2015-02-03 19:13:52 -08:00
Andrew Meadows
35cbc9a41d pass FBXGeometry by const reference 
this fixes a bug on windows about misaligned data in function call
 2015-02-03 18:40:55 -08:00
Atlante45
09a9f82256 More settings update 2015-02-03 10:52:50 -08:00
Atlante45
1cfd98b2d7 Name threads 2015-01-31 00:50:12 -08:00
David Rowe
5474c0634e Merge branch 'master' into 20277 
Conflicts:
	libraries/script-engine/src/ScriptEngine.cpp
 2015-01-30 13:49:45 -08:00
David Rowe
812fbc58fb Use custom User-Agent string 2015-01-23 19:13:29 -08:00
Atlante45
6a00dcbf0a More switches to new Settings 2015-01-20 00:30:29 -08:00
Atlante45
c2b7ff1b54 Totally removed Application's setting memember 2015-01-18 19:10:30 -08:00
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