Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:16:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
1704 commits 71 branches 56 tags 1.2 GiB
Commit graph

1704 commits

This branch
This branch
All branches
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
birarda
3c360aed7f Merge pull request #149 from birarda/agentlist-array 
fix right forearm position
 2013-04-25 17:16:21 -07:00
Stephen Birarda
09256d8c4e put back default for AVATAR_BONE_RIGHT_FOREARM 2013-04-25 17:15:48 -07:00
birarda
ceb7c60736 Merge pull request #148 from birarda/agentlist-array 
more fixes for broken builds
 2013-04-25 17:12:35 -07:00
Stephen Birarda
69ea567f77 use class key for AgentListIterator friend in AgentList 2013-04-25 17:12:11 -07:00
birarda
a55b201d13 Merge pull request #147 from birarda/agentlist-array 
fixes for broken build
 2013-04-25 17:10:35 -07:00
Stephen Birarda
ccbbf31beb fix for extraneous typedefs and reference to AgentListIterator as friend 2013-04-25 17:10:09 -07:00
ZappoMan
272582c51d Merge pull request #145 from birarda/agentlist-array 
change AgentList vector to an array were agents are marked dead
 2013-04-25 17:05:21 -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
birarda
1f8177e708 Merge pull request #144 from Ventrella/master 
added some camera functionality and redesigned the concept of avatar position
 2013-04-25 16:53:18 -07:00
Stephen Birarda
3df81cc92a resolve conflicts on merge with upstream master 2013-04-25 16:41:35 -07:00
Stephen Birarda
cdb8b1b144 Merge remote-tracking branch 'upstream/master' into agentlist-array 2013-04-25 16:40:20 -07:00
Jeffrey Ventrella
7a94310d4e Merge remote-tracking branch 'upstream/master' 2013-04-25 16:32:27 -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
81322d01e5 spacing fixes in AgentList 2013-04-25 16:19:33 -07:00
Stephen Birarda
7e0dab6224 spacing fixes in Avatar class 2013-04-25 16:18:17 -07:00
Stephen Birarda
507f39a052 fix readability of agent dereference 2013-04-25 16:14:38 -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
215efe3b78 bunch of const changes for glm::vec3 in Avatar and Orientation 2013-04-25 16:10:55 -07:00
Stephen Birarda
8370fd2d19 spacing fixes in Avatar class 2013-04-25 16:04:08 -07:00
Stephen Birarda
be37237b84 fix indent in Avatar class 2013-04-25 15:58:42 -07:00
Stephen Birarda
114f949a6e spacing cleanup in Avatar class 2013-04-25 15:58:03 -07:00
Stephen Birarda
8deee63f74 remove line breaks in DS for loop 2013-04-25 15:56:26 -07:00
Stephen Birarda
569fa76dde prefer arrow notation in avatar-mixer iterator loop 2013-04-25 15:52:16 -07:00
Stephen Birarda
f7e83b2080 squish types in audio mixer, use -> notation for other avatars 2013-04-25 15:51:10 -07:00
Stephen Birarda
625a963918 prefer -> notation to (*TYPE) for AgentList iterator 2013-04-25 15:49:25 -07:00
Andrzej Kapolka
d5da35e91a Merge branch 'master' of https://github.com/worklist/hifi 2013-04-25 15:41:57 -07:00
Andrzej Kapolka
620e1c728c Removed kludge; it turned out lighting was enabled. 2013-04-25 15:41:09 -07:00
birarda
c03cf2a34a Merge pull request #143 from PhilipRosedale/master 
Added local gravity fields
 2013-04-25 15:37:04 -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
Stephen Birarda
89da132bf2 update voxel-server to use new AgentList iterator 2013-04-25 15:26:21 -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
88eca95020 fix domain-server to use new AgentList iterator 2013-04-25 15:24:36 -07:00
Stephen Birarda
ef6593eb89 update audio-mixer to use new AgentList iterator 2013-04-25 15:21:56 -07:00
Stephen Birarda
f86704fa94 update avatar-mixer to use new AgentList iterator 2013-04-25 15:21:44 -07:00
Stephen Birarda
ad530b4eb8 fix bug based on dynamic end of agentList iterator 2013-04-25 15:10:08 -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
Jeffrey Ventrella
68b3f54f5c tiny change 2013-04-25 10:44:01 -07:00
Philip Rosedale
9e62728c33 Changed velocity to be dvec3 2013-04-25 10:18:30 -07:00
Philip Rosedale
b9fb888073 Small speed/cleanup to thrust setting 2013-04-25 10:02:14 -07:00