Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 06:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
11257 commits 25 branches 0 tags 1.1 GiB
Commit graph

370 commits

Author SHA1 Message Date
Andrzej Kapolka
ca9f0c01c1 Couple of quick fixes: reset the skeleton joints when space is pressed as a 
last resort to fix broken IK, don't render display names at the origin if
we don't have a skeleton model.
 2014-03-27 11:08:55 -07:00
Andrew Meadows
fff7a36b54 merge upstream/master into physics project 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/Hand.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	interface/src/renderer/Model.h
 2014-03-25 15:55:26 -07:00
Andrzej Kapolka
62884f1f4f Don't use textures/fancy shaders when rendering shadow map. Closes #2270. 2014-03-24 13:15:03 -07:00
Andrzej Kapolka
56ff423cf5 Let's actually use the result of our format conversion. 2014-03-20 14:27:38 -07:00
Andrzej Kapolka
e34f2ca69b Remove file texture loading (since we can just use file URLs), don't add alpha 
channels for opaque textures (and note when textures with alpha channels are
entirely opaque), enforce a maximum texture size of 1024 by 1024.
 2014-03-19 16:11:15 -07:00
Andrzej Kapolka
0fc0d50bda Only post the blender if we have blendable meshes to blend. 2014-03-18 17:19:42 -07:00
Andrzej Kapolka
635f3b6dc3 Perform the mesh blending in worker threads and only when we've actually 
received new data.  Closes #2075.  Closes #2348.
 2014-03-18 16:38:05 -07:00
Andrzej Kapolka
299dbb93ea Removed "springiness" bits. 2014-03-18 13:57:36 -07:00
Andrew Meadows
02c58447df merge upstream/master into "shapes" project 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	libraries/avatars/src/HandData.h
	libraries/shared/src/SharedUtil.h
 2014-03-18 12:41:20 -07:00
Andrzej Kapolka
5b30f932c1 Fix for slight graphical glitches on loading avatars. 2014-03-13 14:09:12 -07:00
Andrzej Kapolka
43feef3ebd Only update the full set of joints when we've received new data from the 
mixer.  Closes #2274.
 2014-03-13 12:03:02 -07:00
Andrzej Kapolka
ffe3717573 Enable back face culling on the opaque parts of avatars. 2014-03-12 15:10:33 -07:00
Andrzej Kapolka
f088912ecf More GCC warning fixes. 2014-03-12 12:51:43 -07:00
Andrzej Kapolka
e249b29b45 Merge pull request #2268 from AndrewMeadows/radians 
prefer radians over degrees
 2014-03-12 12:10:29 -07:00
AndrewMeadows
1f80a5a074 Merge pull request #2269 from ey6es/master 
Fix for white flashes when loading avatars, performance improvements.
 2014-03-12 11:43:13 -07:00
Andrew Meadows
793a760272 merge upstream master into "radians" project 2014-03-11 17:28:36 -07:00
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
Andrzej Kapolka
f8e6593bcf Turn off mipmaps. Performance is actually substantially better without them. 2014-03-11 15:24:14 -07:00
Andrzej Kapolka
bc3bba9240 Get rid of unused, expensive "average color" nonsense. 2014-03-11 14:01:23 -07:00
Andrzej Kapolka
7d1a44fbea Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-11 12:52:13 -07:00
Andrzej Kapolka
3b63424abd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-10 12:27:07 -07:00
Andrzej Kapolka
34ddddae1b Basic LRU cache. Closes #2234. 2014-03-10 12:06:07 -07:00
Andrzej Kapolka
9731159b82 Merge branch 'master' of https://github.com/highfidelity/hifi into joints 2014-03-10 10:57:48 -07:00
Andrzej Kapolka
c6655382d6 Initialize scale to unity. Closes #2232. 2014-03-10 10:52:46 -07:00
Andrzej Kapolka
d2f947aee1 Working on LRU cache for resources. 2014-03-10 10:49:38 -07:00
Andrew Meadows
47e340dafe Merge upstream/master 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-03-07 09:16:33 -08:00
Andrzej Kapolka
44374732fa Further joint bits. 2014-03-06 19:30:24 -08:00
Andrzej Kapolka
c5ab32235f Merge branch 'master' of https://github.com/highfidelity/hifi into joints 2014-03-06 17:09:24 -08:00
Andrzej Kapolka
3adea84b81 Basic joint data sending. Closes #2166. 2014-03-06 17:07:29 -08:00
Stephen Birarda
1ef780c6cb make headers coding standard compliant 2014-03-06 16:24:58 -08:00
Stephen Birarda
7ef882c525 make sure InterfaceConfig is included before Qt headers 2014-03-06 16:14:18 -08:00
Stephen Birarda
27d486c0a1 resolve conflicts on merge with upstream master 2014-03-06 14:47:58 -08:00
Stephen Birarda
06743f771f remove a double InterfaceConfig incldue in AmbientOcclusionEffect 2014-03-06 12:49:01 -08:00
Andrew Meadows
868e92c0fa Merge upstream/master' into shapes branch 2014-03-06 12:45:43 -08:00
Andrew Meadows
778bdec6d8 Model now knows its bounding radius 2014-03-06 12:34:21 -08:00
Stephen Birarda
b705ec560f cleanup resources directory references by copying beside the executable 2014-03-06 11:46:49 -08:00
Stephen Birarda
403f91c988 update resource references to use Qt resource system 2014-03-06 10:41:11 -08:00
Stephen Birarda
90d4bbee78 Merge branch 'master' of https://github.com/highfidelity/hifi into external-glm 2014-03-06 09:16:22 -08:00
Andrzej Kapolka
0448596e58 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/renderer/FBXReader.cpp
 2014-03-05 18:28:25 -08:00
Andrzej Kapolka
a7af3bc284 Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-03-05 18:08:59 -08:00
Andrzej Kapolka
ad25455f86 Track hysteresis for next model separately, but just in case, don't use 
recursion to fall back on hysteresis value.  Closes #2209.
 2014-03-05 18:06:14 -08:00
Andrew Meadows
831a8cf580 remove unused cruft from Model class API 2014-03-05 12:15:34 -08:00
Andrew Meadows
a1856ac18b fix bad transform math for placing shapes 2014-03-05 11:57:07 -08:00
Andrew Meadows
89f664c0ee fixing incorrect documentation comment 2014-03-05 11:52:47 -08:00
Andrew Meadows
2bc8e142b4 cruft removal 2014-03-05 11:51:42 -08:00
Andrew Meadows
7db5aaaf37 new collision pipeline for avatar shapes 2014-03-05 07:08:59 -08:00
Stephen Birarda
7451cfe130 remove glm so it is referenced only externally 2014-03-04 15:19:47 -08:00
Andrzej Kapolka
7a182ed659 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-04 13:10:23 -08:00
Andrzej Kapolka
1357aee01e Use mipmaps and trilinear filtering for models. Closes #2180. 2014-03-04 13:03:31 -08:00
Andrew Meadows
57e217c7fb Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 2014-03-04 12:10:12 -08:00