Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-05 17:02:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
804 commits 25 branches 28 tags 1.2 GiB
Commit graph

132 commits

Author SHA1 Message Date
Stephen Birarda
bbb0e9cea3 move MarkerNode to shared to hook with VoxelTree 2013-03-26 14:10:06 -07:00
Philip Rosedale
e0ee6c269a Added thrust and velocity to avatar head, first part of movement improvements 2013-03-26 11:53:57 -07:00
ZappoMan
08413cfc3d fixed build issue 2013-03-25 22:57:15 -07:00
ZappoMan
23c6a9017c Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
	shared/src/SharedUtil.cpp
	shared/src/SharedUtil.h
 2013-03-25 22:51:59 -07:00
ZappoMan
2f6b2466ea Fixed getCommandOption and cmOptionExists to be more porable 
added support for --NoConnect command line option to test running without connecting
added pruneTree to VoxelTree
 2013-03-25 22:39:24 -07:00
Stephen Birarda
a2b05d5f14 include stdlib for use of atoi 2013-03-25 16:43:31 -07:00
Stephen Birarda
3df93804d1 include cstring for memcpy in AgentList 2013-03-25 16:41:42 -07:00
Stephen Birarda
1e2876ce75 include stdint for use of uint16_t 2013-03-25 16:40:19 -07:00
Stephen Birarda
eb185f2ce8 remove command options methods from SharedUtil that crash Jenkins 2013-03-25 16:37:24 -07:00
Stephen Birarda
9eac649268 merge Leo's ID additions to DS 2013-03-25 16:27:25 -07:00
Stephen Birarda
3ca5263582 abstract check in with DS to AgentList 2013-03-25 16:23:13 -07:00
Leonardo Murillo
63589985f4 Removing unneeded memcpy 2013-03-25 16:12:51 -06:00
Leonardo Murillo
cb84b7573b Getting rid of unused declaration 2013-03-25 15:56:22 -06:00
Leonardo Murillo
54a946ee80 Splitting line, adding agentId to copy constructor and swap 2013-03-25 15:54:08 -06:00
Leonardo Murillo
fc382997bd Merge branch 'master' of github.com:/worklist/hifi into 19179 2013-03-25 15:13:39 -06:00
Stephen Birarda
896047d2aa have the mixer additionally attenuate sources based on extra byte 2013-03-25 12:05:32 -07:00
ZappoMan
ef8694dd60 1) Added createSphere() to VoxelSystem to create a sphere 
2) Added pointToVoxel() to SharedUtils, this will give you a voxel code
   given x,y,z,s,r,g,b
3) Added '.' keyboard interface to create a random sphere in the local
   voxel system
 2013-03-24 10:06:43 -07:00
ZappoMan
8ecc0d53ad Added a utility to VoxelSystem for loading voxels from a local file 
Also added a couple shared utility functions for reading command
line options (since that's how you can load a local file at this
point).
 2013-03-23 21:59:27 -07:00
Stephen Birarda
c9e16994f4 fix printTreeForDebugging instead of addition of repairChildMasks 2013-03-22 18:26:05 -07:00
Stephen Birarda
f435a09673 add method to repair child masks after adding randomly placed voxels 2013-03-22 18:19:37 -07:00
Stephen Birarda
c641f12693 some refactoring in for readCodeColorBufferToTree 2013-03-22 17:59:54 -07:00
Leonardo Murillo
bd18aeefe4 Couple of quick changes 2013-03-22 17:39:07 -06:00
Stephen Birarda
c51b4e3311 add leavesWrittenToBitstream member variable to VoxelTree for debug 2013-03-22 16:21:45 -07:00
Leonardo Murillo
be96f1cdd0 No longer need exists 2013-03-22 16:58:52 -06:00
Leonardo Murillo
61c866a34c Handling increase of id smarter 2013-03-22 16:57:30 -06:00
Stephen Birarda
c40800db8b send back a 10 level voxel tree from server 2013-03-22 15:32:36 -07:00
Leonardo Murillo
e5b0843212 Resolving conflicts 2013-03-22 13:40:16 -06:00
Leonardo Murillo
dc92f0be42 More agent IDing around the code 2013-03-22 13:34:35 -06:00
Stephen Birarda
3518ee15a8 add readCodeColorBufferToTree method to VoxelTree for point cloud render 2013-03-22 12:32:57 -07:00
Stephen Birarda
8ec5298c4a add groundwork for LOD specific transmissions from VS 2013-03-22 12:01:30 -07:00
Stephen Birarda
bb47967126 send head data to VS for level differentiation, remove the VS add callback 2013-03-22 10:46:37 -07:00
Leonardo Murillo
f604b574c5 Merge branch 'master' of github.com:/worklist/hifi into 19179 2013-03-22 11:46:36 -06:00
Leonardo Murillo
a4f6d85676 Fixing definitions 2013-03-22 11:45:19 -06:00
Leonardo Murillo
e3d842dff7 Packing agent ID on domain broadcast packet 2013-03-22 11:43:16 -06:00
Stephen Birarda
3fa0439f29 add method to SharedUtil to chdir to OS X bundle resources 2013-03-22 10:35:55 -07:00
Leonardo Murillo
a1691f54a1 Starting agent count at 1 to allow for 0 to be non-id specifier and packing the id into boadcast packet 2013-03-22 11:30:17 -06:00
Leonardo Murillo
a76f8a46cd Handle new and existing agent Ids 2013-03-22 11:20:45 -06:00
Stephen Birarda
95926cb7fc conditional chdir for OS X resources, revert windows Head changes 2013-03-21 17:02:41 -07:00
Stephen Birarda
9c73bf286e remove cast to int * in socket recvfrom 2013-03-21 16:13:52 -07:00
Stephen Birarda
0b48eab1fb Merge branch 'master' of github.com:worklist/hifi 2013-03-21 16:12:09 -07:00
Stephen Birarda
4552140f61 add a sound when moving so we aren't ninjas 2013-03-21 16:11:17 -07:00
Leonardo Murillo
d8b80006b8 Merge branch 'master' of github.com:/worklist/hifi into 19179 2013-03-21 14:25:35 -06:00
Kees van Prooijen
f308d8e004 merge with upstream master 2013-03-21 10:10:33 -07:00
Leonardo Murillo
203bf333c4 Merge branch 'master' of github.com:/worklist/hifi into 19179 2013-03-20 20:53:16 -06:00
Stephen Birarda
f4e9594f72 dumb way to keep voxel server alive for testing 2013-03-20 16:22:38 -07:00
Stephen Birarda
e7254ff216 fix shift in return of octal code section value 2013-03-20 16:22:01 -07:00
Stephen Birarda
d2da9000f4 return correct nodeForOctalCode 2013-03-20 16:21:22 -07:00
Stephen Birarda
e8f84aee78 fix rendering bugs 2013-03-20 15:32:12 -07:00
Stephen Birarda
fc3a499cb3 include cstring for use of memset 2013-03-20 13:48:59 -07:00
Stephen Birarda
c28a3e1bd4 add cstring for use of memcpy 2013-03-20 13:47:13 -07:00