Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 14:59:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
1222 commits 25 branches 0 tags 1.1 GiB
Commit graph

542 commits

Author SHA1 Message Date
tosh
cf3e2635c1 brings Log class into stable state 2013-04-17 00:38:21 +02:00
tosh
58b40f7ed2 adds Log class 2013-04-17 00:37:21 +02:00
Philip Rosedale
98c8228161 had to take out call to myAvatar.getBonePosition - unclear why it now isn't working. 2013-04-12 21:11:03 -07:00
Philip Rosedale
d5d746ff9e Merge branch 'master' of https://github.com/worklist/hifi 2013-04-12 21:01:15 -07:00
Philip Rosedale
1d69acef56 Removed hand class files, relocated transmitter receiver function to Head.h 2013-04-12 21:01:01 -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
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
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
Stephen Birarda
cc2f35ca89 pass a ROOT_DIR to LinkHifiLibrary 2013-04-12 15:59:16 -07:00
Philip Rosedale
524ed7deb6 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-12 15:35:02 -07:00
ZappoMan
25f1f1ae3f include glmUtils.h so that we get vec3 opertator* 2013-04-12 15:08:57 -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
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
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
Stephen Birarda
aff3732052 some light refactoring in interface CMakeLists 2013-04-12 13:29:27 -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
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
Philip Rosedale
dcacad3755 Removed unneeded GLenable cruft 2013-04-12 10:02: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
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
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