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

1432 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
ZappoMan
532dc285e7 Changed render_view_frustum() to handle broken camera yaw 
- I discovered that the Camera class has a Yaw that is actually
  180deg off of true yaw. So when the avatar is facing at a yaw
  of 0deg, we were setting the camera to 180. This was causing
  the direction vectors to be rotated from where we expected them
  to be, and as a result the frustum was wrong
- I did not fix the camera and the calls to glRotate() since I
 don't yet understan how these work. BUT. I did fix the frustum
 code to fix up this yaw before calculating the vectors
 2013-04-18 01:16:54 -07:00
Philip Rosedale
a1d51f8db8 Merge remote-tracking branch 'upstream/master' 2013-04-18 00:20:47 -07:00
Philip Rosedale
ad30abdf20 sphere on 2013-04-18 00:20:22 -07:00
Philip Rosedale
1dd2fcf37d Merge pull request #81 from ZappoMan/view_frustum_work 
Updated Orientation class to use Philip's technique.
 2013-04-18 00:18:19 -07:00
ZappoMan
309eb08490 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-17 23:53:47 -07:00
Philip Rosedale
23dc5f435b Merge remote-tracking branch 'upstream/master' 2013-04-17 23:45:36 -07:00
ZappoMan
44e6fcc5e9 remove pitch from camera since it still breaks Orientation 2013-04-17 23:42:39 -07:00
Philip Rosedale
f4acdda922 Merge pull request #74 from Ventrella/master 
removed initilalizeAvatar() (deprecated)
 2013-04-17 23:41:06 -07:00
ZappoMan
8b9e252246 Updated Orientation class to use Philip's technique. 
- Changed Orientation class to use Philip's technique for determining vectors
- updated main.cpp to take command line option to run Orientation tests
- tweaked eulerToOrthonormals() to return right vector instead of left vector
 2013-04-17 23:21:12 -07:00
Jeffrey Ventrella
bca2460395 Merge remote-tracking branch 'upstream/master' 2013-04-17 23:20:08 -07:00
Jeffrey Ventrella
bd0eb9f69c renamed Yaw Pitch Roll to _headYaw, _headPitch, _headRoll, in Head class. And also added a "bigSphere avatar collision test", also added a bone radius (for collision detection) 2013-04-17 23:18:36 -07:00
Philip Rosedale
f70429e575 Added a translucent ground plane, and made a few more grid lines. Easier to see when 'standing' on. 2013-04-17 22:47:58 -07:00
Philip Rosedale
bb2cc54c97 Stars turned back on by default - lemme know if anyone sees problems. 2013-04-17 22:23:19 -07:00
Philip Rosedale
b7346474d0 Merge pull request #71 from tschw/19188 
19188
 2013-04-17 22:15:39 -07:00
ZappoMan
e51031c464 Merge pull request #78 from ZappoMan/view_frustum_work 
Added more tests for Orientation
 2013-04-17 21:14:37 -07:00
ZappoMan
de102d1799 Merge pull request #79 from PhilipRosedale/master 
Created eulerToOrthonormals function to (hopefully) help Brad
 2013-04-17 21:14:16 -07:00
Philip Rosedale
d200936615 Added eulerToOrthonormals function for Brad in Util.cpp, sample execution at start of main. 2013-04-17 21:10:31 -07:00
Philip Rosedale
64eed6dfab Merge remote-tracking branch 'upstream/master' 2013-04-17 19:41:23 -07:00
Jeffrey Ventrella
46c95ea4af did some code cleanup in Head class and added some _isMine checks to differentiate between my av and others 2013-04-17 18:28:26 -07:00
ZappoMan
a64fca17c5 Added more tests for Orientation 2013-04-17 18:25:12 -07:00
Jeffrey Ventrella
6b8fe0cba1 Merge remote-tracking branch 'upstream/master' 2013-04-17 18:11:38 -07:00
Jeffrey Ventrella
4e12f26467 added _isMine check for my _bodyYaw update 2013-04-17 18:10:32 -07:00
birarda
43fe377881 Merge pull request #77 from birarda/master 
fix incorrect number of bytes for broadcast
 2013-04-17 18:00:53 -07:00
Stephen Birarda
3538e2cf5b fix the number of bytes used for head broadcast 2013-04-17 17:59:59 -07:00
Philip Rosedale
6ad12e15ed Merge remote-tracking branch 'upstream/master' 2013-04-17 17:51:32 -07:00
Jeffrey Ventrella
de3de7b878 Merge remote-tracking branch 'upstream/master' 2013-04-17 17:50:08 -07:00
Philip Rosedale
557bf79e0a body yaw debugging (commented out) 2013-04-17 17:49:26 -07:00
Jeffrey Ventrella
aba20c6afd a few debugging changes 2013-04-17 17:48:08 -07:00
birarda
27adc1f84b Merge pull request #76 from birarda/master 
remove a debug line
 2013-04-17 17:43:55 -07:00
Stephen Birarda
24994f3561 remove extra debug line left over from mutex fixes 2013-04-17 17:43:30 -07:00