Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 09:53:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
1729 commits 71 branches 56 tags 1.2 GiB
Commit graph

1729 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
996a8794d0 Merge remote-tracking branch 'upstream/master' 2013-04-26 16:37:58 -07:00
Philip Rosedale
1804357eab Merge pull request #156 from ey6es/master 
Style fixes to chat code, and moved packet reading to main thread to fix synchronization issues.
 2013-04-26 16:34:41 -07:00
Andrzej Kapolka
21f1669388 How'd those tabs get in there? 2013-04-26 13:10:44 -07:00
Andrzej Kapolka
c4776fcd27 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-26 13:03:09 -07:00
Philip Rosedale
824abca443 Removed field and Cloud classes 2013-04-26 11:57:04 -07:00
Philip Rosedale
2e518f8dac Removed renderPitchRate, renderYawRate, startYaw from main.cpp, they are not doing anything. 2013-04-26 11:36:44 -07:00
birarda
a987d95af0 Merge pull request #153 from birarda/audio 
correct the sign of the absolute head yaw
 2013-04-26 11:36:27 -07:00
Stephen Birarda
ded5da47ff correct the sign of the absolute head yaw sent to avatar mixer 2013-04-26 11:35:55 -07:00
Andrzej Kapolka
0932a8b382 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-26 11:31:15 -07:00
ZappoMan
8dfd235491 Merge pull request #152 from birarda/audio 
send correct avatar yaw to the audio mixer
 2013-04-26 11:25:54 -07:00
Stephen Birarda
7c855464e1 make the absolute head yaw getter const 2013-04-26 11:22:42 -07:00
Stephen Birarda
fbdcd57529 correct yaw sent to audio-mixer in Audio 2013-04-26 11:21:34 -07:00
Andrzej Kapolka
b9fdba2711 Rather than creating a thread to read datagrams, just set the socket to 
nonblocking mode and check it before simulating.  This addresses one aspect
of the lack of synchronization on AgentList, but there are other issues...
 2013-04-26 11:08:41 -07:00
Stephen Birarda
1884bfc17e some spacing cleanup in Audio class 2013-04-26 10:58:01 -07:00
birarda
d3d59ff915 Merge pull request #151 from birarda/audio 
fix for other agent iterator in audio mixer
 2013-04-26 10:51:05 -07:00
Stephen Birarda
f18942d016 fix otherAgent iterator in audio-mixer main 2013-04-26 10:50:19 -07:00
Philip Rosedale
e304e0dfb3 Fixing spacing nits in balls class 2013-04-26 10:21:17 -07:00
Andrzej Kapolka
46041b2ed9 Style tweaks: preface privates with underscore, capitalize enum members. 2013-04-26 10:21:14 -07:00
ZappoMan
4916da39fa Merge pull request #150 from PhilipRosedale/master 
Added balls class for avatar simulation, removed particles class.
 2013-04-26 10:07:44 -07:00
Philip Rosedale
61578d1ddb Added balls class 2013-04-26 09:59:50 -07:00
Philip Rosedale
e4c2004a69 Added constant to turn OFF avatar BALLS testing 2013-04-26 09:34:10 -07:00
Philip Rosedale
cac9e33f8c Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Avatar.cpp
	interface/src/Avatar.h
 2013-04-25 20:47:01 -07:00
Philip Rosedale
1a5f499b45 First commit with initial Balls class for avatar sphere cloud 2013-04-25 19:56:47 -07:00
Philip Rosedale
d1589270e5 Merge pull request #146 from ey6es/master 
Basic text chat.  This adds fields to AvatarData and will thus break existing clients.
 2013-04-25 19:50:27 -07:00
Andrzej Kapolka
c6661e8b8e Lowered the chat message height and put it in a variable. 2013-04-25 17:48:47 -07:00
Andrzej Kapolka
c6af08d883 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	avatar-mixer/src/main.cpp
 2013-04-25 17:40:55 -07:00
Andrzej Kapolka
1713bebb64 Added the basic key press/message composition display. 2013-04-25 17:36:47 -07:00
birarda
3c360aed7f Merge pull request #149 from birarda/agentlist-array 
fix right forearm position
 2013-04-25 17:16:21 -07:00
Stephen Birarda
09256d8c4e put back default for AVATAR_BONE_RIGHT_FOREARM 2013-04-25 17:15:48 -07:00
birarda
ceb7c60736 Merge pull request #148 from birarda/agentlist-array 
more fixes for broken builds
 2013-04-25 17:12:35 -07:00
Stephen Birarda
69ea567f77 use class key for AgentListIterator friend in AgentList 2013-04-25 17:12:11 -07:00
birarda
a55b201d13 Merge pull request #147 from birarda/agentlist-array 
fixes for broken build
 2013-04-25 17:10:35 -07:00
Stephen Birarda
ccbbf31beb fix for extraneous typedefs and reference to AgentListIterator as friend 2013-04-25 17:10:09 -07:00
ZappoMan
272582c51d Merge pull request #145 from birarda/agentlist-array 
change AgentList vector to an array were agents are marked dead
 2013-04-25 17:05:21 -07:00
Stephen Birarda
d2714e9321 resolve conflicts on merge with upstream master 2013-04-25 17:04:18 -07:00
Stephen Birarda
e6d278ea12 Merge remote-tracking branch 'upstream/master' into agentlist-array 2013-04-25 17:01:17 -07:00
birarda
1f8177e708 Merge pull request #144 from Ventrella/master 
added some camera functionality and redesigned the concept of avatar position
 2013-04-25 16:53:18 -07:00
Stephen Birarda
3df81cc92a resolve conflicts on merge with upstream master 2013-04-25 16:41:35 -07:00
Stephen Birarda
cdb8b1b144 Merge remote-tracking branch 'upstream/master' into agentlist-array 2013-04-25 16:40:20 -07:00
Jeffrey Ventrella
7a94310d4e Merge remote-tracking branch 'upstream/master' 2013-04-25 16:32:27 -07:00
Jeffrey Ventrella
86e72a90d4 working on camera view shifting from first person to third person 2013-04-25 16:31:42 -07:00
Stephen Birarda
edc908b1cd AgentList type squishes across project 2013-04-25 16:25:49 -07:00
Stephen Birarda
81322d01e5 spacing fixes in AgentList 2013-04-25 16:19:33 -07:00
Stephen Birarda
7e0dab6224 spacing fixes in Avatar class 2013-04-25 16:18:17 -07:00
Stephen Birarda
507f39a052 fix readability of agent dereference 2013-04-25 16:14:38 -07:00
Stephen Birarda
da6bbacc8e type squish in main.cpp 2013-04-25 16:12:43 -07:00
Stephen Birarda
2bda700753 put iterator statements on one line in main.cpp 2013-04-25 16:12:22 -07:00
Stephen Birarda
215efe3b78 bunch of const changes for glm::vec3 in Avatar and Orientation 2013-04-25 16:10:55 -07:00
Stephen Birarda
8370fd2d19 spacing fixes in Avatar class 2013-04-25 16:04:08 -07:00
Stephen Birarda
be37237b84 fix indent in Avatar class 2013-04-25 15:58:42 -07:00