Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-16 04:56:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
2532 commits 74 branches 59 tags 1.2 GiB
Commit graph

1284 commits

Author SHA1 Message Date
Jeffrey Ventrella
54010d36c4 created transitions between camera modes 2013-05-13 16:53:45 -07:00
Jeffrey Ventrella
6c3de00bcd cleaned up some code spacing 2013-05-13 14:53:05 -07:00
Jeffrey Ventrella
6f1000447b Merge remote-tracking branch 'upstream/master' 2013-05-13 14:01:32 -07:00
Jeffrey Ventrella
3ab0fa4e8c added code to detect mouse hovering over avatar joints for various touch effects 2013-05-13 14:00:25 -07:00
Andrzej Kapolka
7a653741de Don't set the renderFullVBOs flag; that's not the problem. 2013-05-13 12:30:56 -07:00
Andrzej Kapolka
57af5b11dd Start out with voxel editing disabled; let the add/delete/color buttons toggle 
the mode.
 2013-05-13 11:27:55 -07:00
Andrzej Kapolka
4bbd3e2e07 Better way of coming up with a contrasting color. 2013-05-13 09:41:50 -07:00
Andrzej Kapolka
eb77f5ff83 Removed debug code, more tests for staged-for-deletion. 2013-05-12 20:36:10 -07:00
Andrzej Kapolka
be88fec7d3 Fixed the major bug, which is that non-leaves were being collapsed. Update 
full VBO on deletion, since otherwise we don't see the update.
 2013-05-12 20:08:01 -07:00
Andrzej Kapolka
4289921b7e Merge branch 'master' of https://github.com/worklist/hifi 2013-05-11 15:39:18 -07:00
Andrzej Kapolka
9802403749 Let's do some locking to prevent simultaneous access from different threads. 2013-05-11 15:38:49 -07:00
Jeffrey Ventrella
442632f467 fixed merge conflict 2013-05-11 11:50:19 -07:00
Jeffrey Ventrella
5c10ca5677 Merge remote-tracking branch 'upstream/master' 2013-05-11 11:48:34 -07:00
Jeffrey Ventrella
08aba4decb fixed problem of camera shifting when application starts (made camera jump to ideal position/rotation when initialized) 2013-05-11 11:48:00 -07:00
Philip Rosedale
f115f2a991 fixes to repair merge 2013-05-11 10:55:20 -07:00
Philip Rosedale
dec7e5921c Merge remote-tracking branch 'upstream/master' 2013-05-11 10:49:23 -07:00
Philip Rosedale
a89b011ddf Spacing fixes 2013-05-11 10:47:02 -07:00
Philip Rosedale
a1e9235db5 fixed per review 2013-05-11 10:41:34 -07:00
Philip Rosedale
59a681ee44 Fixes per review. 2013-05-11 10:19:57 -07:00
Jeffrey Ventrella
ab9fa0a556 cleaned up some code 2013-05-10 22:31:51 -07:00
Jeffrey Ventrella
f1346604f4 indentation 2013-05-10 22:10:06 -07:00
Jeffrey Ventrella
1e4305d277 Merge remote-tracking branch 'upstream/master' 2013-05-10 21:58:52 -07:00
Jeffrey Ventrella
e4c84e7b74 added mouse view shift behaviors 2013-05-10 21:58:11 -07:00
Andrzej Kapolka
750843e867 More editing progress. Now there are threading issues. Joy! 2013-05-10 21:02:08 -07:00
Stephen Birarda
2a47d8955a remove some leftover walking sound stuff 2013-05-10 17:44:50 -07:00
Philip Rosedale
4a4184b327 Head in first person follows head mouse at edges of screen 2013-05-10 17:41:16 -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
Philip Rosedale
6b75fe6e21 Merge remote-tracking branch 'upstream/master' 2013-05-10 16:49:28 -07:00
Philip Rosedale
5e21cb48ba First person added to render mode and 'p' key 2013-05-10 16:48:21 -07:00
Stephen Birarda
44814a275c have OculusManager::isConnected always return false if not APPLE 2013-05-10 15:33:36 -07:00
Stephen Birarda
9db694f683 condtional calls to constructors in OculusManager on APPLE only 2013-05-10 15:30:31 -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
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
Stephen Birarda
535e890710 remove the source files from the LibOVR dir 2013-05-10 14:29:33 -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