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

2803 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
24b34b19b1 merge 2013-05-20 12:35:18 -07:00
ZappoMan
17c961f1b0 merge 2013-05-20 12:34:15 -07:00
ZappoMan
6cf8ec32a7 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	libraries/avatars/src/AvatarData.cpp
	libraries/avatars/src/AvatarData.h
 2013-05-20 12:31:35 -07:00
ZappoMan
fe1f02beff moved constructor 2013-05-20 12:16:55 -07:00
birarda
1e63bb8d20 Merge pull request #353 from ZappoMan/master 
fixed Philip's no animation problem
 2013-05-20 12:15:57 -07:00
ZappoMan
4caa690255 Merge pull request #356 from PhilipRosedale/master 
Made looking around with the mouse a menu option, defaults off
 2013-05-20 12:09:55 -07:00
Philip Rosedale
956ffe223f Merge branch 'master' of https://github.com/worklist/hifi 2013-05-20 11:56:47 -07:00
Philip Rosedale
28581e33cc turn off audio echo rendering (it's for debug) 2013-05-20 11:56:40 -07:00
Philip Rosedale
50ee9b9ee4 Added options menu choice for 'MouseLook', defaults off 2013-05-20 11:50:04 -07:00
ZappoMan
282ebbdcbb Merge pull request #354 from ey6es/master 
Added support for off-axis projection (via eye offset position/orientation parameters in camera/frustum).
 2013-05-20 11:34:37 -07:00
Andrzej Kapolka
0f2f4ee8f9 Add the discussed four lines to disable blending and enable backface culling. 2013-05-20 11:32:32 -07:00
Andrzej Kapolka
85bca558f5 Tabs -> spaces, spacing fix. 2013-05-20 09:38:01 -07:00
Andrzej Kapolka
ae02004ef6 Use M rather than L, since L is taken by the level display. 2013-05-19 22:40:53 -07:00
Andrzej Kapolka
0c03f66948 Fixed the frustum computation, fixed a bug in Plane. 2013-05-19 22:32:55 -07:00
ZappoMan
06242a82c4 fixed Philip's no animation problem 2013-05-19 20:53:46 -07:00
Andrzej Kapolka
0539739720 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-19 18:38:09 -07:00
Andrzej Kapolka
dd3e8d524a Support for eye offset position/orientation in camera/frustum. 2013-05-19 18:37:21 -07:00
Philip Rosedale
5475b19a9e Merge branch 'master' of https://github.com/worklist/hifi 2013-05-18 12:33:31 -07:00
Philip Rosedale
d9cc07cf17 Working on audio echo cancellation 2013-05-18 12:33:21 -07:00
ZappoMan
0ff65b44b5 Merge pull request #337 from tschw/19165 
19165
 2013-05-18 10:45:15 -07:00
birarda
6ec9a3c778 Merge pull request #350 from birarda/master 
fix ordering of member variables in Head
 2013-05-17 18:31:41 -07:00
Stephen Birarda
c504e8aa1a fix incorrect ordering of member variables in Head 2013-05-17 18:30:41 -07:00
birarda
fc81e394cb Merge pull request #349 from birarda/master 
alphabetical ordering in CMakeLists
 2013-05-17 17:55:06 -07:00
Stephen Birarda
391d6dca8e remove the voxel server erase all that's unused 2013-05-17 17:54:04 -07:00
Stephen Birarda
59a6fa8953 reinstate an alphatbetical ordering in root CMakeLists 2013-05-17 17:52:23 -07:00
birarda
3d9e857c83 Merge pull request #343 from Ventrella/master 
fixed weird pitch negation in head, and cleaned up some head formatting
 2013-05-17 17:51:33 -07:00
birarda
438191f436 Merge pull request #348 from ZappoMan/voxel_animation 
Improved Animation Server
 2013-05-17 16:15:49 -07:00
ZappoMan
81fd3bbc6a CR feedback 2013-05-17 16:15:05 -07:00
ZappoMan
60ce5f6de7 CR feedback 2013-05-17 16:12:35 -07:00
ZappoMan
16398be88d CR feedback 2013-05-17 16:11:17 -07:00
ZappoMan
d0b1d49b5d reduce packets per second by packing multiple voxel edits into single packet and removed debugging 2013-05-17 15:53:55 -07:00
birarda
1b29c6a6d3 Merge pull request #347 from birarda/voxel-noise 
new audio injector setup fixes
 2013-05-17 15:43:32 -07:00
Stephen Birarda
00998ba75e some fixes for new audio injector setup 2013-05-17 15:42:37 -07:00
birarda
c3288f6f89 Merge pull request #346 from birarda/voxel-noise 
fix broken eve
 2013-05-17 15:22:48 -07:00
Stephen Birarda
0d769329bf fix broken eve due to extra quote 2013-05-17 15:22:21 -07:00
birarda
b895f453ea Merge pull request #345 from birarda/voxel-noise 
fix memcmp in audio-mixer main
 2013-05-17 15:20:48 -07:00
Stephen Birarda
cfe4783fff correct the memcmp for audio stream identifier 2013-05-17 15:19:15 -07:00
birarda
efec33c6a2 Merge pull request #344 from birarda/voxel-noise 
include time for srand on UNIX
 2013-05-17 15:09:30 -07:00
Stephen Birarda
82c373242f include time for srand on UNIX 2013-05-17 15:09:11 -07:00
birarda
67bab7e73d Merge pull request #342 from birarda/voxel-noise 
use stream identifier to match injected audio across packets
 2013-05-17 15:07:29 -07:00
Stephen Birarda
85c0c1fa98 fix the mod so we get values up to 255 2013-05-17 15:07:12 -07:00
Jeffrey Ventrella
f5dc5b0a39 thingy 2013-05-17 14:57:15 -07:00
Stephen Birarda
d72b931ebe attach stream identifier to AudioRingBuffer to match incoming data in audio mixer 2013-05-17 14:57:10 -07:00
Jeffrey Ventrella
f099702d2a Merge remote-tracking branch 'upstream/master' 2013-05-17 14:56:51 -07:00
Jeffrey Ventrella
f2af37801e tidied up the head class and fixed a negated pitch value in orientation 2013-05-17 14:56:14 -07:00
Philip Rosedale
bb86d7a141 Merge pull request #341 from ZappoMan/voxel_animation 
fixed memory leak
 2013-05-17 14:40:09 -07:00
ZappoMan
0db62b58f5 fixed memory leak 2013-05-17 14:35:50 -07:00
Stephen Birarda
b7b39c2a6e have addOrUpdateAgent return a pointer to the agent instead of a bool 2013-05-17 14:03:15 -07:00
Philip Rosedale
a08745a9e8 Merge pull request #340 from ZappoMan/voxel_animation 
New Animation Server
 2013-05-17 13:57:11 -07:00
ZappoMan
726a67c6c8 CR feedback 2013-05-17 13:55:26 -07:00