Stephen Birarda
|
7731ae886a
|
remove some more MARKER_CAPTURE code
|
2013-04-10 15:30:33 -07:00 |
|
Stephen Birarda
|
010c7e028d
|
switch from strchr to memchr for broadcastToAgents
|
2013-04-10 15:30:21 -07:00 |
|
Jeffrey Ventrella
|
a2a7640bd2
|
merge
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-10 15:27:10 -07:00 |
|
Jeffrey Ventrella
|
3871c220b2
|
improved hand movement - now transformed to av rotation
|
2013-04-10 15:27:04 -07:00 |
|
vincent
|
b43475a34e
|
#19171 Missing Code Review changes
|
2013-04-11 00:23:41 +02:00 |
|
Stephen Birarda
|
c378241afb
|
NULL terminate the broadcastReceivers char*
|
2013-04-10 15:20:35 -07:00 |
|
vincent
|
cd1aa99dfa
|
#19171 merge with master
|
2013-04-11 00:20:05 +02:00 |
|
Stephen Birarda
|
9a4f73e3bd
|
fix undeclared identifier myHead
|
2013-04-10 15:14:42 -07:00 |
|
Stephen Birarda
|
666517c50e
|
Merge remote-tracking branch 'upstream/master' into 19170B
|
2013-04-10 15:14:12 -07:00 |
|
vincent
|
4dbff46234
|
#19171 Code Review changes
|
2013-04-11 00:13:40 +02:00 |
|
ZappoMan
|
5d1f11e413
|
fixed bug in frustrum direction, added viewing offset mode
|
2013-04-10 15:02:31 -07:00 |
|
Jeffrey Ventrella
|
a523a24c23
|
fixed hand motion stuff
|
2013-04-10 15:00:28 -07:00 |
|
Stephen Birarda
|
7bc822669a
|
some column width fixes in domain server
|
2013-04-10 14:40:53 -07:00 |
|
Stephen Birarda
|
acc97282c9
|
bracket styling changes, removed commented code
|
2013-04-10 14:35:45 -07:00 |
|
Jeffrey Ventrella
|
797cec4513
|
hello!
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-10 14:29:14 -07:00 |
|
Jeffrey Ventrella
|
7b4d0b5598
|
removed bone spam
|
2013-04-10 14:29:08 -07:00 |
|
Stephen Birarda
|
d56952cdc7
|
don't copy agent delete mutex
|
2013-04-10 13:39:31 -07:00 |
|
vincent
|
eb646ade84
|
#19171 split of menu.cpp in menuColumn.cpp and menuRow.cpp
|
2013-04-10 22:39:01 +02:00 |
|
ZappoMan
|
4b7b5437ac
|
some cleanup of view frustum debugging code
|
2013-04-10 13:26:21 -07:00 |
|
ZappoMan
|
7cd70b1f47
|
use Jeffery's code for view frustum debugging
|
2013-04-10 13:12:47 -07:00 |
|
vincent
|
d6189694c8
|
#19171 move of usleep function to SharedUtil.cpp
|
2013-04-10 21:55:29 +02:00 |
|
Jeffrey Ventrella
|
228f76c789
|
Thingy!
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-10 12:54:57 -07:00 |
|
Jeffrey Ventrella
|
be5044c560
|
flipped y direction of up-down avatar navigation
|
2013-04-10 12:54:52 -07:00 |
|
Philip Rosedale
|
d57a4428d9
|
deleted unused stuff that caused conflict with myAvatar change
|
2013-04-10 12:47:40 -07:00 |
|
Philip Rosedale
|
53df8a718a
|
Merge remote-tracking branch 'origin/master'
|
2013-04-10 12:45:35 -07:00 |
|
Philip Rosedale
|
8010129774
|
Few more bits of cleanup and variable renaming, turned voxel rendering back on by default
|
2013-04-10 12:43:26 -07:00 |
|
Jeffrey Ventrella
|
87c351ce4f
|
changed 'myHead' to 'myAvatar' in main.cpp, and a few local variables acordingly
|
2013-04-10 12:37:34 -07:00 |
|
Stephen Birarda
|
fcee05e9f0
|
handle pinging of unknown agents in AgentList thread
|
2013-04-10 12:37:14 -07:00 |
|
vincent
|
6a5c51bc69
|
#19171 Add a simple openGL menu that will work x-platform
|
2013-04-10 21:31:29 +02:00 |
|
Jeffrey Ventrella
|
eee57a9c0c
|
fixed merge conflict
|
2013-04-10 12:21:40 -07:00 |
|
Philip Rosedale
|
f26f9546b7
|
Merge remote-tracking branch 'origin'
|
2013-04-10 12:20:18 -07:00 |
|
Philip Rosedale
|
480eededfd
|
Another fix to starfield warning.
|
2013-04-10 12:19:55 -07:00 |
|
Philip Rosedale
|
57724cb569
|
Fixing some compiler warnings in starfield
|
2013-04-10 12:19:05 -07:00 |
|
ZappoMan
|
76937720bd
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-10 12:13:12 -07:00 |
|
Jeffrey Ventrella
|
089271f615
|
whatever you say, git.
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-10 12:13:03 -07:00 |
|
Jeffrey Ventrella
|
ab8140e0ef
|
fixed a bug in avatar head lookat direction
|
2013-04-10 12:12:57 -07:00 |
|
ZappoMan
|
28a41132a4
|
latest work on render_view_frustum
|
2013-04-10 12:12:52 -07:00 |
|
Stephen Birarda
|
de358d4bf6
|
fix warnings produced by starfield additions
|
2013-04-10 12:10:03 -07:00 |
|
Stephen Birarda
|
ec520752f1
|
Merge remote-tracking branch 'upstream/master' into 19170B
|
2013-04-10 12:07:35 -07:00 |
|
Stephen Birarda
|
66ccc9921b
|
handle ping and reply and domain server packets in avatar mixer
|
2013-04-10 11:57:47 -07:00 |
|
Stephen Birarda
|
cf1f087b38
|
add method to parse bulk agent data from a mixer
|
2013-04-10 11:57:24 -07:00 |
|
birarda
|
84456ac9af
|
Merge pull request #20 from dominiquevincent/19197
Code Review for Job #19197
|
2013-04-10 11:49:59 -07:00 |
|
vincent
|
1e2e505301
|
Another merge and fix ...
|
2013-04-10 20:41:46 +02:00 |
|
Stephen Birarda
|
98db359db3
|
Merge branch 'master' of github.com:worklist/hifi into 19170B
|
2013-04-10 09:58:46 -07:00 |
|
Stephen Birarda
|
861108b12b
|
Merge branch 'master' of github.com:worklist/hifi
|
2013-04-10 09:44:59 -07:00 |
|
ZappoMan
|
597f35db3d
|
moved vector math helpers to Utils.cpp/h
|
2013-04-10 09:39:43 -07:00 |
|
Stephen Birarda
|
9ce03eb27a
|
explicit initialization of audioSocket to NULL in AudioData constructor
|
2013-04-10 09:27:14 -07:00 |
|
ZappoMan
|
fc122f23d2
|
added first cut at view frustum debuging code
|
2013-04-10 01:32:01 -07:00 |
|
Jeffrey Ventrella
|
fac0c361f4
|
Yada Yada Yada Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-10 01:03:42 -07:00 |
|
Jeffrey Ventrella
|
8f969f9ca9
|
adding ground plane grid (again???)
|
2013-04-10 01:03:35 -07:00 |
|