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
a558597b6a
complete an initial version of eve that sits at 0,0,0
2013-04-22 13:10:21 -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
358efb472d
Clean up AABox to coding standard, made several methods const
...
- Cleaned up AABox to be consistent with the coding standard
- converted some methods to const and fixed up callers
2013-04-21 22:46:13 -07:00
ZappoMan
3dc818d31e
Changed false colorization to use point in frustum for now, since that works
2013-04-21 15:22:36 -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
ZappoMan
75a79a09ed
fixed LOD bug, added support for false colors
...
- fixed LOD bug related to mismatch with getting node position
- changed VoxelSystem to honor new VoxelNode color support for false color
- added some implementations of tree recursion that do things like false
color the tree for distance, randomly, or resetting to true color, or
stomping on the local version of the true color to debug packet sending
2013-04-19 19:58:37 -07:00
Jeffrey Ventrella
08105c3898
I did a major cleanup of the Head class, including putting all the "head"-related members into a single structure. We may consider making a separate class just to handle the head.
2013-04-19 17:09:28 -07:00
Jeffrey Ventrella
06f8990d42
removed avatar structure from Head class (leftover from the start of the prototyping phase)
2013-04-19 14:52:06 -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
d962230556
fixed sneaky array-out-of-bounds error in avatar bones and cleaned up some of the code for testing hand shake target positions
2013-04-19 12:44:09 -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
Jeffrey Ventrella
298bc7eee9
added more robust avatar hand movement algorithm in main.cpp
2013-04-18 19:24:57 -07:00
Stephen Birarda
daac10511e
output avatar mixer stats below the voxel stats
2013-04-18 16:58:08 -07:00
Stephen Birarda
d0e3a96485
Merge remote-tracking branch 'upstream/master' into mixer-stats
2013-04-18 15:33:57 -07:00
Stephen Birarda
44cb57afad
put back brad's voxel stats, he loves them too much
2013-04-18 15:33:17 -07:00
Stephen Birarda
588fc67cb9
add SimpleMovingAverage to each Agent, collect bytes received stats
2013-04-18 15:02:26 -07:00
ZappoMan
987553974a
Merge pull request #86 from Ventrella/master
...
reversed left-right strafe, commented-out updateAvatarHand
2013-04-18 15:01:48 -07:00
Jeffrey Ventrella
2b5d23de5d
Merge remote-tracking branch 'upstream/master'
2013-04-18 14:54:08 -07:00
Philip Rosedale
54cef39f51
Fixed problem with avatars rendering at 2X their location
2013-04-18 14:48:00 -07:00
Stephen Birarda
b9a1faf284
add a new SimpleMovingAverage class, replaces CounterStats
2013-04-18 14:46:39 -07:00
Jeffrey Ventrella
9ce1683c50
reversed strafe left right, and commented-out updateAvatarHand
2013-04-18 14:45:54 -07:00
Jeffrey Ventrella
449e05fd2a
Merge remote-tracking branch 'upstream/master'
2013-04-18 14:13:27 -07:00
Jeffrey Ventrella
47ee938530
reversed x value in hand movement
2013-04-18 14:12:45 -07:00
Philip Rosedale
5443d80c6f
Removed negation of front vector which was reversing yaw in avatar skeleton.
2013-04-18 14:00:48 -07:00
Philip Rosedale
daac59d64e
Merge remote-tracking branch 'upstream/master'
2013-04-18 13:36:43 -07:00
Philip Rosedale
d9099b5f5a
removed 2 unneeded debug lines
2013-04-18 13:34:37 -07:00
Jeffrey Ventrella
de6f33efa6
added "_" to all of Philip's old private members and tidied up the formatting in Head.h some
2013-04-18 13:16:36 -07:00
ZappoMan
74c5916519
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
...
Conflicts:
interface/src/main.cpp
2013-04-18 10:57:41 -07:00
ZappoMan
894715598c
fixed a comment
2013-04-18 08:49:07 -07:00
Philip Rosedale
a834c52b40
Quick attpemt to fix logging code
2013-04-18 07:48:57 -07:00
Philip Rosedale
8e19caf21c
Merge remote-tracking branch 'upstream/master'
2013-04-18 07:23:06 -07:00
tosh
1e6352593a
Merge branch 'master' of git://github.com/worklist/hifi into 19262
...
Conflicts:
interface/src/Head.cpp
interface/src/Util.cpp
interface/src/main.cpp
libraries/avatars/src/Orientation.cpp
2013-04-18 12:38:35 +02:00
ZappoMan
f0d891b641
Merge pull request #80 from PhilipRosedale/master
...
Stars back on
2013-04-18 01:38:42 -07:00
ZappoMan
532dc285e7
Changed render_view_frustum() to handle broken camera yaw
...
- I discovered that the Camera class has a Yaw that is actually
180deg off of true yaw. So when the avatar is facing at a yaw
of 0deg, we were setting the camera to 180. This was causing
the direction vectors to be rotated from where we expected them
to be, and as a result the frustum was wrong
- I did not fix the camera and the calls to glRotate() since I
don't yet understan how these work. BUT. I did fix the frustum
code to fix up this yaw before calculating the vectors
2013-04-18 01:16:54 -07:00
Philip Rosedale
a1d51f8db8
Merge remote-tracking branch 'upstream/master'
2013-04-18 00:20:47 -07:00
Philip Rosedale
ad30abdf20
sphere on
2013-04-18 00:20:22 -07:00