tosh
|
0332b455cb
|
removes leftover something and misplaced const-qualification that keeps it from compiling
|
2013-04-24 13:33:53 +02:00 |
|
tosh
|
225188a6f9
|
Merge branch 'master' of git://github.com/worklist/hifi into 19188
|
2013-04-24 13:32:30 +02:00 |
|
Jeffrey Ventrella
|
1a300c8ad3
|
Merge pull request #126 from Ventrella/master
removed orientation lines in bones
|
2013-04-23 22:06:18 -07:00 |
|
Jeffrey Ventrella
|
8135a45ccf
|
removed pinky orientation lines in avatar bones
|
2013-04-23 22:05:02 -07:00 |
|
Jeffrey Ventrella
|
54aac82e9c
|
cleanup
|
2013-04-23 21:30:53 -07:00 |
|
Jeffrey Ventrella
|
e11c6edda3
|
Merge pull request #125 from Ventrella/master
one more fix
|
2013-04-23 21:19:02 -07:00 |
|
Jeffrey Ventrella
|
61a17060c3
|
one more glitch...
|
2013-04-23 21:17:39 -07:00 |
|
Philip Rosedale
|
d65f577268
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-23 21:12:24 -07:00 |
|
Philip Rosedale
|
0f403de592
|
Merge pull request #124 from Ventrella/master
fixed breakage in voxel and eve
|
2013-04-23 21:10:06 -07:00 |
|
Jeffrey Ventrella
|
48da3f726e
|
fixed bug - didn't change bodyPosition in eve or voxel
|
2013-04-23 21:07:40 -07:00 |
|
Philip Rosedale
|
a440570cb4
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-23 21:00:53 -07:00 |
|
Philip Rosedale
|
daa8350fa7
|
Merge pull request #118 from Ventrella/master
prepared for hand state changes, and also renamed bodyPosition to position
|
2013-04-23 20:54:55 -07:00 |
|
Jeffrey Ventrella
|
428cb89895
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-23 20:44:50 -07:00 |
|
Jeffrey Ventrella
|
61d7a82fc6
|
made lots of changes in the logic of how my avatar encounters other avatars and detects hand state
|
2013-04-23 20:44:12 -07:00 |
|
Philip Rosedale
|
99a4d0f3dc
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-23 20:11:35 -07:00 |
|
birarda
|
a4c1f646c1
|
Merge pull request #123 from birarda/master
hard code eve's listen port again to fix EC2 problem
|
2013-04-23 17:35:56 -07:00 |
|
Stephen Birarda
|
0014b045af
|
hard code eve's listen port again so she shows up on EC2
|
2013-04-23 17:35:00 -07:00 |
|
birarda
|
8c4d8f4def
|
Merge pull request #122 from birarda/master
add IP address debug to domain server info
|
2013-04-23 15:58:54 -07:00 |
|
Stephen Birarda
|
11986ca00f
|
add IP address to DS information output
|
2013-04-23 15:58:06 -07:00 |
|
birarda
|
b24ad5e89b
|
Merge pull request #121 from birarda/master
add some randomization to eve so there can be many
|
2013-04-23 15:48:22 -07:00 |
|
Stephen Birarda
|
a4244da27e
|
add randomization of eve's listening port on launch
|
2013-04-23 15:46:57 -07:00 |
|
Stephen Birarda
|
2b7095925d
|
add randomization of eve's position, face eve down z-axis
|
2013-04-23 15:45:29 -07:00 |
|
birarda
|
e20f267b22
|
Merge pull request #120 from birarda/master
fix size for SOLO_AGENT_TYPES in AgentList header
|
2013-04-23 14:13:02 -07:00 |
|
Stephen Birarda
|
3344016212
|
SOLO_AGENT_TYPES needs a defined size
|
2013-04-23 14:12:21 -07:00 |
|
birarda
|
b21c0ae9df
|
Merge pull request #119 from birarda/master
add cstring for memset and memcpy in AudioInjector
|
2013-04-23 14:09:39 -07:00 |
|
Stephen Birarda
|
ceefda8ce1
|
add cstring for memset and memcpy
|
2013-04-23 14:09:09 -07:00 |
|
ZappoMan
|
513fb777a6
|
Merge pull request #117 from birarda/master
initial version of eve that says WALL-E
|
2013-04-23 14:06:30 -07:00 |
|
Stephen Birarda
|
8a222da42f
|
const int is unnecessary
|
2013-04-23 14:05:24 -07:00 |
|
Jeffrey Ventrella
|
eb631e2ef6
|
renamed "bodyPosition" to "position". (This corresponds to the position of the avatar on the ground, where y=0). I will next add a new "getBodyPosition" which returns the avatar's center of gravity - is useful for certain purposes, such as setting collision volumes, etc.
|
2013-04-23 14:05:23 -07:00 |
|
Stephen Birarda
|
32b1e88a0a
|
add ALL THE CONSTS
|
2013-04-23 14:03:20 -07:00 |
|
Stephen Birarda
|
620615599f
|
fix the const for injectAudio
|
2013-04-23 14:01:19 -07:00 |
|
Stephen Birarda
|
49f9dfe03c
|
make argv a const so Brad quiets down
|
2013-04-23 13:59:59 -07:00 |
|
Stephen Birarda
|
ed5afb3537
|
add const to injectAudio method
|
2013-04-23 13:57:41 -07:00 |
|
Stephen Birarda
|
fd6fb60d24
|
fix pointer var declarations in AudioInjector class
|
2013-04-23 13:55:42 -07:00 |
|
Stephen Birarda
|
9d7e29e06f
|
fix constructors in eve main and injector main
|
2013-04-23 13:53:24 -07:00 |
|
Stephen Birarda
|
ddc74984b5
|
fix pointer var declarations, AudioInjector constructor in eve main
|
2013-04-23 13:52:25 -07:00 |
|
Jeffrey Ventrella
|
a73ea8c255
|
some preparation for adding hand state to avatar interactions
|
2013-04-23 13:48:34 -07:00 |
|
Stephen Birarda
|
42ba5a51d4
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-23 13:38:59 -07:00 |
|
Stephen Birarda
|
7ae320d7e1
|
intial version of eve that says WALL-E every so often
|
2013-04-23 13:37:49 -07:00 |
|
Philip Rosedale
|
be7fb7bce5
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-23 13:32:15 -07:00 |
|
Philip Rosedale
|
d550b09399
|
Added 'gyro look' option to have gyro drive your render yaw, added render menu.
|
2013-04-23 13:31:05 -07:00 |
|
Jeffrey Ventrella
|
e19d4fd5f9
|
changes from Philip's push - I assume
|
2013-04-23 12:23:08 -07:00 |
|
Jeffrey Ventrella
|
a1e3149d6a
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-23 12:20:26 -07:00 |
|
ZappoMan
|
594ff6a759
|
Merge pull request #115 from PhilipRosedale/master
First commit fix gyros - local render now works.
|
2013-04-23 12:08:34 -07:00 |
|
Philip Rosedale
|
90c56e796b
|
One... last.... const....
|
2013-04-23 12:07:12 -07:00 |
|
Philip Rosedale
|
5556686875
|
Fixes from brad's review
|
2013-04-23 11:59:43 -07:00 |
|
Stephen Birarda
|
1688e2f5c3
|
replace injector with TARGET_NAME in CMakeLists
|
2013-04-23 11:49:37 -07:00 |
|
Stephen Birarda
|
88fe04bcd1
|
hook up the injector to the new AudioInjector class
|
2013-04-23 11:48:01 -07:00 |
|
Philip Rosedale
|
7aea9d1e61
|
Fixed :: prefix for local variables
|
2013-04-23 11:21:36 -07:00 |
|
Philip Rosedale
|
2ef45e8512
|
Avatar head rotation, audio loudness (for facial animation) and hand state (grabbing or not) now sent in broadcast data.
|
2013-04-23 11:15:11 -07:00 |
|