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

3172 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
cfb66bee95 Capsule/box collisions. 2013-05-27 14:05:44 -07:00
Andrzej Kapolka
70b25fd6c4 Sphere/box collisions for voxels, various utility functions. 2013-05-25 19:59:07 -07:00
Philip Rosedale
aae6d0cf3c Merge pull request #425 from ey6es/master 
Made planet atmospheres twice as thick, have the big planet's be red.
 2013-05-24 14:33:53 -07:00
birarda
b866bfd879 Merge pull request #424 from PhilipRosedale/master 
Mohawk same for everyone, rotates with head
 2013-05-24 14:33:14 -07:00
Philip Rosedale
d796956a96 fix per review 2013-05-24 14:32:56 -07:00
Philip Rosedale
9baf087c9a Avatar renders right arm in 1P mode 2013-05-24 14:29:26 -07:00
Andrzej Kapolka
93f9d0a5a5 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-24 14:26:54 -07:00
Andrzej Kapolka
5ca01842be Made the atmospheres twice as thick, made the large planet one's red. 2013-05-24 14:24:47 -07:00
Philip Rosedale
31e41260c1 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-24 14:17:44 -07:00
Philip Rosedale
f5c0f84d27 Mohawk is different/stable for each person, and rotates correctly with head 2013-05-24 14:15:53 -07:00
Andrzej Kapolka
5ba5fd984f Merge pull request #423 from birarda/oculus 
go directly into oculus mode when oculus is connected
 2013-05-24 14:08:40 -07:00
Stephen Birarda
d12bc85376 go directly into oculus mode when the oculus is connected 2013-05-24 14:05:22 -07:00
Andrzej Kapolka
d32511ee47 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-24 13:59:08 -07:00
Philip Rosedale
ccff880493 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-24 12:33:16 -07:00
Philip Rosedale
cb7381fcd1 incremental fix rotation 2013-05-24 12:33:05 -07:00
birarda
007e9fe447 Merge pull request #422 from birarda/owner-pointers 
provide a getter for the owning agent
 2013-05-24 12:32:38 -07:00
Stephen Birarda
6158410658 provide a getter for the owning agent in AgentData 2013-05-24 12:32:00 -07:00
Philip Rosedale
360c9c8ab1 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-24 12:30:12 -07:00
Philip Rosedale
dc9b2e33b5 Fixing mohawk orientation 2013-05-24 12:30:05 -07:00
ZappoMan
f0ce749877 Merge pull request #421 from birarda/owner-pointers 
add pointers back to owning avatar and owning agent
 2013-05-24 12:28:10 -07:00
Stephen Birarda
81307939d4 Merge remote-tracking branch 'upstream/master' into owner-pointers 2013-05-24 12:23:12 -07:00
Stephen Birarda
59a6016f4b use a NULL default for owningAvatar to simplify constructors 2013-05-24 12:18:38 -07:00
Stephen Birarda
eb25fd3b46 pass the owning agent for VoxelAgentData constructor 2013-05-24 12:18:19 -07:00
ZappoMan
0a1a86ca94 Merge pull request #418 from PhilipRosedale/master 
More stable gyro averaging
 2013-05-24 12:18:02 -07:00
Stephen Birarda
49b483ef53 maintain a pointer to owning avatar from HeadData 2013-05-24 12:17:48 -07:00
Stephen Birarda
36892da488 keep a pointer to owning agent in AgentData 2013-05-24 12:17:34 -07:00
birarda
a3f30970d6 Merge pull request #420 from ZappoMan/voxel_animation 
Fix to missing voxels
 2013-05-24 12:16:42 -07:00
ZappoMan
8560e42357 fix issue with duplicate VBO slots 2013-05-24 12:08:25 -07:00
Philip Rosedale
8b5901d904 simplified per stephens code review 2013-05-24 12:04:17 -07:00
Philip Rosedale
17c898c151 Long term averaging of the gyros for better stability 2013-05-24 11:33:00 -07:00
ZappoMan
1c427c9a02 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-24 11:18:26 -07:00
ZappoMan
b1232d0a87 coding standard cleanup 2013-05-24 11:18:14 -07:00
Philip Rosedale
59ac5ebd66 Head will always render when body does - no decapitation 2013-05-24 11:07:19 -07:00
Philip Rosedale
f961a40d1c Chat message height doubled to clear mohawk 2013-05-24 10:55:26 -07:00
birarda
fc30aa4470 Merge pull request #416 from ZappoMan/voxel_animation 
lower send rate
 2013-05-24 10:49:58 -07:00
ZappoMan
d82223804b Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-24 10:49:21 -07:00
ZappoMan
c767babba5 lower voxel send rate 2013-05-24 10:47:57 -07:00
Philip Rosedale
75f8ef736a Merge pull request #415 from ZappoMan/voxel_animation 
make dragonfly move in circle instead of line
 2013-05-24 10:24:47 -07:00
ZappoMan
56f1be37fc Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-24 10:15:38 -07:00
birarda
05ad7309a1 Merge pull request #411 from ey6es/master 
Fix for starfield rendering on Oculus.
 2013-05-24 10:14:31 -07:00
ZappoMan
e23d243e84 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-24 10:14:20 -07:00
ZappoMan
ca0a3e30a1 Merge pull request #414 from PhilipRosedale/master 
Added the mighty mohawk
 2013-05-24 10:13:56 -07:00
Philip Rosedale
bf94c88bcc Fixes per review 2013-05-24 10:12:50 -07:00
Andrzej Kapolka
ded793c87d Merge branch 'master' of https://github.com/worklist/hifi 2013-05-24 09:38:13 -07:00
ZappoMan
34a598dcd7 make dragonfly move in circle instead of line 2013-05-24 09:35:27 -07:00
Philip Rosedale
95e73afc78 Added the avatar mohawk 2013-05-24 00:16:52 -07:00
Philip Rosedale
23401640cd Merge branch 'master' of https://github.com/worklist/hifi 2013-05-23 22:53:07 -07:00
ZappoMan
4e739b3aa3 Merge pull request #413 from ZappoMan/voxel_animation 
new bug parts and colors
 2013-05-23 19:03:47 -07:00
ZappoMan
8a3528040c new bug parts and colors 2013-05-23 19:00:59 -07:00
Andrzej Kapolka
add84b2f39 Hide the cursor when in fullscreen Oculus mode. 2013-05-23 17:58:04 -07:00