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

1662 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
51aafc3400 Merge pull request #95 from Ventrella/master 
housecleaning, and tidying of the avatar members, including making a head structure. Also, fixed avatar eyeball rotation bug
 2013-04-19 17:21:02 -07:00
Jeffrey Ventrella
08105c3898 I did a major cleanup of the Head class, including putting all the "head"-related members into a single structure. We may consider making a separate class just to handle the head. 2013-04-19 17:09:28 -07:00
ZappoMan
de209e9587 Merge pull request #94 from Ventrella/master 
improved logic of avatar hand movement and also usingBodySprings
 2013-04-19 15:18:46 -07:00
Jeffrey Ventrella
06f8990d42 removed avatar structure from Head class (leftover from the start of the prototyping phase) 2013-04-19 14:52:06 -07:00
Jeffrey Ventrella
9a93ab7d7c cleaned up logic for body springs mode and moving hand mode 2013-04-19 14:34:01 -07:00
ZappoMan
ef6f217aad Merge pull request #93 from Ventrella/master 
removed sneaky array out-of-bounds bug in avatar bone code
 2013-04-19 13:23:51 -07:00
Jeffrey Ventrella
d962230556 fixed sneaky array-out-of-bounds error in avatar bones and cleaned up some of the code for testing hand shake target positions 2013-04-19 12:44:09 -07:00
ZappoMan
a434f26939 Merge pull request #92 from Ventrella/master 
removed init values in HandMotion structure
 2013-04-18 21:33:16 -07:00
Jeffrey Ventrella
623c998439 removed init values in HandMovement structure 2013-04-18 21:31:20 -07:00
ZappoMan
2b1637eb0f Merge pull request #91 from Ventrella/master 
Implemented a more robust avatar hand movement system in main.cpp
 2013-04-18 21:19:22 -07:00
Jeffrey Ventrella
9dd423f544 removed updateAvatarHand function 2013-04-18 19:30:27 -07:00
Jeffrey Ventrella
ed5f117b04 Merge remote-tracking branch 'upstream/master' 2013-04-18 19:26:29 -07:00
Jeffrey Ventrella
298bc7eee9 added more robust avatar hand movement algorithm in main.cpp 2013-04-18 19:24:57 -07:00
tosh
bc9279917d Merge branch 'master' of git://github.com/worklist/hifi into 19188 
Conflicts:
	interface/src/starfield/renderer/Renderer.h
 2013-04-19 03:09:53 +02:00
tosh
715534154e numerous starfield fixes 2013-04-19 02:46:34 +02:00
ZappoMan
aed12a73c3 Merge pull request #89 from birarda/mixer-stats 
display avatar mixer stats below the voxel stats
 2013-04-18 17:02:23 -07:00
Stephen Birarda
daac10511e output avatar mixer stats below the voxel stats 2013-04-18 16:58:08 -07:00
birarda
c0791cafab Merge pull request #88 from birarda/mixer-stats 
remove debug line
 2013-04-18 16:39:20 -07:00
Stephen Birarda
d937ef17f6 remove extra debug line 2013-04-18 16:38:46 -07:00
ZappoMan
ffe3f4995d Merge pull request #87 from birarda/mixer-stats 
stats refactoring via change to SimpleMovingAverage
 2013-04-18 16:36:58 -07:00
Stephen Birarda
6e540d166b add a decay to the event delta average 2013-04-18 16:30:38 -07:00
Stephen Birarda
cf1254f53b rename the _movingAverage variable so it is more descriptive 2013-04-18 15:45:20 -07:00
Stephen Birarda
d0e3a96485 Merge remote-tracking branch 'upstream/master' into mixer-stats 2013-04-18 15:33:57 -07:00
Stephen Birarda
44cb57afad put back brad's voxel stats, he loves them too much 2013-04-18 15:33:17 -07:00
Stephen Birarda
588fc67cb9 add SimpleMovingAverage to each Agent, collect bytes received stats 2013-04-18 15:02:26 -07:00
ZappoMan
987553974a Merge pull request #86 from Ventrella/master 
reversed left-right strafe, commented-out updateAvatarHand
 2013-04-18 15:01:48 -07:00
Jeffrey Ventrella
2b5d23de5d Merge remote-tracking branch 'upstream/master' 2013-04-18 14:54:08 -07:00
Philip Rosedale
54cef39f51 Fixed problem with avatars rendering at 2X their location 2013-04-18 14:48:00 -07:00
Stephen Birarda
b9a1faf284 add a new SimpleMovingAverage class, replaces CounterStats 2013-04-18 14:46:39 -07:00
Jeffrey Ventrella
9ce1683c50 reversed strafe left right, and commented-out updateAvatarHand 2013-04-18 14:45:54 -07:00
Jeffrey Ventrella
449e05fd2a Merge remote-tracking branch 'upstream/master' 2013-04-18 14:13:27 -07:00
Jeffrey Ventrella
47ee938530 reversed x value in hand movement 2013-04-18 14:12:45 -07:00
Philip Rosedale
5443d80c6f Removed negation of front vector which was reversing yaw in avatar skeleton. 2013-04-18 14:00:48 -07:00
Philip Rosedale
daac59d64e Merge remote-tracking branch 'upstream/master' 2013-04-18 13:36:43 -07:00
Philip Rosedale
d9099b5f5a removed 2 unneeded debug lines 2013-04-18 13:34:37 -07:00
Philip Rosedale
a5018ad2cf Merge pull request #85 from Ventrella/master 
cleaned up Head.h (renamed members to start with "_")
 2013-04-18 13:26:26 -07:00
Jeffrey Ventrella
de6f33efa6 added "_" to all of Philip's old private members and tidied up the formatting in Head.h some 2013-04-18 13:16:36 -07:00
tosh
1e58f6fd40 fixes upside down aspect ratio 2013-04-18 20:02:24 +02:00
birarda
042bb7c332 Merge pull request #83 from ZappoMan/view_frustum_work 
Changed render_view_frustum() to handle broken camera yaw
 2013-04-18 11:00:29 -07:00
ZappoMan
74c5916519 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 
Conflicts:
	interface/src/main.cpp
 2013-04-18 10:57:41 -07:00
birarda
40efa0f0b8 Merge pull request #84 from birarda/master 
some logging fixes
 2013-04-18 10:47:56 -07:00
Stephen Birarda
651f7434a8 don't constantly print hand position to log 2013-04-18 10:46:44 -07:00
Stephen Birarda
b6b35f29e2 switch the Agent printLog back from hexadecimal notation 2013-04-18 10:46:10 -07:00
ZappoMan
894715598c fixed a comment 2013-04-18 08:49:07 -07:00
Philip Rosedale
a834c52b40 Quick attpemt to fix logging code 2013-04-18 07:48:57 -07:00
Philip Rosedale
8e19caf21c Merge remote-tracking branch 'upstream/master' 2013-04-18 07:23:06 -07:00
Philip Rosedale
f2694a2542 Merge pull request #65 from tschw/19262 
19262
 2013-04-18 07:18:46 -07:00
tosh
1e6352593a Merge branch 'master' of git://github.com/worklist/hifi into 19262 
Conflicts:
	interface/src/Head.cpp
	interface/src/Util.cpp
	interface/src/main.cpp
	libraries/avatars/src/Orientation.cpp
 2013-04-18 12:38:35 +02:00
ZappoMan
f0d891b641 Merge pull request #80 from PhilipRosedale/master 
Stars back on
 2013-04-18 01:38:42 -07:00
ZappoMan
c557bf66bb Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-18 01:25:34 -07:00