Sam Gateau
|
1b558e7390
|
investigating the semi transparent textured bug
|
2015-05-01 13:37:04 -07:00 |
|
Seth Alves
|
f75b599288
|
don't save default values in json file
|
2015-04-30 11:28:27 -07:00 |
|
Seth Alves
|
0fb1a83e3b
|
quiet compiler, remove some trailing control-Ms
|
2015-04-25 09:20:00 -07:00 |
|
Atlante45
|
bda72025af
|
Check mesh extend before going through triangles
|
2015-04-23 16:40:40 +02:00 |
|
Atlante45
|
99b3ef0d75
|
Move contain function to FBXGeometry
|
2015-04-22 21:17:12 +02:00 |
|
Sam Gateau
|
f06556ba12
|
migrate the various list to sort the rendering from explicit names to a more generic key based map
|
2015-04-16 14:37:39 -07:00 |
|
ZappoMan
|
ae16bab7c2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
|
2015-04-14 13:13:15 -07:00 |
|
Seth Alves
|
efa5c473d2
|
add fatten-faces mode to convex-hull tool for use on meshes which were derived from height-fields
|
2015-04-09 14:29:17 -07:00 |
|
Sam Gateau
|
f0efade06d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2015-04-07 12:56:21 -07:00 |
|
Seth Alves
|
9014397167
|
try again without macro
|
2015-04-07 09:59:04 -07:00 |
|
Sam Gateau
|
dee651069c
|
adding support for color attribute in FBX, and displaying it correctly
|
2015-04-06 23:33:13 -07:00 |
|
Seth Alves
|
8bd77fbcc7
|
separate out logging for fbx and gpu libraries
|
2015-04-06 16:52:31 -07:00 |
|
Seth Alves
|
7af32bd67a
|
put audio and script-engine logging into their own QLoggingCategory
|
2015-04-06 15:57:18 -07:00 |
|
Seth Alves
|
2fbfa34c5c
|
removed uneeded logging
|
2015-04-06 09:14:53 -07:00 |
|
ZappoMan
|
7f4c577e80
|
end of file
|
2015-04-03 17:25:39 -07:00 |
|
ZappoMan
|
1a463a0256
|
more work on improved avatar UI adding model names and backward compatible support
|
2015-04-03 17:03:22 -07:00 |
|
Seth Alves
|
00449ef7c0
|
new member variable to remember the order in which meshes appeared in the model file
|
2015-04-01 17:50:35 -07:00 |
|
Seth Alves
|
36cd69c38a
|
new member variable to remember the order in which meshes appeared in the model file
|
2015-04-01 17:50:20 -07:00 |
|
Seth Alves
|
420424a5ee
|
make it possible to sort meshes into the same order they appear in the model file
|
2015-04-01 17:49:49 -07:00 |
|
Seth Alves
|
bacd6445f2
|
pull comments that get used as scaling hints into a hash table
|
2015-03-31 16:59:13 -07:00 |
|
Seth Alves
|
48144a46b1
|
don't keep empty mesh-parts. take units hint from a common first-line comment, if it's there.
|
2015-03-31 14:34:35 -07:00 |
|
Philip Rosedale
|
5325478940
|
Merge pull request #4528 from ZappoMan/avatarUI
Support for Auto-detecting FST type, and adding type hint to FST files when packaged
|
2015-03-30 21:31:22 -07:00 |
|
ZappoMan
|
0366ce9bf5
|
removed dead code
|
2015-03-30 17:33:25 -07:00 |
|
ZappoMan
|
002fba8018
|
first cut at predicting FST type for set avatar
|
2015-03-27 16:56:03 -07:00 |
|
ZappoMan
|
baa2f947e5
|
classifying FSTReader and moving ModelType into that class
|
2015-03-27 16:30:00 -07:00 |
|
Seth Alves
|
fd69a54f10
|
Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions
|
2015-03-27 15:55:20 -07:00 |
|
Seth Alves
|
cfa30594cc
|
make obj reader handle faces with more than 4 vertices
|
2015-03-27 14:24:36 -07:00 |
|
ZappoMan
|
6189926105
|
add type hint to FST in model packager
|
2015-03-27 13:23:29 -07:00 |
|
Atlante45
|
e16c8852fb
|
extra ;
|
2015-03-27 14:43:09 +01:00 |
|
Atlante45
|
daaba330d5
|
Turn lambda into helper function
|
2015-03-27 14:41:32 +01:00 |
|
Atlante45
|
c26b499671
|
Add forgotten include
|
2015-03-26 15:58:18 +01:00 |
|
Atlante45
|
716e9bfe4f
|
Hint order for FST files
|
2015-03-26 15:40:48 +01:00 |
|
Seth Alves
|
a2bc34ced9
|
fix attempt to avoid normalizing a zero length vector, other adjustments to respond to code review
|
2015-03-16 10:03:55 -07:00 |
|
Seth Alves
|
b15fd2ef94
|
compatibility and other fixes for obj reader
|
2015-03-15 08:08:39 -07:00 |
|
Seth Alves
|
ab8784f1b4
|
add comment about character capsule being hard-coded
|
2015-03-09 13:51:08 -07:00 |
|
Seth Alves
|
0833fc588b
|
coding standard
|
2015-03-09 06:56:35 -07:00 |
|
Seth Alves
|
3604fd639a
|
formatting
|
2015-03-08 20:03:10 -07:00 |
|
Seth Alves
|
804d4a0963
|
coding standard
|
2015-03-07 20:31:37 -08:00 |
|
Seth Alves
|
05e0fe3536
|
object display correctly now?
|
2015-03-07 11:28:30 -08:00 |
|
Seth Alves
|
f807384dfe
|
build a joint and caclulate extents. obj models now show up, though not correctly.
|
2015-03-07 07:55:04 -08:00 |
|
Seth Alves
|
591edc0527
|
_mesh instance variable doesn't appear to be in use.
|
2015-03-07 07:51:47 -08:00 |
|
Seth Alves
|
6e79fc8b68
|
Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide
|
2015-03-06 18:46:13 -08:00 |
|
ZappoMan
|
ffab6ffe48
|
tweaks to hacks for detecting mixamo files
|
2015-03-06 15:11:02 -08:00 |
|
Seth Alves
|
858d15d0ba
|
obj reader sort-of works
|
2015-03-06 13:15:53 -08:00 |
|
Stephen Birarda
|
44f8e599e2
|
test the possibility that zlib is no longer required
|
2015-02-19 15:29:28 -08:00 |
|
Stephen Birarda
|
b2e587dbbd
|
remove use of include_dependency_includes and use cmake
|
2015-02-18 14:12:05 -08:00 |
|
Stephen Birarda
|
c110fcbfad
|
merge with upstream/master
|
2015-02-17 17:34:48 -08:00 |
|
Stephen Birarda
|
e99012efbb
|
updates to build guides to remove soxr
|
2015-02-17 10:33:12 -08:00 |
|
Andrew Meadows
|
53855c89e9
|
Merge pull request #4289 from birarda/dependencies
add gverb and glm as cmake external projects
|
2015-02-17 10:00:29 -08:00 |
|
Stephen Birarda
|
8c998a65ee
|
use the glm find_package and check externals
|
2015-02-13 12:50:32 -08:00 |
|