ZappoMan
e1defb8681
added searchForColoredNodes()
2013-04-26 09:23:10 -07:00
ZappoMan
0dfa5d573a
removed debug code
2013-04-26 09:22:26 -07:00
ZappoMan
99c0cbc7cd
removed some debug code
2013-04-26 00:47:14 -07:00
ZappoMan
2ba24e1716
fixed a couple bugs in VoxelNodeBag
2013-04-26 00:46:29 -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
ZappoMan
d6e27d8f2f
thread safety in VoxelTree (aded mutex to prevent reads and adds/deletes at same time)
...
also added VoxelNodeBag class to handle running out of room in the encode tree functions
2013-04-25 23:45:34 -07:00
ZappoMan
3f158c0753
Added new version of compareOctalCodes() which actually compares octal codes
2013-04-25 23:42:35 -07:00
ZappoMan
c014abbe6c
new VoxelNodeBag class which is used to store a collection of voxel node pointers
2013-04-25 23:41:07 -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
tosh
50eb9a2a54
Merge branch 'master' of git://github.com/worklist/hifi into 19165
2013-04-26 05:07:31 +02: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
tosh
41115fc0f1
reimplements oscilloscope and connects output channels
2013-04-26 04:25:58 +02: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
ZappoMan
899068e3a6
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-25 17:35:02 -07:00
ZappoMan
32da105d62
new testing/debug code for encodeTreeBitstream()
2013-04-25 17:33:43 -07:00
ZappoMan
3c7c85a98c
Added second cut at new bitstream writers
...
- added encodeTreeBitstream() which is new version of bitstream encoder that handles
only encoding nodes that are in view. Also handles detecting packet overflow with
new technique
- added encodeTreeBitstreamRecursion() which is the private work horse function
- moved temporary code to searchAndEncodeMultiTreeBitstream() which is still not
ready for prime time
2013-04-25 17:31:32 -07:00
ZappoMan
667fe11694
added VoxelNode::printDebugDetails()
2013-04-25 17:29:56 -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
Stephen Birarda
114f949a6e
spacing cleanup in Avatar class
2013-04-25 15:58:03 -07:00
Stephen Birarda
8deee63f74
remove line breaks in DS for loop
2013-04-25 15:56:26 -07:00
Stephen Birarda
569fa76dde
prefer arrow notation in avatar-mixer iterator loop
2013-04-25 15:52:16 -07:00
Stephen Birarda
f7e83b2080
squish types in audio mixer, use -> notation for other avatars
2013-04-25 15:51:10 -07:00
