Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-20 00:22:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
1296 commits 25 branches 0 tags 1.1 GiB
Commit graph

298 commits

Author SHA1 Message Date
Stephen Birarda
7c3f5264b5 resolve conflicts on merge with upstream master 2013-04-11 16:48:40 -07:00
Stephen Birarda
a1d209dd70 manage one AgentList per process via singleton 2013-04-11 15:45:04 -07:00
Jeffrey Ventrella
556f11a0c0 added test 'other' avatar for proxemixs testing 2013-04-11 15:32:35 -07:00
ZappoMan
e9ef765021 set default frustum to cameraFrustum not head frustum 2013-04-11 12:51:43 -07:00
Stephen Birarda
78fdccccad rename avatar mixer packet header, match in interface network receive 2013-04-11 11:18:54 -07:00
ZappoMan
002d35932e Merge pull request #21 from birarda/19170B 
Leo's Avatar Mixer + birarda's AgentData updates
 2013-04-11 10:43:02 -07:00
ZappoMan
0fff73e225 fixed plainting with new head implementation 2013-04-11 01:36:52 -07:00
ZappoMan
24862ca535 fixing up render view frustum, now it's working 2013-04-11 01:02:04 -07:00
Philip Rosedale
a0938cddea Merge remote-tracking branch 'origin' into startupTimer 2013-04-11 00:11:52 -07:00
Philip Rosedale
407da2aea8 Added a startup timer 2013-04-11 00:11:31 -07:00
Jeffrey Ventrella
cd8c760959 cleaned up some code 2013-04-11 00:10:52 -07:00
Philip Rosedale
81c4186179 pull (Jeffrey) 
Merge branch 'master' of github.com:worklist/hifi
 2013-04-10 21:55:47 -07:00
Jeffrey Ventrella
dbbe7500ac removed negative z hack in avatar. Avatar getting less hacky 2013-04-10 21:52:18 -07:00
ZappoMan
712b14c364 hacking on frustum for camera 2013-04-10 21:27:29 -07:00
ZappoMan
0f17c148f4 adding camera vs head for frustum view, not working yet 2013-04-10 21:21:13 -07:00
Jeffrey Ventrella
0564aa1a1b Hi! 
Merge branch 'master' of https://github.com/worklist/hifi
 2013-04-10 21:12:20 -07:00
Jeffrey Ventrella
f294cc8782 working on avatar orientation issues 2013-04-10 21:12:15 -07:00
Philip Rosedale
e0a704935d made display a bit cleaner 2013-04-10 19:08:22 -07:00
Philip Rosedale
834821d005 Removed the lattice object 2013-04-10 18:25:54 -07:00
Philip Rosedale
34e5b670a2 Tweaked location and color of agents display for menu, removed audio start playback log 2013-04-10 18:01:18 -07:00
Philip Rosedale
859903274d Tweaks to menu to have right position under Mac, always on, slightly smaller font 2013-04-10 17:48:09 -07:00
Philip Rosedale
8d5ee616ac Added a debug menu option 2013-04-10 16:58:53 -07:00
Stephen Birarda
6270659cdc inline declaration and initialization for menu 2013-04-10 16:56:15 -07:00
Stephen Birarda
b152d43f77 refactor menu callbacks and row/column adding 2013-04-10 16:07:46 -07:00
birarda
88c2e9510d Merge pull request #22 from dominiquevincent/19171 
Code Review for Job #19171
 2013-04-10 15:49:23 -07:00
Stephen Birarda
7731ae886a remove some more MARKER_CAPTURE code 2013-04-10 15:30:33 -07:00
Stephen Birarda
010c7e028d switch from strchr to memchr for broadcastToAgents 2013-04-10 15:30:21 -07:00
Jeffrey Ventrella
a2a7640bd2 merge 
Merge branch 'master' of https://github.com/worklist/hifi
 2013-04-10 15:27:10 -07:00
Jeffrey Ventrella
3871c220b2 improved hand movement - now transformed to av rotation 2013-04-10 15:27:04 -07:00
Stephen Birarda
c378241afb NULL terminate the broadcastReceivers char* 2013-04-10 15:20:35 -07:00
vincent
cd1aa99dfa #19171 merge with master 2013-04-11 00:20:05 +02:00
Stephen Birarda
9a4f73e3bd fix undeclared identifier myHead 2013-04-10 15:14:42 -07:00
Stephen Birarda
666517c50e Merge remote-tracking branch 'upstream/master' into 19170B 2013-04-10 15:14:12 -07:00
vincent
4dbff46234 #19171 Code Review changes 2013-04-11 00:13:40 +02:00
ZappoMan
5d1f11e413 fixed bug in frustrum direction, added viewing offset mode 2013-04-10 15:02:31 -07:00
Jeffrey Ventrella
a523a24c23 fixed hand motion stuff 2013-04-10 15:00:28 -07:00
Jeffrey Ventrella
797cec4513 hello! 
Merge branch 'master' of https://github.com/worklist/hifi
 2013-04-10 14:29:14 -07:00
Jeffrey Ventrella
7b4d0b5598 removed bone spam 2013-04-10 14:29:08 -07:00
vincent
eb646ade84 #19171 split of menu.cpp in menuColumn.cpp and menuRow.cpp 2013-04-10 22:39:01 +02:00
ZappoMan
4b7b5437ac some cleanup of view frustum debugging code 2013-04-10 13:26:21 -07:00
ZappoMan
7cd70b1f47 use Jeffery's code for view frustum debugging 2013-04-10 13:12:47 -07:00
Jeffrey Ventrella
228f76c789 Thingy! 
Merge branch 'master' of https://github.com/worklist/hifi
 2013-04-10 12:54:57 -07:00
Jeffrey Ventrella
be5044c560 flipped y direction of up-down avatar navigation 2013-04-10 12:54:52 -07:00
Philip Rosedale
d57a4428d9 deleted unused stuff that caused conflict with myAvatar change 2013-04-10 12:47:40 -07:00
Philip Rosedale
53df8a718a Merge remote-tracking branch 'origin/master' 2013-04-10 12:45:35 -07:00
Philip Rosedale
8010129774 Few more bits of cleanup and variable renaming, turned voxel rendering back on by default 2013-04-10 12:43:26 -07:00
Jeffrey Ventrella
87c351ce4f changed 'myHead' to 'myAvatar' in main.cpp, and a few local variables acordingly 2013-04-10 12:37:34 -07:00
Stephen Birarda
fcee05e9f0 handle pinging of unknown agents in AgentList thread 2013-04-10 12:37:14 -07:00
vincent
6a5c51bc69 #19171 Add a simple openGL menu that will work x-platform 2013-04-10 21:31:29 +02:00
Jeffrey Ventrella
eee57a9c0c fixed merge conflict 2013-04-10 12:21:40 -07:00
ZappoMan
76937720bd Merge branch 'master' of https://github.com/worklist/hifi 2013-04-10 12:13:12 -07:00
Jeffrey Ventrella
089271f615 whatever you say, git. 
Merge branch 'master' of https://github.com/worklist/hifi
 2013-04-10 12:13:03 -07:00
Jeffrey Ventrella
ab8140e0ef fixed a bug in avatar head lookat direction 2013-04-10 12:12:57 -07:00
ZappoMan
28a41132a4 latest work on render_view_frustum 2013-04-10 12:12:52 -07:00
Stephen Birarda
ec520752f1 Merge remote-tracking branch 'upstream/master' into 19170B 2013-04-10 12:07:35 -07:00
Stephen Birarda
cf1f087b38 add method to parse bulk agent data from a mixer 2013-04-10 11:57:24 -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
98db359db3 Merge branch 'master' of github.com:worklist/hifi into 19170B 2013-04-10 09:58:46 -07:00
ZappoMan
597f35db3d moved vector math helpers to Utils.cpp/h 2013-04-10 09:39:43 -07:00
ZappoMan
fc122f23d2 added first cut at view frustum debuging code 2013-04-10 01:32:01 -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
Jeffrey Ventrella
1b833fb4a9 added grid plane to aid in testing avatar navigation 2013-04-09 21:14:24 -07:00
Stephen Birarda
4f576ba86f some spacing issues, conversions from const char to char * 2013-04-09 17:33:53 -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
9f10be749e Merge remote-tracking branch 'upstream/master' into 19170B 2013-04-09 17:04:20 -07:00
Stephen Birarda
ae7f3e71d8 broadcast to VS and avatar mixer on position change 2013-04-09 16:56:19 -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
f07714ce5c Debugging 2013-04-09 15:51:08 -06: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
Jeffrey Ventrella
e90dd52da4 resolve merge conflicts with origin/master 2013-04-09 13:30:26 -07: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
7480283dd4 cleanup of packet header constants 2013-04-08 19:54:14 -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
Jeffrey Ventrella
a0f09b597a got a basic avatar skeleton with a simpler starter user interaction for moving the right hand 2013-04-05 16:19:23 -07:00
ZappoMan
16ad4fc220 hack to always send voxels to client (even if already visited), added paint mode features to client 2013-04-05 10:54:39 -07:00
Jeffrey Ventrella
5b2d1ec198 thingy3 2013-04-05 10:52:10 -07:00
Jeffrey Ventrella
e57e2bdf38 thingy2 2013-04-05 10:48:08 -07:00
ZappoMan
57829785eb fix to LOD bug caused by flip-flopped X and Z, add color randomization to inserted voxels on server, added head position display to display_stats() 2013-04-04 20:50:51 -07:00
Jeffrey Ventrella
d3f6c19e83 adding Camera and some utility classes and start of prototype avatar 2013-04-04 18:04:32 -07:00