Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 06:37:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
2549 commits 76 branches 59 tags 1.2 GiB
Commit graph

2549 commits

This branch
This branch
All branches
Author SHA1 Message Date
birarda
a8ca7058a3 Merge pull request #293 from birarda/master 
remove left over walking sound stuff
 2013-05-10 17:45:11 -07:00
Stephen Birarda
2a47d8955a remove some leftover walking sound stuff 2013-05-10 17:44:50 -07:00
ZappoMan
ab552df7cf Merge pull request #290 from birarda/master 
eve should only inject audio when somebody gets close enough
 2013-05-10 17:42:03 -07:00
Philip Rosedale
4a4184b327 Head in first person follows head mouse at edges of screen 2013-05-10 17:41:16 -07:00
Stephen Birarda
e7fb7d05f0 remove an extra g 2013-05-10 17:39:38 -07:00
Stephen Birarda
d511ad4a07 more type squishes in eve main 2013-05-10 17:39:17 -07:00
Stephen Birarda
02caba909a type squish in eve main 2013-05-10 17:38:50 -07:00
Andrzej Kapolka
f0573e6ee5 When we add (or recolor) a voxel, make sure it has no children. When we 
attempt to remove a voxel that would be a child of a larger solid one, carve
up the parent.
 2013-05-10 17:31:55 -07:00
Jeffrey Ventrella
847bfbdadd mode cleanup after head operation 2013-05-10 17:29:04 -07:00
Stephen Birarda
82ed4a4ae8 remove old style walking sounds 2013-05-10 17:21:58 -07:00
Stephen Birarda
7abe5024d9 some space removals in Interface main.cpp 2013-05-10 17:20:07 -07:00
Jeffrey Ventrella
b2d5bfab2b clean up from headotomy 2013-05-10 17:12:16 -07:00
Jeffrey Ventrella
2d12b9b800 Merge remote-tracking branch 'upstream/master' 2013-05-10 17:06:25 -07:00
Jeffrey Ventrella
7fc2756257 I just did a headotomy (removed all head-related stuff from Avatar and made it its own class) 2013-05-10 17:05:52 -07:00
Stephen Birarda
626ae1c779 lower Eve's volume to about 75% 2013-05-10 16:55:18 -07:00
Philip Rosedale
6b75fe6e21 Merge remote-tracking branch 'upstream/master' 2013-05-10 16:49:28 -07:00
Stephen Birarda
f8fcbca488 have eve only inject audio when another avatar gets close to her 2013-05-10 16:49:05 -07:00
Philip Rosedale
5e21cb48ba First person added to render mode and 'p' key 2013-05-10 16:48:21 -07:00
birarda
6223b9537f Merge pull request #289 from birarda/master 
last bit of conditional changes for Oculus
 2013-05-10 15:34:08 -07:00
Stephen Birarda
44814a275c have OculusManager::isConnected always return false if not APPLE 2013-05-10 15:33:36 -07:00
birarda
a9fee08bb4 Merge pull request #288 from birarda/master 
more conditional changes for oculus
 2013-05-10 15:31:04 -07:00
Stephen Birarda
9db694f683 condtional calls to constructors in OculusManager on APPLE only 2013-05-10 15:30:31 -07:00
birarda
fd8e37ef21 Merge pull request #287 from birarda/master 
conditionals in OculusManager for APPLE
 2013-05-10 15:28:05 -07:00
Stephen Birarda
4c2b729047 assume that oculus will only be from APPLE machines 2013-05-10 15:27:02 -07:00
birarda
d43510c5bc Merge pull request #286 from birarda/master 
revert the last change
 2013-05-10 15:06:06 -07:00
Stephen Birarda
e15cf93443 Revert "link to LIBOVR_LIBRARY before calling add_executable" 
This reverts commit b2776f25ac.
 2013-05-10 15:05:36 -07:00
birarda
625b51ba75 Merge pull request #285 from birarda/master 
another attempt to fix link issues
 2013-05-10 15:04:07 -07:00
Stephen Birarda
b2776f25ac link to LIBOVR_LIBRARY before calling add_executable 2013-05-10 15:03:46 -07:00
birarda
9e85b31444 Merge pull request #284 from birarda/master 
attempted fix for UNIX link order of LibOVR library
 2013-05-10 14:55:26 -07:00
Stephen Birarda
7edb7590a7 link the OVR library seperately from the QT_LIBRARIES 2013-05-10 14:54:44 -07:00
birarda
044c2522c2 Merge pull request #283 from ZappoMan/render_voxels_optimization 
Optimized VoxelNode::isLeaf()
 2013-05-10 14:45:59 -07:00
ZappoMan
ddd55104c1 CR feedback 2013-05-10 14:45:18 -07:00
ZappoMan
6c84e9015e Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-10 14:33:08 -07:00
ZappoMan
ef20b3e4b3 optimized performance of VoxelNode::isLeaf() 2013-05-10 14:32:44 -07:00
birarda
097524ed59 Merge pull request #282 from birarda/master 
remove the oculus lib source files, not required
 2013-05-10 14:30:42 -07:00
Stephen Birarda
535e890710 remove the source files from the LibOVR dir 2013-05-10 14:29:33 -07:00
birarda
70f0b42937 Merge pull request #281 from birarda/master 
typo in name for oculus unix library
 2013-05-10 14:21:59 -07:00
Stephen Birarda
2309f30762 another typo fix for unix reference to Oculus library 2013-05-10 14:21:24 -07:00
birarda
45d87b4232 Merge pull request #280 from birarda/master 
find incorrect reference to OVR library
 2013-05-10 14:15:43 -07:00
Stephen Birarda
4d7d6aba8b use capital L for lib directory for LibOVR 2013-05-10 14:15:00 -07:00
ZappoMan
1f85a4a4c9 Merge pull request #279 from birarda/oculus 
initial setup for oculus pitch, yaw and roll
 2013-05-10 14:06:10 -07:00
Stephen Birarda
a059e44011 resolve conflicts on merge with upstream master 2013-05-10 14:01:52 -07:00
Stephen Birarda
9ee3f889ab Merge remote-tracking branch 'upstream/master' into oculus 2013-05-10 14:00:10 -07:00
Stephen Birarda
e5fce7d83e remove a useless comment 2013-05-10 13:55:26 -07:00
Stephen Birarda
f447abe03b zero the yaw on oculus connect, set head yaw instead of body 2013-05-10 13:52:54 -07:00
Philip Rosedale
97f91403a3 Merge pull request #278 from ZappoMan/render_voxels_optimization 
Implement Partial VBO strategy in copyWrittenDataToReadArrays()
 2013-05-10 13:50:49 -07:00
Philip Rosedale
06edcb50c5 Merge pull request #277 from Ventrella/master 
made some improvements to handholding
 2013-05-10 13:49:09 -07:00
Jeffrey Ventrella
2032264e7e pull avatar from handshake 2013-05-10 13:42:51 -07:00
Jeffrey Ventrella
ca5adb791c pull avatars from handholding 2013-05-10 13:25:40 -07:00
ZappoMan
b9a023af37 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-10 13:19:06 -07:00