Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-29 06:55:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
88098 commits 25 branches 0 tags 1.1 GiB
Commit graph

88098 commits

This branch
This branch
All branches
Author SHA1 Message Date
vincent
1e2e505301 Another merge and fix ... 2013-04-10 20:41:46 +02:00
Stephen Birarda
98db359db3 Merge branch 'master' of github.com:worklist/hifi into 19170B 2013-04-10 09:58:46 -07: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
Stephen Birarda
8fe87d08e9 refactoring broadcast avatar data, auto-activate AM public socket 2013-04-09 17:59:54 -07:00
Stephen Birarda
4f576ba86f some spacing issues, conversions from const char to char * 2013-04-09 17:33:53 -07:00
Stephen Birarda
11a317da96 remove comments in processAgentData 2013-04-09 17:15:40 -07:00
Stephen Birarda
f2377ea541 some refactoring in updateDataForAllAgents 2013-04-09 17:14:27 -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
Stephen Birarda
48077b62c8 remove unnecessary cast and other lines 2013-04-09 17:10:04 -07:00
Stephen Birarda
9f10be749e Merge remote-tracking branch 'upstream/master' into 19170B 2013-04-09 17:04:20 -07:00
Stephen Birarda
7742d3114e add avatar mixer to agent type names, remove head 2013-04-09 17:03:10 -07:00
Stephen Birarda
ae7f3e71d8 broadcast to VS and avatar mixer on position change 2013-04-09 16:56:19 -07:00
Stephen Birarda
a0f3f161b1 move AvatarData class to AvatarAgentData subclass of AgentData 2013-04-09 16:39:57 -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
Leonardo Murillo
3f64c29bc9 Debugging 2013-04-09 15:54:16 -06:00
Leonardo Murillo
f07714ce5c Debugging 2013-04-09 15:51:08 -06: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
Leonardo Murillo
1cf75b37f3 Changes to interface side of code 2013-04-09 15:30:30 -06:00
ZappoMan
42e1355f1e add back voxels.render() call 2013-04-09 14:11:55 -07:00
Leonardo Murillo
6bff444f15 Removing unnecessary header file 2013-04-09 14:58:27 -06:00
Leonardo Murillo
35a8207769 Deleting silent agents 2013-04-09 14:56:11 -06:00
Jeffrey Ventrella
d217481300 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-09 13:41:27 -07:00
Jeffrey Ventrella
e90dd52da4 resolve merge conflicts with origin/master 2013-04-09 13:30:26 -07:00
ZappoMan
f5634a66aa Got rid of AGENT_TYPE_HEAD and fixed voxel server to use AGENT_TYPE_INTERFACE 2013-04-09 13:27:15 -07:00
vincent
4f41aab89a last merge without Curl 2013-04-09 22:17:59 +02:00
Leonardo Murillo
64e563ef7c Sending packets to agents 2013-04-09 14:01:57 -06:00
Leonardo Murillo
e0c31d68d1 Merge branch 'master' of github.com:/worklist/hifi into 19170B 2013-04-09 14:01:38 -06:00
ZappoMan
712997451b Adding friendly names to AgentType display. 2013-04-09 13:00:20 -07:00
Jeffrey Ventrella
87c26a39fb adding more changes and small improvements to camera, and head... 2013-04-09 12:54:59 -07:00
Leonardo Murillo
f3a8e363dc pushing new agents into list and changes to private properties 2013-04-09 13:23:11 -06: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
Leonardo Murillo
cb5d1b9214 Second take on Avatar Mixer 2013-04-09 09:22:34 -06:00