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

5521 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
d4be99ae2b add missing folderWhereYouRunDoxygen option 2013-08-15 17:17:30 -07:00
Stephen Birarda
3f5cf8f714 add missing queue for doxygen job 2013-08-15 17:07:12 -07:00
Stephen Birarda
6dd4aaf177 add docs job to groovy 2013-08-15 16:58:37 -07:00
ZappoMan
2ae5a56b6e Merge pull request #854 from ey6es/glow 
Three other glow techniques, with menu option to cycle between them.
 2013-08-15 12:21:11 -07:00
Andrzej Kapolka
ace9da5b85 Merge pull request #852 from ZappoMan/voxel_sending_helper 
Improvements to Voxel Edit in the client
 2013-08-15 12:10:12 -07:00
ZappoMan
74100ad043 make threads sleep 2013-08-15 12:01:50 -07:00
ZappoMan
4f16157e51 CR feedback 2013-08-15 11:39:00 -07:00
ZappoMan
8e07bd42ea removed app from SendVoxelsOperationArgs since its available as singleton 2013-08-15 10:51:56 -07:00
ZappoMan
8b867df762 style fix 2013-08-15 10:47:59 -07:00
ZappoMan
90fcfca561 style fix 2013-08-15 10:45:53 -07:00
ZappoMan
ced61e94d8 added more doxygen comments 2013-08-15 08:48:21 -07:00
ZappoMan
beec5f60d8 renamed class to be more appropriate, added doxygen comments 2013-08-15 08:36:06 -07:00
Andrzej Kapolka
95fee434a7 Don't make the avatars glow; that was just for testing. 2013-08-14 17:37:50 -07:00
Andrzej Kapolka
ab9d414340 Doxygen comment fix. 2013-08-14 17:22:43 -07:00
Andrzej Kapolka
690e2c1965 Blur/add should be the default. 2013-08-14 16:58:04 -07:00
Andrzej Kapolka
7cd1360ba7 Doxygen-style comments. 2013-08-14 16:48:00 -07:00
Andrzej Kapolka
621d32b506 Merge branch 'master' of https://github.com/worklist/hifi into glow 2013-08-14 16:41:30 -07:00
Andrzej Kapolka
8238d0d380 Merge pull request #851 from birarda/master 
intial rev of Doxyfile
 2013-08-14 16:41:22 -07:00
Andrzej Kapolka
a9ccca3f72 Diffuse/add glow mode. 2013-08-14 16:13:30 -07:00
ZappoMan
266d57264b fix build buster 2013-08-14 14:57:23 -07:00
ZappoMan
1730f7f2f6 fix build buster 2013-08-14 14:48:16 -07:00
ZappoMan
18e5d49d75 move move constructors and assignments into IFDEFS for now to fix build buster 2013-08-14 14:46:40 -07:00
Andrzej Kapolka
e2513901ef Merge branch 'master' of https://github.com/worklist/hifi into glow 2013-08-14 14:38:21 -07:00
ZappoMan
21f521f3a5 fix build buster 2013-08-14 14:33:47 -07:00
ZappoMan
d19e2d7490 merge repair 2013-08-14 14:23:13 -07:00
ZappoMan
153f444c32 merge repair 2013-08-14 14:22:50 -07:00
ZappoMan
4227d75942 merge repair 2013-08-14 14:21:25 -07:00
Stephen Birarda
bedd98cdfd initial rev of Doxyfile to generate HTML documentation for our classes 2013-08-14 14:20:47 -07:00
ZappoMan
4305ad552d fix issue with JurisdictionMap being passed across wire 2013-08-14 14:19:06 -07:00
Andrzej Kapolka
15f129f32d Added simple additive/blur-with-persist glow modes, means to cycle through 
modes.
 2013-08-14 14:14:47 -07:00
ZappoMan
a43615e9dc repair bad merge 2013-08-14 13:20:22 -07:00
ZappoMan
4477289501 repair bad merge 2013-08-14 13:18:41 -07:00
ZappoMan
f09dcfa4b7 Merge branch 'master' of https://github.com/worklist/hifi into voxel_sending_helper 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2013-08-14 13:12:23 -07:00
ZappoMan
d4fc4617af Merge pull request #850 from ey6es/glow 
Added generic glow effect, enabled for voxel create/delete and follow indicators.
 2013-08-14 13:05:20 -07:00
Andrzej Kapolka
d24e340c91 To keep the frame rate up, let's only sample eight points for the blur. 2013-08-13 14:52:35 -07:00
Andrzej Kapolka
581b60995a Merge branch 'master' of https://github.com/worklist/hifi into glow 2013-08-13 14:37:10 -07:00
Andrzej Kapolka
0bd54845d2 Merge pull request #849 from ey6es/master 
Gonna access that vector from two threads?  Need to lock it.  This was crashing all the time for me.
 2013-08-13 14:33:32 -07:00
Andrzej Kapolka
48bee0e52c Gonna access that vector from two threads? Need to lock it. 2013-08-13 14:29:49 -07:00
Andrzej Kapolka
01cd0d2a1f Have the glow effect add half of the original texture, too, and use it on the 
follow indicator.
 2013-08-13 14:22:29 -07:00
ZappoMan
02f2de6101 properly send full jurisdiction details in scene stats 2013-08-13 13:43:46 -07:00
ZappoMan
27d001a84d copy the jurisdication end nodes into voxel scene stats 2013-08-13 13:29:55 -07:00
Andrzej Kapolka
f6209b702c Use glow effect for follow indicator. 2013-08-13 13:16:59 -07:00
Andrzej Kapolka
b05b43f027 Render to texture first, rather than copying from the frame buffer. Copying 
from the frame buffer requires it to have an alpha channel, which actually
does something on OS X (meaning we have to set it to 1.0).  We're going to
want to render to texture anyway for SSAO (or other effects).
 2013-08-13 12:27:52 -07:00
ZappoMan
d3ce3e4e60 some cleanup and fixing of memory issue 2013-08-13 11:37:57 -07:00
ZappoMan
60dedee739 make JurisdictionMap handle copy/move/assigment so that it will work in std::vector<> and std::map<>, switch application to have map of JurisdictionMap objects instead of just root codes 2013-08-13 11:08:43 -07:00
Andrzej Kapolka
c1f6794295 Merge branch 'master' of https://github.com/worklist/hifi into glow 2013-08-13 09:49:18 -07:00
Stephen Birarda
015ff4a801 Merge pull request #848 from ZappoMan/bugfixes 
make voxel fade shorter elapsed time and logarithmic instead of linear
 2013-08-12 17:00:50 -07:00
ZappoMan
7d2c69f530 latest work on threaded sending 2013-08-12 16:55:58 -07:00
ZappoMan
ce0c868c89 cleanup naming 2013-08-12 13:40:21 -07:00
ZappoMan
4ea0de1637 deleting old dead code 2013-08-12 13:39:01 -07:00