Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-30 01:07:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85615 commits 28 branches 28 tags 1.2 GiB
Commit graph

85615 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
cb233e843c Merge branch 'master' of github.com:worklist/hifi into reorganize 2013-04-12 17:25:41 -07:00
birarda
e5bcf2b620 Merge pull request #39 from ZappoMan/view_frustum_work 
View frustum work
 2013-04-12 17:25:30 -07:00
ZappoMan
54ba0d0224 cleaned up spacing for code review 2013-04-12 17:23:23 -07:00
ZappoMan
ca4286590e fixed column width to match codeing standard 2013-04-12 17:14:08 -07:00
ZappoMan
7c7c931e83 fixed build buster after merge 2013-04-12 17:10:04 -07:00
ZappoMan
98904d84ff Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 
Conflicts:
	interface/src/Head.cpp
 2013-04-12 17:02:11 -07:00
ZappoMan
5a8c5ff011 coding standards clean up 2013-04-12 16:55:57 -07:00
Jeffrey Ventrella
6ddebd523c cleaned up Orientation calls to right, up, front 2013-04-12 16:52:31 -07:00
Stephen Birarda
787bebb5fc don't call constructor and assignment operator 2013-04-12 16:51:59 -07:00
ZappoMan
5504d87212 Merge and Cleanup 
-Cleanup glmUtils(as in, get rid of it)
-Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
 2013-04-12 16:32:46 -07:00
Stephen Birarda
1415a25302 fix for warnings produced by CounterStats refactor 2013-04-12 16:22:35 -07:00
Philip Rosedale
5368cbf79a Merge branch 'master' of https://github.com/worklist/hifi 2013-04-12 16:15:01 -07:00
Philip Rosedale
6d7f343be8 draw a test sphere around my hand in orldspace 2013-04-12 16:13:40 -07:00
Jeffrey Ventrella
5cb0d84990 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-12 16:12:54 -07:00
Jeffrey Ventrella
84ca2dcb32 added get avatar bone 2013-04-12 16:12:31 -07:00
ZappoMan
c35be18697 Merge pull request #38 from birarda/reorganize 
pass a ROOT_DIR to LinkHifiLibrary
 2013-04-12 16:00:59 -07:00
Stephen Birarda
cc2f35ca89 pass a ROOT_DIR to LinkHifiLibrary 2013-04-12 15:59:16 -07:00
ZappoMan
2ea8ce8ef8 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-12 15:37:54 -07:00
birarda
e33dbceefb Merge pull request #37 from birarda/reorganize 
change a couple more long ints
 2013-04-12 15:35:31 -07:00
Stephen Birarda
f6adac1399 change a couple more long ints 2013-04-12 15:35:06 -07:00
Philip Rosedale
524ed7deb6 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-12 15:35:02 -07:00
ZappoMan
6e96408168 Merge pull request #36 from birarda/reorganize 
change long int to long in CounterStats
 2013-04-12 15:28:05 -07:00
Stephen Birarda
d30512e273 remove another long int 2013-04-12 15:25:41 -07:00
Stephen Birarda
83ee450759 change long int to long in CounterStats 2013-04-12 15:18:04 -07:00
Stephen Birarda
9b73d2559d Revert "add dependency to shared library from voxel library" 
This reverts commit e9d71c9406.
 2013-04-12 15:15:19 -07:00
ZappoMan
25f1f1ae3f include glmUtils.h so that we get vec3 opertator* 2013-04-12 15:08:57 -07:00
birarda
cd8604ebf2 Merge pull request #35 from birarda/reorganize 
add dependency on shared library from voxel library
 2013-04-12 15:08:55 -07:00
Stephen Birarda
a2d298a8e6 Merge branch 'master' of github.com:worklist/hifi into reorganize 2013-04-12 15:08:05 -07:00
Stephen Birarda
e9d71c9406 add dependency to shared library from voxel library 2013-04-12 15:06:51 -07:00
ZappoMan
77996fb140 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-12 15:06:41 -07:00
Jeffrey Ventrella
8b9017a244 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-12 15:05:07 -07:00
birarda
f64dc9fce7 Merge pull request #34 from birarda/reorganize 
include the shared headers to the voxel library
 2013-04-12 15:03:36 -07:00
Stephen Birarda
13cde69da2 include the shared headers to the voxel library 2013-04-12 15:03:02 -07:00
ZappoMan
d568cce0cd changed interface to use ViewFrustum class for rendering view frustum 
- updated ViewFrustum class to work correctly
- added new keyboard interface to adjust offset camera position and up
- removed keyboard interface for local add sphere, since we don't need that anymore
 2013-04-12 15:01:48 -07:00
Jeffrey Ventrella
15c9053fac Merge branch 'master' of https://github.com/worklist/hifi 2013-04-12 15:01:38 -07:00
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