Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-18 21:20:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
84280 commits 72 branches 59 tags 1.2 GiB
Commit graph

84280 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeffrey Ventrella
265fcc6095 a few small fixes on the avatar springs 2013-04-12 15:00:48 -07:00
birarda
f2b9071254 Merge pull request #33 from birarda/reorganize 
moved MarkerNode from shared to voxel library
 2013-04-12 14:51:47 -07:00
Stephen Birarda
c3b457febb moved MarkerNode from shared to voxel library 2013-04-12 14:51:12 -07:00
Stephen Birarda
46e38aa0cb remove a line to test git folder reference 2013-04-12 14:45:37 -07:00
ZappoMan
862ee47fbb moving voxellib to libraries/voxels 2013-04-12 13:40:33 -07:00
ZappoMan
cf6b8fe72f Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-12 13:37:34 -07:00
ZappoMan
d01d1164ca latest view frustum work 2013-04-12 13:36:44 -07:00
ZappoMan
c1c093b71d Merge pull request #32 from birarda/reorganize 
some directory re-organization, DRYing up CMake stuff
 2013-04-12 13:34:53 -07:00
Stephen Birarda
aff3732052 some light refactoring in interface CMakeLists 2013-04-12 13:29:27 -07:00
Stephen Birarda
96d3f5a27d move voxel to voxel-server, use setup project macro 2013-04-12 13:25:59 -07:00
Stephen Birarda
44c2099183 move space to space-server, use setup project macro 2013-04-12 13:23:07 -07:00
Stephen Birarda
b0ff960e37 use MACRO_DIR variable to find glm in root externals dir 2013-04-12 13:20:46 -07:00
Stephen Birarda
7fb52c529e move mixer to audio-mixer, use SetupHifiProject macro 2013-04-12 13:17:10 -07:00
Stephen Birarda
c2cb7cf397 rename MACRO_DIRECTORY variable to MACRO_DIR in voxels lib 2013-04-12 13:13:58 -07:00
Stephen Birarda
3e6b794f11 rename domain target to domain server, use SetupHifiProject 2013-04-12 13:12:56 -07:00
Stephen Birarda
31f3f0c31c add a MACRO_DIRECTORY variable to voxels CMakeLists 2013-04-12 13:09:22 -07:00
Stephen Birarda
e434b06ed9 rename avatar target to avatar-mixer, add SetupHifiProject macro 2013-04-12 13:08:21 -07:00
Stephen Birarda
67efc12e59 move shared to libraries, DRY library macro, rename libs 2013-04-12 12:38:34 -07:00
ZappoMan
76d22f1b2b more angle tweaks 2013-04-12 11:34:10 -07:00
ZappoMan
7f1ba5c733 playing around with fov angle 2013-04-12 11:26:32 -07:00
birarda
0ff32a72ef Merge pull request #31 from ZappoMan/voxel_lod_fixes 
Moving around glm and other shared libs
 2013-04-12 10:52:37 -07:00
ZappoMan
c96ed40735 remove ViewFrustum class for now 2013-04-12 10:48:47 -07:00
Philip Rosedale
dcacad3755 Removed unneeded GLenable cruft 2013-04-12 10:02:41 -07:00
ZappoMan
724bddf749 more file moving 2013-04-11 18:59:41 -07:00
ZappoMan
b34d1b5c05 more moving around of things 2013-04-11 18:56:46 -07:00
ZappoMan
85bef98f4a Merge branch 'master' of https://github.com/worklist/hifi into voxel_lod_fixes 2013-04-11 18:42:12 -07:00
ZappoMan
4364a0e692 moved stuff around to migrate glm to shared 2013-04-11 18:41:12 -07:00
birarda
e638805bd7 Merge pull request #30 from PhilipRosedale/master 
Added startup timer
 2013-04-11 17:54:45 -07:00
Philip Rosedale
76e2ca301e Fixes stephen asked for - remove finger stuff 2013-04-11 17:53:57 -07:00
Philip Rosedale
27c032270c Resolved merge 2013-04-11 17:49:43 -07:00
Philip Rosedale
47dfb08ff2 Merge remote-tracking branch 'origin/startupTimer' 2013-04-11 17:46:20 -07:00
birarda
9ea6457c0c Merge pull request #28 from PhilipRosedale/master 
Trivial change for Stephen to teach me
 2013-04-11 17:41:19 -07:00
Jeffrey Ventrella
948ca6279c improved avatar handshake forces 2013-04-11 17:39:18 -07:00
Philip Rosedale
f1bf7d0eb5 trivial test, removed one unneeded variable 2013-04-11 17:35:32 -07:00
Jeffrey Ventrella
766fad8c2a Merge branch 'master' of https://github.com/worklist/hifi 2013-04-11 16:51:27 -07:00
Jeffrey Ventrella
1dc390bf3a working on avatar local ori motions 2013-04-11 16:51:08 -07:00
ZappoMan
b3a811498a Merge pull request #27 from birarda/singleton 
manage one AgentList per process via singleton
 2013-04-11 16:50:13 -07:00
Stephen Birarda
7c3f5264b5 resolve conflicts on merge with upstream master 2013-04-11 16:48:40 -07:00
Stephen Birarda
a1d209dd70 manage one AgentList per process via singleton 2013-04-11 15:45:04 -07:00
Jeffrey Ventrella
bd09084031 cleaned up some Orientation formtting 2013-04-11 15:37:15 -07:00
Jeffrey Ventrella
661d5fdb3e Merge 
Merge branch 'master' of https://github.com/worklist/hifi
 2013-04-11 15:32:44 -07:00
Jeffrey Ventrella
556f11a0c0 added test 'other' avatar for proxemixs testing 2013-04-11 15:32:35 -07:00
ZappoMan
f376b954ca Merge branch 'master' of https://github.com/worklist/hifi into voxel_lod_fixes 2013-04-11 14:58:14 -07:00
birarda
f706c68777 Merge pull request #26 from birarda/master 
delete the Vector3D class no longer in use
 2013-04-11 14:57:47 -07:00
Stephen Birarda
606c91bb47 remove the Vector3D class, not in use 2013-04-11 14:56:10 -07:00
ZappoMan
a68ae64a17 Merge branch 'master' of https://github.com/worklist/hifi into voxel_lod_fixes 2013-04-11 13:07:52 -07:00
Jeffrey Ventrella
6f0881f40d reversed left-right strafe 2013-04-11 13:06:47 -07:00
ZappoMan
e9ef765021 set default frustum to cameraFrustum not head frustum 2013-04-11 12:51:43 -07:00
birarda
b08c0b7159 Merge pull request #25 from ZappoMan/voxel_lod_fixes 
Testing
 2013-04-11 11:44:45 -07:00
ZappoMan
2adb0860e8 testing 2013-04-11 11:41:55 -07:00