Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 13:51:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
5083 commits 75 branches 59 tags 1.2 GiB
Commit graph

5083 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeffrey Ventrella
c6d301c591 cleanup 2013-07-29 17:21:45 -07:00
ZappoMan
620fe12358 support for multiple voxel servers in ping stats 2013-07-29 16:31:14 -07:00
Andrzej Kapolka
f6d1055f00 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-29 16:24:22 -07:00
ZappoMan
95e6fb16d0 cleanup 2013-07-29 16:17:57 -07:00
Jeffrey Ventrella
3444aa9158 Merge remote-tracking branch 'upstream/master' into particles 2013-07-29 16:16:20 -07:00
ZappoMan
69bae24d82 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-07-29 16:16:04 -07:00
Jeffrey Ventrella
df32c18994 cleanup 2013-07-29 16:15:44 -07:00
ZappoMan
1b85ad1b82 cleanup 2013-07-29 16:15:37 -07:00
Andrzej Kapolka
934b152f3e Merge pull request #730 from ey6es/master 
These casts should fix the warnings on OS X.
 2013-07-29 16:13:09 -07:00
Andrzej Kapolka
4ae4623315 These casts should fix the warnings on OS X. 2013-07-29 16:12:11 -07:00
Andrzej Kapolka
de52342a14 Working on depth data processing. 2013-07-29 16:04:15 -07:00
ZappoMan
c5ab321bd9 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-07-29 15:54:52 -07:00
Jeffrey Ventrella
4b07d656f4 Merge remote-tracking branch 'upstream/master' into particles 2013-07-29 15:47:22 -07:00
Jeffrey Ventrella
79823c6fed cleanup 2013-07-29 15:47:01 -07:00
Andrzej Kapolka
3b3801915b Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-29 15:44:41 -07:00
Andrzej Kapolka
6bc3e9b808 Merge pull request #726 from ZappoMan/bug_fixes 
fix bug with dragonfly leaving trailing bits
 2013-07-29 15:44:31 -07:00
ZappoMan
1a73485e36 Improved VoxelNode delete callback based on CR feedback 
- changed hooks to use a virtual base class approach
- switched account of hooks to use a vector instead of home grown solution
- added support for VoxelNode to know what VoxelSystem it belongs to
 2013-07-29 15:30:30 -07:00
Andrzej Kapolka
c678b79373 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-29 15:17:55 -07:00
Jeffrey Ventrella
a1eba53678 cleanup 2013-07-29 15:09:38 -07:00
Jeffrey Ventrella
f8392c0843 Merge remote-tracking branch 'upstream/master' into particles 2013-07-29 15:07:56 -07:00
Jeffrey Ventrella
37ff8ae030 added color modulation 2013-07-29 15:07:05 -07:00
Leonardo Murillo
83e90cba49 Merge pull request #729 from murillodigital/master 
Fixing cmake path on seed's groovy
 2013-07-29 15:02:38 -07:00
Leonardo Murillo
9662b956c7 Fixing cmake path on seed's groovy 2013-07-29 16:00:55 -06:00
ZappoMan
86bf268eef first cut at multiple voxel servers 2013-07-29 14:56:33 -07:00
Andrzej Kapolka
fac3ff1089 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-29 14:35:31 -07:00
Andrzej Kapolka
855d388424 Merge pull request #727 from LionTurtle/master 
Fix first person camera positioning to correspond to eyelevel.
 2013-07-29 14:35:14 -07:00
ZappoMan
e20f163e0a changed some defines to consts 2013-07-29 13:34:58 -07:00
ZappoMan
03a75ab295 fixed spacing 2013-07-29 13:08:05 -07:00
ZappoMan
97aaa738c3 fixed typo 2013-07-29 13:07:12 -07:00
ZappoMan
d6428a8145 removed unneeded cast 2013-07-29 13:03:42 -07:00
ZappoMan
6a2bab2a2c Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes 2013-07-29 13:02:14 -07:00
Mark Peng
bfd7f3a6c9 Remove rendering of your own avatar's lookatVectors. This fixes the 
behavior where if you are moving and jumping, you will occasionally see
your own lookatVectors on your screen.
 2013-07-29 12:25:01 -07:00
Mark Peng
bd663a8c22 Merge remote-tracking branch 'upstream/master' 2013-07-29 12:09:27 -07:00
Mark Peng
d01f694d49 Remove extra semicolon in avatar.cpp 2013-07-29 11:52:29 -07:00
Andrzej Kapolka
1f076cc268 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-29 10:50:55 -07:00
Andrzej Kapolka
cbc0b59c24 Merge pull request #728 from ey6es/master 
The particle system is killing the frame rate, so let's make it toggleable.  Also fixed GCC warnings.
 2013-07-29 10:47:15 -07:00
Andrzej Kapolka
20360ad3e9 Make particle system update/render toggleable, fix GCC compile warnings. 2013-07-29 10:41:45 -07:00
Andrzej Kapolka
b02c5f103d Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-29 10:14:39 -07:00
Andrzej Kapolka
5812747ef8 Double the bitrate to see if we can reduce the blockiness. 2013-07-29 10:06:03 -07:00
Jeffrey Ventrella
f83ee1e0b5 cleanup 2013-07-29 09:48:28 -07:00
Mark Peng
dd2655825a Fix first person camera positioning to correspond to eyelevel. 
This makes sure the lookatVectors don't seem to point upwards when
looking at you.
 2013-07-26 16:08:17 -07:00
Jeffrey Ventrella
a5a9784e6b cleanup 2013-07-26 15:44:32 -07:00
Jeffrey Ventrella
65278609f2 cleanup 2013-07-26 15:40:06 -07:00
Jeffrey Ventrella
937574a6b5 cleanup 2013-07-26 15:25:13 -07:00
Jeffrey Ventrella
05e0bf3e84 added collision plane 2013-07-26 15:21:10 -07:00
Jeffrey Ventrella
cecb908dc1 cleanup 2013-07-26 12:53:40 -07:00
Jeffrey Ventrella
8cecd67731 cleanup 2013-07-26 12:46:27 -07:00
Jeffrey Ventrella
ad00747c29 cleanup 2013-07-26 12:44:17 -07:00
Jeffrey Ventrella
13207c3b4c Merge remote-tracking branch 'upstream/master' into particles 2013-07-26 12:39:25 -07:00
Jeffrey Ventrella
9890cf72ce added keyboard mode switching for rave glove effects 2013-07-26 12:37:37 -07:00