Commit graph

87983 commits

Author SHA1 Message Date
Jeffrey Ventrella
cd1533dc7c Lots of small changes in the head (evolving into "avatar") to include skeleton. Also, added camera behaviors for navigation 2013-04-08 18:46:00 -07:00
Stephen Birarda
6f8808e565 add the ping reply header 2013-04-08 18:25:21 -07:00
Stephen Birarda
f018d8e323 replace ping header char in processAgentData switch case 2013-04-08 18:24:47 -07:00
Stephen Birarda
b636536ab7 remove interface define in PacketHeader.h 2013-04-08 18:23:57 -07:00
Stephen Birarda
2031d26ffe fix incorrect agent type replacement 2013-04-08 18:23:01 -07:00
Stephen Birarda
d462bff512 add a PacketHeaders header file and sub a couple as an example 2013-04-08 18:22:21 -07:00
Stephen Birarda
69fa462151 don't steal ping replies from AgentList 2013-04-08 18:10:20 -07:00
ZappoMan
7f1af81cf9 fixed compiler error for strict compilers 2013-04-08 17:08:14 -07:00
ZappoMan
53cfd0ecdd adding CounterStats class and support for showing running average stats on voxels recieved, created, and colored in client 2013-04-08 17:03:22 -07:00
ZappoMan
23429441ac Merge branch 'master' of https://github.com/worklist/hifi 2013-04-08 11:18:51 -07:00
ZappoMan
aee27bfc16 Hmmm, when painting, X and Z are not flipped? I'm totally confused, but now
but LOD and painting seems to work.
2013-04-08 11:18:07 -07:00
Philip Rosedale
dbd9688f1f Turned off default for star field rendering until we find/fix the rendering bug 2013-04-08 09:34:19 -07:00
ZappoMan
aa40fd96d4 added -/% to menu text 2013-04-07 12:49:15 -07:00
ZappoMan
d3fd5d1a75 added keyboard commands for erase all and add scene 2013-04-07 12:45:46 -07:00
ZappoMan
5415543dcd adding Z command to voxel server and interface, Z command allows sending "erase all" and "add scene" commands 2013-04-06 12:03:46 -07:00
Jeffrey Ventrella
ead0d2948e Merge remote-tracking branch 'origin'
.com/worklist/hifi

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2013-04-05 16:23:44 -07:00
Jeffrey Ventrella
87fe21f835 got a basic avatar skeleton with a simpler starter user interaction for moving the right hand 2013-04-05 16:21:13 -07:00
Jeffrey Ventrella
a0f09b597a got a basic avatar skeleton with a simpler starter user interaction for moving the right hand 2013-04-05 16:19:23 -07:00
ZappoMan
12e06135bb fixed reaverageVoxelColors() behavior. seems to work better now 2013-04-05 13:18:06 -07:00
ZappoMan
16ad4fc220 hack to always send voxels to client (even if already visited), added paint mode features to client 2013-04-05 10:54:39 -07:00
Jeffrey Ventrella
5b2d1ec198 thingy3 2013-04-05 10:52:10 -07:00
Jeffrey Ventrella
e57e2bdf38 thingy2 2013-04-05 10:48:08 -07:00
ZappoMan
57829785eb fix to LOD bug caused by flip-flopped X and Z, add color randomization to inserted voxels on server, added head position display to display_stats() 2013-04-04 20:50:51 -07:00
birarda
b017f9a454 Merge pull request #18 from tschw/19188
19188
2013-04-04 18:24:45 -07:00
Jeffrey Ventrella
d3f6c19e83 adding Camera and some utility classes and start of prototype avatar 2013-04-04 18:04:32 -07:00
tosh
31262340d4 adjusts formatting to agreed conventions 2013-04-05 01:24:00 +02:00
tosh
284530f7d6 tightens memory use 2013-04-04 11:59:16 +02:00
tosh
de4734d6fb tightens ogl state handling (also fixes unreadably thick text for stats display) 2013-04-04 10:59:57 +02:00
tosh
9046e5e89c silences warning by using pointer to const as string parameter for 'drawtext'
(conversion of string literals to char* is deprecated)
2013-04-04 10:55:08 +02:00
tosh
7d479af9c7 adjusts braces to agreed conventions 2013-04-04 10:52:42 +02:00
ZappoMan
f859d8ed9c Added PaintMode, toggle for stars, etc. 2013-04-03 22:42:02 -07:00
Leonardo Murillo
56c59e9074 Merge branch 'master' of github.com:/worklist/hifi into 19170B 2013-04-03 17:18:08 -06:00
Stephen Birarda
66a2b1a86f move stars.txt to S3 bucket 2013-04-03 15:24:26 -07:00
Stephen Birarda
320fa9e5c8 link curl to shared library, not interface 2013-04-03 15:14:35 -07:00
birarda
412dcc3b87 Merge pull request #17 from tschw/19188
Code Review for Job #19188
2013-04-03 15:07:57 -07:00
Leonardo Murillo
09df9d3dc7 Second take on avatar mixer 2013-04-03 15:17:15 -06:00
tosh
2341af271b Merge branch 'master' of git://github.com/worklist/hifi into 19188
Conflicts:
	interface/CMakeLists.txt
	interface/src/main.cpp
	shared/src/SharedUtil.cpp
	shared/src/SharedUtil.h
	shared/src/VoxelTree.cpp
2013-04-03 22:44:22 +02:00
tosh
0733f06143 adds cmake support for starfield subdirectory 2013-04-03 22:04:09 +02:00
ZappoMan
9220ba3ee5 Added agentTypes to AgentList::broadcastToAgents()
Make voxel server rebroadcast "remove voxel" messages to all it's connected heads
Cleaned up processing of Remove voxel messages to live in VoxelTree
2013-04-03 12:42:24 -07:00
ZappoMan
407fa95195 more delete voxel debugging, call reaverage colors on root node 2013-04-03 11:14:00 -07:00
ZappoMan
8988796285 more voxel delete debugging, use memcmp() instead of == 2013-04-03 09:38:11 -07:00
ZappoMan
f9dc41011a added call to reaverageVoxelColors() after deleting a voxel 2013-04-03 09:23:22 -07:00
ZappoMan
da52b0b321 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-03 09:10:21 -07:00
ZappoMan
8c9eff82b2 More delete voxel debugging 2013-04-03 09:09:51 -07:00
Stephen Birarda
aa17cc6edc link ALSA after PortAudio for UNIX build 2013-04-02 15:34:10 -07:00
Stephen Birarda
6005629d15 fix framework inclusions in CMakeLists after previous change 2013-04-02 15:27:46 -07:00
Stephen Birarda
b3abd0bdb5 Merge branch 'master' of github.com:worklist/hifi 2013-04-02 15:07:15 -07:00
Stephen Birarda
757aadf53e changes to CMakeLists to remove double links on OS X 2013-04-02 15:07:04 -07:00
ZappoMan
eda4657ba9 adding debugging to delete node from tree 2013-04-02 14:55:03 -07:00
ZappoMan
17427a9c4d adding some new tools 2013-04-02 14:43:33 -07:00