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

758 commits

Author SHA1 Message Date
Stephen Birarda
cfbe8a719c fix getter for hand state in AvatarData 2013-04-24 12:39:25 -07:00
Andrzej Kapolka
63a581dae4 Added normals to voxel geometry, enabling lighting. 2013-04-24 11:47:44 -07:00
Jeffrey Ventrella
ee9ae3f220 improved avatar hand-holding logic 2013-04-24 08:13:15 -07:00
Jeffrey Ventrella
8135a45ccf removed pinky orientation lines in avatar bones 2013-04-23 22:05:02 -07:00
Jeffrey Ventrella
54aac82e9c cleanup 2013-04-23 21:30:53 -07:00
Jeffrey Ventrella
61a17060c3 one more glitch... 2013-04-23 21:17:39 -07:00
Jeffrey Ventrella
48da3f726e fixed bug - didn't change bodyPosition in eve or voxel 2013-04-23 21:07:40 -07:00
Jeffrey Ventrella
428cb89895 Merge remote-tracking branch 'upstream/master' 2013-04-23 20:44:50 -07:00
Jeffrey Ventrella
61d7a82fc6 made lots of changes in the logic of how my avatar encounters other avatars and detects hand state 2013-04-23 20:44:12 -07:00
Jeffrey Ventrella
eb631e2ef6 renamed "bodyPosition" to "position". (This corresponds to the position of the avatar on the ground, where y=0). I will next add a new "getBodyPosition" which returns the avatar's center of gravity - is useful for certain purposes, such as setting collision volumes, etc. 2013-04-23 14:05:23 -07:00
Jeffrey Ventrella
a73ea8c255 some preparation for adding hand state to avatar interactions 2013-04-23 13:48:34 -07:00
Stephen Birarda
42ba5a51d4 Merge remote-tracking branch 'upstream/master' 2013-04-23 13:38:59 -07:00
Stephen Birarda
7ae320d7e1 intial version of eve that says WALL-E every so often 2013-04-23 13:37:49 -07:00
Jeffrey Ventrella
e19d4fd5f9 changes from Philip's push - I assume 2013-04-23 12:23:08 -07:00
Jeffrey Ventrella
a1e3149d6a Merge remote-tracking branch 'upstream/master' 2013-04-23 12:20:26 -07:00
Philip Rosedale
90c56e796b One... last.... const.... 2013-04-23 12:07:12 -07:00
Philip Rosedale
5556686875 Fixes from brad's review 2013-04-23 11:59:43 -07:00
Philip Rosedale
7aea9d1e61 Fixed :: prefix for local variables 2013-04-23 11:21:36 -07:00
Philip Rosedale
2ef45e8512 Avatar head rotation, audio loudness (for facial animation) and hand state (grabbing or not) now sent in broadcast data. 2013-04-23 11:15:11 -07:00
Jeffrey Ventrella
8e27a69e92 Merge remote-tracking branch 'upstream/master' 2013-04-23 11:13:24 -07:00
Jeffrey Ventrella
8df6a7e056 added collision code for avatar (not operational yet). and some cleanup. 2013-04-23 11:12:38 -07:00
Philip Rosedale
9760b7d410 First commit to re-enable gyros, removed various old head_mirror variables, now use 'lookingInMirror', etc. Local gyros now correctly drive own head. 2013-04-23 09:47:52 -07:00
Stephen Birarda
4956370d52 have parseData return the number of bytes consumed 2013-04-22 18:05:27 -07:00
Jeffrey Ventrella
1524bd55a8 Merge remote-tracking branch 'upstream/master' 2013-04-22 17:42:07 -07:00
Jeffrey Ventrella
602fd94af2 a few cleanups 2013-04-22 17:41:12 -07:00
birarda
2d8092eaf7 Merge pull request #106 from Ventrella/master 
Improved avatar rendering
 2013-04-22 17:33:42 -07:00
ZappoMan
978a41f6ca Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-22 17:22:24 -07:00
ZappoMan
4e0a3e3b58 switch to boxInFrustum() instead of pointInFrustum() for more accuracy 2013-04-22 17:21:47 -07:00
Jeffrey Ventrella
9a53832599 Merge remote-tracking branch 'upstream/master' 2013-04-22 16:33:30 -07:00
Jeffrey Ventrella
3dc03f44a1 improved rendering of avatar 2013-04-22 16:32:35 -07:00
Stephen Birarda
fb703171f2 make other heads the same color and same size 2013-04-22 16:30:45 -07:00
birarda
84adea86e3 Merge pull request #103 from birarda/master 
fix rendering of other agent types
 2013-04-22 16:05:32 -07:00
Stephen Birarda
ba4235c175 don't render agents that are not of type avatar 2013-04-22 16:04:46 -07:00
Jeffrey Ventrella
caead24462 Merge remote-tracking branch 'upstream/master' 2013-04-22 15:40:25 -07:00
Jeffrey Ventrella
ca2840f905 Cleaned up some const values in Head.h, implemented avatar gravity and ground collision, improved test sphere collision, added _usingBodySprings test to getHeadPosition, improved camera settings in main.cpp, cleaned up commented-out code in main.cpp 2013-04-22 15:39:31 -07:00
ZappoMan
1b52bb4e20 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 
Conflicts:
	voxel-server/CMakeLists.txt
 2013-04-22 14:48:24 -07:00
ZappoMan
9b34427570 Added camera data to AvatarData class, and include it in interface 2013-04-22 14:12:08 -07:00
Jeffrey Ventrella
1b91a8e653 Merge remote-tracking branch 'upstream/master' 2013-04-22 14:05:29 -07:00
Stephen Birarda
c00b5f5e8d fix missed reference to AGENT_TYPE_INTERFACE 2013-04-22 14:05:16 -07:00
Jeffrey Ventrella
60f0e6581d improved test sphere collision algorithm 2013-04-22 14:04:36 -07:00
ZappoMan
487b74f073 Merge pull request #100 from birarda/eve 
intial revision of eve the NPC
 2013-04-22 13:58:54 -07:00
Jeffrey Ventrella
f8884d420c Merge pull request #99 from Ventrella/master 
fixed remote avatar hand position
 2013-04-22 13:44:02 -07:00
birarda
79a178997d Merge pull request #98 from PhilipRosedale/master 
Added stats to menu bar for both avatars and other servers
 2013-04-22 13:23:09 -07:00
Philip Rosedale
7d52af6fd4 Fixed per stephen 2013-04-22 13:20:12 -07:00
Jeffrey Ventrella
b7d6ce9747 fixed avatar hand position by making avatars simulate all the time,and also fixing logic of _isMine 2013-04-22 13:15:46 -07:00
Philip Rosedale
736eb335a9 Added stats at upper right for servers and avatars separately. 2013-04-22 13:12:17 -07:00
Stephen Birarda
a558597b6a complete an initial version of eve that sits at 0,0,0 2013-04-22 13:10:21 -07:00
Stephen Birarda
c68ec079eb rename AGENT_TYPE_INTERFACE to AGENT_TYPE_AVATAR, more stubbing for eve 2013-04-22 11:54:24 -07:00
Jeffrey Ventrella
7b60ddf057 Merge remote-tracking branch 'upstream/master' 2013-04-22 10:31:51 -07:00
Jeffrey Ventrella
2e402c3b17 added - and then removed - some orientation-related tests 2013-04-22 10:29:14 -07:00