Commit graph

364 commits

Author SHA1 Message Date
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
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
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
ZappoMan
e19b53a344 added key interface to toggle voxels 2013-04-10 00:46:04 -07:00
Philip Rosedale
e910bece1d temp commented groundPlaneGrid till file is fixed 2013-04-10 00:30:24 -07:00
Philip Rosedale
7edd93fd2c Merge remote-tracking branch 'origin' 2013-04-10 00:25:20 -07:00
Philip Rosedale
ef785ba7aa Improved comments at start of main.cpp, dropped unused octal.h,.cpp files, deleted many unused system variables and functions. 2013-04-10 00:25:03 -07:00
vincent
c60cfe28ad Code review changes - missing adjustedNear change 2013-04-10 08:57:09 +02:00
vincent
bb380e841e Code review changes 2013-04-10 08:28:26 +02:00
Jeffrey Ventrella
1b833fb4a9 added grid plane to aid in testing avatar navigation 2013-04-09 21:14:24 -07:00
Jeffrey Ventrella
81b311f753 added a method to ask the avatar for it's head lookat vector 2013-04-09 18:41:01 -07:00
Philip Rosedale
5a98ebfff2 Merge remote-tracking branch 'origin' 2013-04-09 17:13:01 -07:00
Philip Rosedale
760aafef8e Changed to render a small box of a fixed pixel width at screen center, useful for testing LOD Changes. 2013-04-09 17:12:43 -07:00
Jeffrey Ventrella
3dae70e665 removed glm::dvec3 and replaced with glm::vec3 in most of avatar code, except for velocity 2013-04-09 15:23:59 -07:00
Jeffrey Ventrella
09af8d153f added camera modes and also set initial avatar yaw to 90 2013-04-09 15:05:37 -07:00
Jeffrey Ventrella
7d42b93489 condensed avatar bone line code 2013-04-09 14:45:19 -07:00
Jeffrey Ventrella
d05cf13870 Ya Ya Too Cool Too Cool
dsfdsf

Merge branch 'master' of https://github.com/worklist/hifi
2013-04-09 14:35:39 -07:00
Jeffrey Ventrella
ff53b1573c fixed bug in avatar arm IK prototype 2013-04-09 14:35:29 -07:00
ZappoMan
42e1355f1e add back voxels.render() call 2013-04-09 14:11:55 -07:00
Jeffrey Ventrella
e90dd52da4 resolve merge conflicts with origin/master 2013-04-09 13:30:26 -07:00
vincent
4f41aab89a last merge without Curl 2013-04-09 22:17:59 +02:00
Jeffrey Ventrella
87c26a39fb adding more changes and small improvements to camera, and head... 2013-04-09 12:54:59 -07:00
ZappoMan
2ec3f6b210 Adding new AgentTypes.h and moving over to new constants 2013-04-09 10:37:07 -07:00
vincent
56aac7077c changes after merge 2013-04-09 19:12:49 +02:00
Philip Rosedale
60dc43041f added rendering lines between avatar bones 2013-04-08 22:42:45 -07:00
Philip Rosedale
87fd0f7a91 Fixed avatar lighting, head scaling, removed some extra log messages 2013-04-08 21:13:20 -07:00
ZappoMan
6eb503f6d0 hopefully fix build buster 2013-04-08 20:04:24 -07:00
ZappoMan
6079ec2d91 hopefully fix build buster 2013-04-08 20:02:10 -07:00
ZappoMan
ec9bd5efb3 hopefully fix build buster 2013-04-08 19:59:58 -07:00
ZappoMan
17f4c5d184 cleanup of packet header constants 2013-04-08 19:56:42 -07:00
ZappoMan
7480283dd4 cleanup of packet header constants 2013-04-08 19:54:14 -07:00
Jeffrey Ventrella
e6a4647852 added a fix for other av rotation 2013-04-08 18:56:31 -07:00
Jeffrey Ventrella
191ee71dbb Merge remote-tracking branch 'origin' 2013-04-08 18:46:28 -07:00
Jeffrey Ventrella
cd1533dc7c Lots of small changes in the head (evolving into "avatar") to include skeleton. Also, added camera behaviors for navigation 2013-04-08 18:46:00 -07:00
Stephen Birarda
69fa462151 don't steal ping replies from AgentList 2013-04-08 18:10:20 -07:00
ZappoMan
53cfd0ecdd adding CounterStats class and support for showing running average stats on voxels recieved, created, and colored in client 2013-04-08 17:03:22 -07:00
ZappoMan
23429441ac Merge branch 'master' of https://github.com/worklist/hifi 2013-04-08 11:18:51 -07:00
ZappoMan
aee27bfc16 Hmmm, when painting, X and Z are not flipped? I'm totally confused, but now
but LOD and painting seems to work.
2013-04-08 11:18:07 -07:00
Philip Rosedale
dbd9688f1f Turned off default for star field rendering until we find/fix the rendering bug 2013-04-08 09:34:19 -07:00
ZappoMan
aa40fd96d4 added -/% to menu text 2013-04-07 12:49:15 -07:00
ZappoMan
d3fd5d1a75 added keyboard commands for erase all and add scene 2013-04-07 12:45:46 -07:00
ZappoMan
5415543dcd adding Z command to voxel server and interface, Z command allows sending "erase all" and "add scene" commands 2013-04-06 12:03:46 -07:00
Jeffrey Ventrella
87fe21f835 got a basic avatar skeleton with a simpler starter user interaction for moving the right hand 2013-04-05 16:21:13 -07:00