Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-27 03:38:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
1871 commits 25 branches 0 tags 1.1 GiB
Commit graph

475 commits

Author SHA1 Message Date
Philip Rosedale
6142372219 Merge remote-tracking branch 'origin/master' 2013-04-30 13:44:49 -07:00
Philip Rosedale
8e06602e9a Added Avatar method to allow received UDP transmitter data to drive the avatar head rotation, cleaned up gyro code. 2013-04-30 13:40:16 -07:00
ZappoMan
429ba8c729 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-29 17:48:12 -07:00
ZappoMan
accda966d5 Add LOD culling to the server protocol. 
- Add LOD/distance culling to VoxelTree:encodeTreeBitstreamRecursion()
  and VoxelTree::searchForColoredNodesRecursion()
- added new levels to boundaryDistanceForRenderLevel()
- added more spheres to the scene to get a better sense of LOD behavior
 2013-04-29 17:38:52 -07:00
Andrzej Kapolka
c9c32630e8 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-29 13:22:25 -07:00
Andrzej Kapolka
0fe4d57ad7 I think this is the least intrusive fix for the chat crashes: lock the agent 
list when we're updating from the network, simulating, or rendering.  I think
there are likely to be other synchronization issues, but this is a start.
 2013-04-29 13:17:39 -07:00
Jeffrey Ventrella
9924be9188 Merge remote-tracking branch 'upstream/master' 2013-04-29 10:41:58 -07:00
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
Jeffrey Ventrella
caac600030 improved hand holding algorithm 2013-04-27 22:00:02 -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
e4c39369aa Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-27 14:49:03 -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
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
Andrzej Kapolka
21f1669388 How'd those tabs get in there? 2013-04-26 13:10:44 -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
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
Philip Rosedale
2e518f8dac Removed renderPitchRate, renderYawRate, startYaw from main.cpp, they are not doing anything. 2013-04-26 11:36:44 -07:00
Andrzej Kapolka
0932a8b382 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-26 11:31:15 -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
Jeffrey Ventrella
fe2e180f16 merge with upstream master 2013-04-26 10:56:48 -07:00
Andrzej Kapolka
46041b2ed9 Style tweaks: preface privates with underscore, capitalize enum members. 2013-04-26 10:21:14 -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
Jeffrey Ventrella
ce1ceb849f Added HandControl class and also Avatar Touch class 2013-04-25 23:32:04 -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
tosh
95f2b4373d adjusts main.cpp (oscilloscope does not render when disabled and does no longer need an external check) 2013-04-26 05:09:00 +02:00
Philip Rosedale
1a5f499b45 First commit with initial Balls class for avatar sphere cloud 2013-04-25 19:56: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
ZappoMan
899068e3a6 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-25 17:35:02 -07:00
Stephen Birarda
ccbbf31beb fix for extraneous typedefs and reference to AgentListIterator as friend 2013-04-25 17:10:09 -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
Jeffrey Ventrella
86e72a90d4 working on camera view shifting from first person to third person 2013-04-25 16:31:42 -07:00