Andrzej Kapolka
9d4fded901
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/main.cpp
2013-04-24 17:11:37 -07:00
Andrzej Kapolka
f538e2bdbc
Added key state to avatar data, started on chat entry field.
2013-04-24 17:06:55 -07:00
birarda
d4e64462dd
Merge pull request #141 from PhilipRosedale/master
...
Wider log, log screen in menu
2013-04-24 17:05:12 -07:00
Philip Rosedale
0e4da5198d
Merge remote-tracking branch 'upstream/master'
2013-04-24 16:59:18 -07:00
Jeffrey Ventrella
ff1334d8b6
Merge remote-tracking branch 'upstream/master'
2013-04-24 16:58:54 -07:00
Philip Rosedale
bc65126004
Wider log window, log panel on by default, menu->tools->log to control.
2013-04-24 16:58:52 -07:00
Jeffrey Ventrella
e54fd0dd7d
renamed "Head" to "Avatar" and did a bunch a cleanups, including removing the three-lined comments
2013-04-24 16:54:07 -07:00
Philip Rosedale
6c986a1049
Merge pull request #127 from tschw/19188
...
19188
2013-04-24 16:53:04 -07:00
Philip Rosedale
33f95c696b
Fixes per code review
2013-04-24 13:12:08 -07:00
Philip Rosedale
78aa4fdf80
Simplified average loudness calculation, mouths and eyebrows of other people now move again!
2013-04-24 11:26:59 -07:00
tosh
225188a6f9
Merge branch 'master' of git://github.com/worklist/hifi into 19188
2013-04-24 13:32:30 +02:00
Philip Rosedale
a440570cb4
Merge remote-tracking branch 'upstream/master'
2013-04-23 21:00:53 -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
Jeffrey Ventrella
a73ea8c255
some preparation for adding hand state to avatar interactions
2013-04-23 13:48:34 -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
a1e3149d6a
Merge remote-tracking branch 'upstream/master'
2013-04-23 12:20:26 -07:00
Philip Rosedale
5556686875
Fixes from brad's review
2013-04-23 11:59:43 -07:00
Philip Rosedale
7aea9d1e61
Fixed :: prefix for local variables
2013-04-23 11:21:36 -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
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
Stephen Birarda
4956370d52
have parseData return the number of bytes consumed
2013-04-22 18:05:27 -07:00
Jeffrey Ventrella
602fd94af2
a few cleanups
2013-04-22 17:41:12 -07:00
Jeffrey Ventrella
9a53832599
Merge remote-tracking branch 'upstream/master'
2013-04-22 16:33:30 -07:00
birarda
84adea86e3
Merge pull request #103 from birarda/master
...
fix rendering of other agent types
2013-04-22 16:05:32 -07:00
Stephen Birarda
ba4235c175
don't render agents that are not of type avatar
2013-04-22 16:04:46 -07:00
Jeffrey Ventrella
caead24462
Merge remote-tracking branch 'upstream/master'
2013-04-22 15:40:25 -07:00
Jeffrey Ventrella
ca2840f905
Cleaned up some const values in Head.h, implemented avatar gravity and ground collision, improved test sphere collision, added _usingBodySprings test to getHeadPosition, improved camera settings in main.cpp, cleaned up commented-out code in main.cpp
2013-04-22 15:39:31 -07:00
ZappoMan
1b52bb4e20
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
...
Conflicts:
voxel-server/CMakeLists.txt
2013-04-22 14:48:24 -07:00
ZappoMan
9b34427570
Added camera data to AvatarData class, and include it in interface
2013-04-22 14:12:08 -07:00
Stephen Birarda
c00b5f5e8d
fix missed reference to AGENT_TYPE_INTERFACE
2013-04-22 14:05:16 -07:00
ZappoMan
487b74f073
Merge pull request #100 from birarda/eve
...
intial revision of eve the NPC
2013-04-22 13:58:54 -07:00
Jeffrey Ventrella
f8884d420c
Merge pull request #99 from Ventrella/master
...
fixed remote avatar hand position
2013-04-22 13:44:02 -07:00
birarda
79a178997d
Merge pull request #98 from PhilipRosedale/master
...
Added stats to menu bar for both avatars and other servers
2013-04-22 13:23:09 -07:00
Philip Rosedale
7d52af6fd4
Fixed per stephen
2013-04-22 13:20:12 -07:00
Jeffrey Ventrella
b7d6ce9747
fixed avatar hand position by making avatars simulate all the time,and also fixing logic of _isMine
2013-04-22 13:15:46 -07:00
Philip Rosedale
736eb335a9
Added stats at upper right for servers and avatars separately.
2013-04-22 13:12:17 -07:00
Stephen Birarda
c68ec079eb
rename AGENT_TYPE_INTERFACE to AGENT_TYPE_AVATAR, more stubbing for eve
2013-04-22 11:54:24 -07:00
Jeffrey Ventrella
7b60ddf057
Merge remote-tracking branch 'upstream/master'
2013-04-22 10:31:51 -07:00
Jeffrey Ventrella
2e402c3b17
added - and then removed - some orientation-related tests
2013-04-22 10:29:14 -07:00
ZappoMan
7a632115e4
fixed crash when no avatar mixer is present and display stats is enabled
2013-04-21 12:18:42 -07:00
ZappoMan
34b401d13f
changed render_view_frustum() to match coding standard, added menu items, cleanup
...
- split render_view_frustum() into two parts: loadViewFrustum() and renderViewFrustum()
- cleaned up debug menu items to match actual false color behaviors
- coding standard cleanup
2013-04-21 12:01:54 -07:00
ZappoMan
67910a2c29
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-19 20:08:47 -07:00
ZappoMan
8c4536199f
added menu items for false color operations
2013-04-19 20:02:14 -07:00
Jeffrey Ventrella
9a93ab7d7c
cleaned up logic for body springs mode and moving hand mode
2013-04-19 14:34:01 -07:00
Jeffrey Ventrella
623c998439
removed init values in HandMovement structure
2013-04-18 21:31:20 -07:00
Jeffrey Ventrella
9dd423f544
removed updateAvatarHand function
2013-04-18 19:30:27 -07:00
Jeffrey Ventrella
ed5f117b04
Merge remote-tracking branch 'upstream/master'
2013-04-18 19:26:29 -07:00
