Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 08:36:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2532 commits 71 branches 56 tags 1.2 GiB
Commit graph

2532 commits

This branch
This branch
All branches
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
ZappoMan
121a819bda Merge pull request #296 from birarda/master 
refactoring for available devices in pairing server
 2013-05-13 13:20:39 -07:00
Stephen Birarda
3fdd9c5a39 some refactoring for device parsing in pairing server 2013-05-13 13:17:14 -07:00
ZappoMan
bf37222d79 Merge pull request #295 from ey6es/master 
Voxel deletion, bugfixes for voxel code.
 2013-05-13 13:14:52 -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
Andrzej Kapolka
f4565b329a lengthOfVoxelData already includes the length of the color data. 2013-05-11 15:37:06 -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
ZappoMan
5509215f15 Merge pull request #291 from PhilipRosedale/master 
First Person mode in render menu and 'p'
 2013-05-11 11:05:49 -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
d7d435177d Merge pull request #294 from ZappoMan/render_voxels_optimization 
Optimized distanceToCamera()
 2013-05-10 22:45:20 -07:00
ZappoMan
8e4c75ada0 Merge pull request #292 from Ventrella/master 
Headotomy (made head its own class to prepare for future development)
 2013-05-10 22:33:58 -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
ZappoMan
af7057619a Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-10 18:13:22 -07:00
ZappoMan
930353e658 optimized distanceToCamera() added distanceToPoint() and distanceSquaredToPoint() 2013-05-10 18:13:08 -07:00
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