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

3456 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jeffrey Ventrella
51ddf40ffe cleaned up hair code 2013-05-24 11:54:55 -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
Jeffrey Ventrella
c8e0bdc0da Merge remote-tracking branch 'upstream/master' 2013-05-23 22:53:04 -07:00
Jeffrey Ventrella
b74ceae61a added avatar hair 2013-05-23 22:52:43 -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
Andrzej Kapolka
9be4f06e9a Disable voxel textures by default. 2013-05-23 17:32:43 -07:00
Andrzej Kapolka
99c8998c49 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-23 17:31:37 -07:00
birarda
509905fd78 Merge pull request #412 from birarda/master 
tune the distance attenuation
 2013-05-23 16:49:29 -07:00
Stephen Birarda
18e8a5ebf9 tune the distance attenuation on audio-mixer 2013-05-23 16:48:28 -07:00
Andrzej Kapolka
95f1a9adaa Removed unused nearCenter/farCenter from ViewFrustum. 2013-05-23 16:34:11 -07:00
Andrzej Kapolka
514c12c7fc Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
 2013-05-23 15:39:04 -07:00
Andrzej Kapolka
9b433c974c Fix for starfield rendering on Oculus: put inter-pupil translation in 
modelview matrix where it belongs, don't reset perspective projection for
starfield.
 2013-05-23 15:35:41 -07:00
birarda
c58c0c3295 Merge pull request #410 from birarda/master 
remove AvatarRenderer, no longer in use
 2013-05-23 15:18:54 -07:00
Stephen Birarda
b673715aa2 remove the no longer in use AvatarRenderer 2013-05-23 15:18:32 -07:00
birarda
148276de7f Merge pull request #409 from PhilipRosedale/master 
Latest tweaks to head, rendering, start location
 2013-05-23 15:17:15 -07:00
Philip Rosedale
a4a756704e Merge branch 'master' of https://github.com/worklist/hifi 2013-05-23 15:02:47 -07:00
Philip Rosedale
37cb914891 You can reset start location with 'G' 2013-05-23 15:02:32 -07:00
birarda
111936e13a Merge pull request #407 from ZappoMan/voxel_animation 
Adding Dragon Fly Animation
 2013-05-23 14:06:16 -07:00
birarda
3cf8a8224f Merge pull request #408 from birarda/master 
fix clocking on AudioInjector thread
 2013-05-23 13:57:12 -07:00
Stephen Birarda
842ef820ab use a more consistent method to clock the injector thread 2013-05-23 13:56:16 -07:00
ZappoMan
d3de03b67a cleanup 2013-05-23 13:00:13 -07:00