Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 22:36:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
10722 commits 76 branches 59 tags 1.2 GiB
Commit graph

291 commits

Author SHA1 Message Date
Andrzej Kapolka
b4cb1457a2 Do a simple frustum check for rendering the avatar or doing a full joint 
update.  Closes #2071.
 2014-03-13 13:29:18 -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
bab74e9cd4 Push the distance back even more. 2014-03-12 15:01:09 -07:00
Andrzej Kapolka
889c1358fc Increase the distance at which avatars glow when moving. 2014-03-12 14:56:52 -07:00
Andrzej Kapolka
f088912ecf More GCC warning fixes. 2014-03-12 12:51:43 -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
Stephen Birarda
d1623e6e4d fixes for warnings produced by Xcode 5.1 2014-03-11 11:45:13 -07: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
87d908a3bc resolve conflicts on merge with upstream master 2014-03-06 15:03:03 -08:00
Stephen Birarda
5373cbbb9b Merge pull request #2228 from josecpujol/fix_2198 
Changed the up vector for computing the scale factor: it failed when
 2014-03-06 14:49:13 -08:00
Stephen Birarda
27d486c0a1 resolve conflicts on merge with upstream master 2014-03-06 14:47:58 -08:00
Jose Carlos
8e81c4c467 Changed the up vector for computing the scale factor: it failed when 
there was a roll in the view
 2014-03-06 21:49:36 +01: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
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
3930b3e824 Display names are great, but not in the shadow map. Closes #2208. 2014-03-05 17:44:08 -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
Andrew Meadows
7ba5bc71ea Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 
Conflicts:
	interface/src/renderer/FBXReader.cpp
	interface/src/renderer/Model.cpp
	interface/src/renderer/Model.h
 2014-03-04 09:01:24 -08:00
Andrzej Kapolka
64c4e58160 Tie the avatar LOD distance multiplier to the LOD parameter calculated for 
voxels.
 2014-03-03 16:34:28 -08:00
Andrzej Kapolka
75c9e44545 Render the billboard if we don't have both models. Closes #2178. 2014-03-03 15:33:37 -08:00
Andrzej Kapolka
0361f46832 Don't simulate avatars' models when they're being rendered as billboards. 
Closes #2165.
 2014-03-03 12:09:38 -08:00
Andrzej Kapolka
21a149348b When switching models, retain old one until new one is loaded. Closes #2146. 2014-02-28 13:57:25 -08:00
Andrzej Kapolka
2639796402 Wait until both head and body are loaded before rendering. Closes #2145. 2014-02-28 12:22:10 -08:00
Andrew Meadows
50a5924574 Using shapes for collisions against Model 
rather than building tapered capsule shapes on the fly
 2014-02-27 17:33:36 -08:00
Andrzej Kapolka
cd2bd32210 Delay loading models until we know that we need them (i.e., that we're not 
beyond billboard distance).  Closes #2121.
 2014-02-27 12:30:46 -08:00
Andrew Meadows
5954bb91d4 ListShape now handled by ShapeCollider 2014-02-26 15:36:19 -08:00
ZappoMan
d4c36acd7d fix windows warning 2014-02-25 18:43:31 -08:00
Andrzej Kapolka
5d99b06a48 Use hysteresis to prevent rapid enabling and disabling of billboard. Closes 2014-02-25 16:12:58 -08:00
ZappoMan
23b2d7d124 Merge pull request #2073 from josecpujol/19489 
19489
 2014-02-25 13:34:39 -08:00
Philip Rosedale
11e9b18a98 Don’t render avatar ‘sphere’ unless there is voice intensity 2014-02-25 12:35:14 -08:00
Jose Carlos
64e75bb4ab fixed typo 2014-02-25 00:19:52 +01:00
Jose Carlos
ae87ab3b79 Undone a change to try to prevent the decay effect in the text rendering 2014-02-24 23:26:42 +01:00
Jose Carlos
2bf3d2547a Merge remote-tracking branch 'upstream/master' into 19489 2014-02-24 22:03:03 +01:00
Jose Carlos
c8c371b6f4 Changed the displayname background rect: instead of having squared 
corners, they are bevel
Added some test code to prevent the decay effect in the text rendering
 2014-02-24 22:02:06 +01:00
Stephen Birarda
9771e1bb12 resolve conflicts on merge with upstream master 2014-02-24 12:06:10 -08:00
Andrzej Kapolka
d80b52dc9f Fixes for camera mode transitions, seeing inside head. 2014-02-24 11:33:52 -08:00
Philip Rosedale
b0f3ab3ccd Merge pull request #2057 from ey6es/master 
I believe this is what was intended for the voxel edit orbit behavior.  Yaw the body, pitch the head.
 2014-02-23 17:22:07 -08:00
Andrzej Kapolka
6f8f15018c Allow setting the combined head orientation, which changes the body yaw and 
applies the rest to the head.  Closes #2050.
 2014-02-21 17:52:20 -08:00
Andrzej Kapolka
ac02609bc2 The basic billboard behavior, closes #1864. 2014-02-21 15:38:49 -08:00
Stephen Birarda
340248ac43 resolve conflicts on merge with upstream master 2014-02-21 15:16:15 -08:00
Jose Carlos
10c9b902b9 Removed duplicated calculation of bounding rect for display name 2014-02-21 00:37:29 +01:00
Jose Carlos
354c9bff09 Correct text position for default and non default meshes 
Bounding box for text background is now text dependent, much nicer now
 2014-02-21 00:29:52 +01:00
Jose Carlos
fa490acb8d Changed the display name background alpha to 0.2 (was 0.95) 2014-02-20 20:45:32 +01:00
Stephen Birarda
6f84230d9d resolve conflicts on merge with upstream/master 2014-02-20 10:14:36 -08:00
Jose Carlos
241214ba37 Fixed compilation after merged from upstream 2014-02-19 23:08:19 +01:00