Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-14 18:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
1640 commits 74 branches 59 tags 1.2 GiB
Commit graph

1640 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
b291b5d1f6 fixed bug in initialization of false color (actually true color) 2013-04-22 18:07:58 -07:00
ZappoMan
19e7e73b5d Merge pull request #111 from birarda/avatar-from-mixer 
return int of bytes read from parseData, removing AvatarData const, fix socketMatch NULL socket crash
 2013-04-22 18:07:32 -07:00
Stephen Birarda
4956370d52 have parseData return the number of bytes consumed 2013-04-22 18:05:27 -07:00
ZappoMan
80669b03fd Merge pull request #110 from birarda/avatar-from-mixer 
creation of other avatars should be driven by avatar mixer packet
 2013-04-22 17:59:21 -07:00
Stephen Birarda
8a3135a084 Merge remote-tracking branch 'upstream/master' into avatar-from-mixer 2013-04-22 17:56:19 -07:00
Stephen Birarda
d895665d5f create missing agents sent from the avatar mixer 2013-04-22 17:55:48 -07:00
ZappoMan
d23e0a578a Merge pull request #109 from ZappoMan/view_frustum_work 
Change ViewFrustumCulling to default server behavior, some printf() cleanup
 2013-04-22 17:46:02 -07:00
Philip Rosedale
bff3caf0f7 Merge pull request #108 from Ventrella/master 
a few small tweaks
 2013-04-22 17:44:34 -07:00
ZappoMan
465dcf81c0 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-22 17:44:24 -07:00
ZappoMan
9d17dc0387 make view frustum culling default behavior, removed soem debug printf()s for now 2013-04-22 17:43:28 -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
Stephen Birarda
06b794563f stop sending avatar agents to other avatars in DS packet 2013-04-22 17:40:27 -07:00
birarda
2d8092eaf7 Merge pull request #106 from Ventrella/master 
Improved avatar rendering
 2013-04-22 17:33:42 -07:00
birarda
3191b2e1e4 Merge pull request #107 from ZappoMan/view_frustum_work 
switch to boxInFrustum() instead of pointInFrustum() for improved accuracy
 2013-04-22 17:27:02 -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
birarda
93c47aa6e6 Merge pull request #105 from birarda/master 
fix the size of the heads of other avatars
 2013-04-22 16:31:33 -07:00
Stephen Birarda
fb703171f2 make other heads the same color and same size 2013-04-22 16:30:45 -07:00
birarda
0670facdd7 Merge pull request #104 from birarda/master 
fix incorrect number of bytes per avatar
 2013-04-22 16:22:53 -07:00
Stephen Birarda
ea5a247f93 view frustum additions means there are now 94 bytes per avatar 2013-04-22 16:22:06 -07:00
Stephen Birarda
7375932cc7 Merge remote-tracking branch 'upstream/master' 2013-04-22 16:17:54 -07:00
Stephen Birarda
2d8997003a include avatar ID on log output 2013-04-22 16:16:06 -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
birarda
d92f5b832d Merge pull request #102 from ZappoMan/view_frustum_work 
First Cut at View Frustum Culling between server and client
 2013-04-22 15:26:45 -07:00
ZappoMan
a79659a5d4 change VoxelAgentData to not include position, use AvatarData _bodyPosition instead 2013-04-22 15:22:41 -07:00
ZappoMan
cea4170270 code review cleanup 2013-04-22 15:14:35 -07:00
ZappoMan
2f6d2469f4 code review cleanup 2013-04-22 15:13:17 -07:00
ZappoMan
436b43ea85 code review cleanup 2013-04-22 15:11:40 -07:00
ZappoMan
7d93f07152 code review cleanup 2013-04-22 15:10:18 -07:00
ZappoMan
7c73964836 code review cleanup 2013-04-22 15:07:46 -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
030f5328f5 First cut at View Frustum Culling between client and server 2013-04-22 14:46:25 -07:00
ZappoMan
893996675a Derive VoxelAgentData from AvatarData to get access to camera details 
- Changed base class for VoxelAgentData
- changed parseData() method to call base class implementation
- added avatars library to cmake scripts
 2013-04-22 14:15:47 -07:00
ZappoMan
e1da39e2bb Made several ViewFrustum methods const since they don't modify the class 2013-04-22 14:13:56 -07:00
ZappoMan
9b34427570 Added camera data to AvatarData class, and include it in interface 2013-04-22 14:12:08 -07:00
birarda
f10ec0b391 Merge pull request #101 from birarda/master 
fix missed reference to AGENT_TYPE_INTERFACE
 2013-04-22 14:05:58 -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
Stephen Birarda
f4d5774e69 change eve's orientation and hand position 2013-04-22 13:55:59 -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
Stephen Birarda
3016e5665f move eve away from the origin 2013-04-22 13:22:48 -07:00