Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 11:14:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
3266 commits 71 branches 56 tags 1.2 GiB
Commit graph

3266 commits

This branch
This branch
All branches
Author SHA1 Message Date
birarda
c8bc2f0f14 Merge pull request #454 from birarda/camera-fix 
one line fix for camera transition
 2013-05-29 15:32:30 -07:00
Stephen Birarda
02333644dc one line fix in AvatarTouch 2013-05-29 15:31:18 -07:00
birarda
23e24287d3 Merge pull request #452 from ZappoMan/master 
Temporary hack fix to voxels not discarding
 2013-05-29 12:16:06 -07:00
ZappoMan
c70ade0cc1 temporary hack fix to not discarding voxels 2013-05-29 12:14:45 -07:00
Philip Rosedale
eb4c2358a5 Merge pull request #451 from Ventrella/master 
increased hand motion sensitivity
 2013-05-29 11:52:39 -07:00
Jeffrey Ventrella
ab1c00dac6 Merge remote-tracking branch 'upstream/master' 2013-05-29 11:51:34 -07:00
Jeffrey Ventrella
e34193f1d7 increased hand motion sensitivity 2013-05-29 11:51:16 -07:00
ZappoMan
408fef0de8 Merge pull request #450 from birarda/master 
make audio echo a menu option instead of forcing it with the mirror mode
 2013-05-29 11:47:38 -07:00
Stephen Birarda
b6a0662c98 inline the shouldEchoAudio 2013-05-29 11:47:02 -07:00
Philip Rosedale
7fc8b6932d Merge pull request #448 from Ventrella/master 
transparency fix
 2013-05-29 11:44:34 -07:00
Jeffrey Ventrella
ab3b0c8aa3 alpha 2013-05-29 11:43:42 -07:00
Stephen Birarda
a5a30efec9 CR fixes 2013-05-29 11:42:10 -07:00
Jeffrey Ventrella
f02e8dae23 Merge remote-tracking branch 'upstream/master' 2013-05-29 11:40:19 -07:00
Jeffrey Ventrella
350bd878fc fix 2013-05-29 11:39:53 -07:00
Stephen Birarda
5d74a865e8 make audio echo a menu option instead of forcing with mirror 2013-05-29 11:35:32 -07:00
ZappoMan
0443942ccb Merge pull request #449 from birarda/mixer-crash 
temporary fix for mixer crash
 2013-05-29 11:35:26 -07:00
Stephen Birarda
76f7752f2f remove debugging used to track down mixer crash 2013-05-29 11:31:46 -07:00
Stephen Birarda
56e0e3882d kill agents who send NaN bearings 2013-05-29 11:29:38 -07:00
Jeffrey Ventrella
39805db040 Merge remote-tracking branch 'upstream/master' 2013-05-29 11:27:36 -07:00
Jeffrey Ventrella
39499e4a92 fix to head transparency 2013-05-29 11:26:06 -07:00
Stephen Birarda
1fb61faded fix the isnan check for agent bearing 2013-05-29 11:22:25 -07:00
Stephen Birarda
f45062a097 don't use audio when the bearing sent by the agent is garbage 2013-05-29 11:14:50 -07:00
Stephen Birarda
78df9fb2ed last pieces of debugging for mixer crash 2013-05-29 11:04:46 -07:00
Stephen Birarda
2a1357e8e1 more debugging to track down a mixer crash 2013-05-29 11:00:51 -07:00
Stephen Birarda
ad95190e15 add debugging for current mixer crash 2013-05-29 10:52:20 -07:00
Philip Rosedale
a3a5241672 Merge pull request #447 from PhilipRosedale/one-liner 
fix for translucent head
 2013-05-29 10:47:45 -07:00
Philip Rosedale
c31c14c56e Merge remote-tracking branch 'upstream/master' into one-liner 2013-05-29 10:46:55 -07:00
Philip Rosedale
ca8c78162d one line fix for translucent head 2013-05-29 10:46:10 -07:00
Philip Rosedale
01b0efbb66 Merge pull request #446 from Ventrella/master 
fixed some glitches in avatar render alpha transition between 3p and 1p
 2013-05-29 09:42:27 -07:00
Jeffrey Ventrella
31ff768363 fixed some glitches in avatar render alpha transition between 3p and 1p 2013-05-29 08:30:14 -07:00
ZappoMan
6ff2d1a102 Merge pull request #444 from Ventrella/master 
fixed bug causing camera to not get updated position of other avatar
 2013-05-28 18:56:17 -07:00
Jeffrey Ventrella
0e329af03e made inline 2013-05-28 18:55:21 -07:00
Jeffrey Ventrella
b98d03337d fixed bug causing camera to not get updated position of other av 2013-05-28 18:49:16 -07:00
Jeffrey Ventrella
a30936c57c Merge pull request #443 from Ventrella/master 
AVATAR_FACING_THRESHOLD
 2013-05-28 18:16:40 -07:00
Jeffrey Ventrella
e4c0aeb9a0 added AVATAR_FACING_THRESHOLD to avatarTouch 2013-05-28 18:15:29 -07:00
birarda
0d81d0a451 Merge pull request #442 from Ventrella/master 
camera bug
 2013-05-28 18:00:23 -07:00
Jeffrey Ventrella
82683dbabc merge 2013-05-28 17:58:02 -07:00
Jeffrey Ventrella
5d9b8c08b3 Merge remote-tracking branch 'upstream/master' 2013-05-28 17:57:42 -07:00
Jeffrey Ventrella
923c39cdc0 fixed third person shift bug 2013-05-28 17:57:11 -07:00
ZappoMan
36fed3db9c Merge pull request #441 from birarda/master 
fix a couple of warnings
 2013-05-28 16:28:27 -07:00
Stephen Birarda
65f10cb99a fix the enum in AABox, fix a warning in Head 2013-05-28 16:26:18 -07:00
ZappoMan
221f581fdd Merge pull request #440 from birarda/master 
fix silent audio on client
 2013-05-28 16:24:53 -07:00
Stephen Birarda
8118e3bf69 type squish in Audio.cpp 2013-05-28 16:23:54 -07:00
Stephen Birarda
55954899e6 fix silent audio on client 2013-05-28 16:20:23 -07:00
ZappoMan
ccc04688d2 Merge pull request #439 from birarda/mouth-render 
move _audioLoudness to HeadData
 2013-05-28 16:06:44 -07:00
Stephen Birarda
badab39ef1 resolve conflict on merge with upstream master 2013-05-28 15:58:57 -07:00
Stephen Birarda
e040c927f5 Merge remote-tracking branch 'upstream/master' into mouth-render 2013-05-28 15:58:11 -07:00
birarda
17e3902d17 Merge pull request #435 from Ventrella/master 
Integrated mohawk code, and did some cleanup and improvements on avatar
 2013-05-28 15:50:48 -07:00
Stephen Birarda
9f2c0adec7 move audioLoudness to HeadData 2013-05-28 12:22:51 -07:00
Philip Rosedale
d3c9d60cd6 Merge pull request #437 from ey6es/master 
Sphere/box and capsule/box collisions for voxels; allows us to slide along and stand on voxels.  Also a couple build fixes.
 2013-05-27 22:07:09 -07:00