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

896 commits

Author SHA1 Message Date
ZappoMan
ff996c9946 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-29 06:18:25 -07:00
Philip Rosedale
3787c93142 Fixes per review 2013-04-28 14:49:08 -07:00
Philip Rosedale
b9234b0a02 Merge remote-tracking branch 'upstream/master' 2013-04-27 17:19:55 -07:00
Jeffrey Ventrella
37e304fd14 Merge remote-tracking branch 'upstream/master' 2013-04-27 16:45:58 -07:00
Philip Rosedale
5e737ce5d4 Merge remote-tracking branch 'upstream/master' 2013-04-27 16:39:19 -07:00
Philip Rosedale
f6ef117788 Merge pull request #157 from tschw/19165 
19165
 2013-04-27 16:37:46 -07:00
ZappoMan
e373a8b866 removed accidentally added whitespace 2013-04-27 14:59:58 -07:00
ZappoMan
2d518520f5 removed extra AgentList() constructor which got accidentally included in merge mistake 2013-04-27 14:58:38 -07:00
ZappoMan
94bb6a1b0f removed some testing/debug code 2013-04-27 14:57:23 -07:00
ZappoMan
999930743e removed some debug code 2013-04-27 14:55:34 -07:00
ZappoMan
2f2af7ec09 removed some debug code 2013-04-27 14:53:08 -07:00
ZappoMan
e4c39369aa Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-27 14:49:03 -07:00
ZappoMan
70818bd3fe Added some new debugging code, removed some old debugging code, some small coding standard tweaks 2013-04-27 12:03:20 -07:00
Jeffrey Ventrella
57cbd9c6d9 cleaned up collision code some 2013-04-27 09:47:46 -07:00
Jeffrey Ventrella
5c3bd5fe87 improved collisions between avatars 2013-04-27 09:33:58 -07:00
Jeffrey Ventrella
308b9dcf82 Merge remote-tracking branch 'upstream/master' 2013-04-26 17:44:42 -07:00
Jeffrey Ventrella
adccd62f87 made a different prototype for camera shifting into first-person 2013-04-26 17:43:47 -07:00
Philip Rosedale
16ea53f921 Merge remote-tracking branch 'upstream/master' 2013-04-26 17:40:27 -07:00
Philip Rosedale
ebc5d665c0 Merge pull request #158 from ey6es/master 
Reverted threading change by default, since we're seeing lower frame rates.
 2013-04-26 17:19:11 -07:00
birarda
7ddf33b9c3 Merge pull request #159 from birarda/audio 
tune distance ratio, remove debugging in audio mixer
 2013-04-26 17:14:36 -07:00
Andrzej Kapolka
c26becf6cb Added toggle for nonblocking networking; default to threaded for now, since 
we're seeing lower frame rates.
 2013-04-26 17:10:52 -07:00
Philip Rosedale
99957f31f3 Merge remote-tracking branch 'upstream/master' 2013-04-26 17:09:05 -07:00
Philip Rosedale
69cf6e303d Merge pull request #155 from Ventrella/master 
merge
 2013-04-26 16:54:28 -07:00
Philip Rosedale
996a8794d0 Merge remote-tracking branch 'upstream/master' 2013-04-26 16:37:58 -07:00
tosh
dbfef9d802 Merge branch 'master' of git://github.com/worklist/hifi into 19165 
Conflicts:
	interface/src/Audio.cpp
 2013-04-27 00:53:29 +02:00
Jeffrey Ventrella
2486b6e15c moved inline functions from Camera.h to Camera.cpp as per Stephen's request 2013-04-26 13:33:36 -07:00
Jeffrey Ventrella
59ef9e5d7e removed incomplete code snippet in Avatar.h 2013-04-26 13:21:49 -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
Jeffrey Ventrella
e9592f9360 moved handController 2013-04-26 12:55:13 -07:00
ZappoMan
88039e6dac Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-26 12:17:09 -07:00
Jeffrey Ventrella
10b6c7759d Merge branch 'master' of https://github.com/worklist/hifi 2013-04-26 12:16:22 -07:00
Jeffrey Ventrella
dc11055f8e merge with upstream master and resolve conflicts 2013-04-26 12:15:48 -07:00
Philip Rosedale
824abca443 Removed field and Cloud classes 2013-04-26 11:57:04 -07:00
Stephen Birarda
948f9607f6 send head position as source position to mixer 2013-04-26 11:49:52 -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
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
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
Jeffrey Ventrella
fe2e180f16 merge with upstream master 2013-04-26 10:56:48 -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
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
ZappoMan
91f6aaa96e testing of new searchForColoredNodes() 2013-04-26 09:23:48 -07:00
ZappoMan
17694b3f46 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 
Fixed conflict in interface/src/main.cpp
 2013-04-25 23:49:08 -07:00
ZappoMan
a176753379 added VoxelNodeBag 2013-04-25 23:47:12 -07:00