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

429 commits

Author SHA1 Message Date
Andrzej Kapolka
c6af08d883 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	avatar-mixer/src/main.cpp
 2013-04-25 17:40:55 -07:00
Andrzej Kapolka
1713bebb64 Added the basic key press/message composition display. 2013-04-25 17:36:47 -07:00
Stephen Birarda
ccbbf31beb fix for extraneous typedefs and reference to AgentListIterator as friend 2013-04-25 17:10:09 -07:00
Stephen Birarda
d2714e9321 resolve conflicts on merge with upstream master 2013-04-25 17:04:18 -07:00
Stephen Birarda
e6d278ea12 Merge remote-tracking branch 'upstream/master' into agentlist-array 2013-04-25 17:01:17 -07:00
Jeffrey Ventrella
86e72a90d4 working on camera view shifting from first person to third person 2013-04-25 16:31:42 -07:00
Stephen Birarda
edc908b1cd AgentList type squishes across project 2013-04-25 16:25:49 -07:00
Stephen Birarda
da6bbacc8e type squish in main.cpp 2013-04-25 16:12:43 -07:00
Stephen Birarda
2bda700753 put iterator statements on one line in main.cpp 2013-04-25 16:12:22 -07:00
Stephen Birarda
625a963918 prefer -> notation to (*TYPE) for AgentList iterator 2013-04-25 15:49:25 -07:00
Andrzej Kapolka
620e1c728c Removed kludge; it turned out lighting was enabled. 2013-04-25 15:41:09 -07:00
Stephen Birarda
dac660efda resolve conflicts after merge with upstream master 2013-04-25 15:30:57 -07:00
Stephen Birarda
5ddd9a9f4f Merge remote-tracking branch 'upstream/master' into agentlist-array 2013-04-25 15:27:40 -07:00
Andrzej Kapolka
d041072d40 Delete support (though the one on my numeric keypad doesn't work?), 
sending key states.
 2013-04-25 15:26:05 -07:00
Stephen Birarda
2850d74a84 add typedefs for stl iterator implementation 2013-04-25 14:48:07 -07:00
Jeffrey Ventrella
7a0ed469b8 added methods to camera class to check for when the view frustum needs to be reshaped (but the calls are not yet being made - need to make sure the right place to use it) 2013-04-25 14:25:28 -07:00
Andrzej Kapolka
675d06e4b9 More chat bits; basic functionality now working. 2013-04-25 14:03:31 -07:00
Jeffrey Ventrella
5a0a1c1cec increased YAW_MAG (faster turning), redesigned the concept of avatar position, and reset Eve's position accordingly. Also added _frustumNeedsReshape in camera in anticipation of fixing problem where setting fov doesn't reshape the frustum. 2013-04-25 13:51:20 -07:00
Stephen Birarda
836d286b75 initial transition from vector to multi-dimensional array in AgentList 2013-04-25 13:11:13 -07:00
Jeffrey Ventrella
9a4d27c0b5 cleaned up some camera code and added some functionality for first-person view 2013-04-25 12:19:23 -07:00
Andrzej Kapolka
1a79bbd80d Fleshing out the chat entry widget. 2013-04-24 18:30:46 -07:00
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