Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-14 18:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
1640 commits 74 branches 59 tags 1.2 GiB
Commit graph

1640 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jeffrey Ventrella
8e27a69e92 Merge remote-tracking branch 'upstream/master' 2013-04-23 11:13:24 -07:00
Jeffrey Ventrella
8df6a7e056 added collision code for avatar (not operational yet). and some cleanup. 2013-04-23 11:12:38 -07:00
Stephen Birarda
beee875e88 add a new AudioInjector class that can be leveraged from eve and injector 2013-04-23 10:46:05 -07:00
Philip Rosedale
9760b7d410 First commit to re-enable gyros, removed various old head_mirror variables, now use 'lookingInMirror', etc. Local gyros now correctly drive own head. 2013-04-23 09:47:52 -07:00
tosh
723d49d78c Merge branch 'master' of git://github.com/worklist/hifi into 19188 2013-04-23 16:08:47 +02:00
birarda
e00a387020 Merge pull request #114 from birarda/avatar-from-mixer 
fix returned number of bytes read from AvatarData parseData
 2013-04-22 18:41:49 -07:00
Stephen Birarda
79d547e9d0 fix return of bytes read to push pointer forwards 2013-04-22 18:41:12 -07:00
birarda
7eee3404c7 Merge pull request #113 from birarda/avatar-from-mixer 
fix broken build from NULL interface client sockets
 2013-04-22 18:36:47 -07:00
Stephen Birarda
8201b963d1 fix crash for NULL agent sockets 2013-04-22 18:36:13 -07:00
ZappoMan
982e2b1d0c Merge pull request #112 from ZappoMan/view_frustum_work 
Fix false colorization initialization bug
 2013-04-22 18:11:42 -07:00
ZappoMan
47bfceca31 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-22 18:08:27 -07:00