Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 05:14:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
5501 commits 71 branches 56 tags 1.2 GiB
Commit graph

5501 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
ZappoMan
4305ad552d fix issue with JurisdictionMap being passed across wire 2013-08-14 14:19:06 -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
ZappoMan
e7b3d41c33 make PacketReceiver derive from GenericThread 2013-08-12 12:04:05 -07:00
ZappoMan
70344cdaf2 move voxel receiving into class 2013-08-12 11:46:57 -07:00
ZappoMan
d56fa5a933 Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2013-08-12 09:12:43 -07:00
Philip Rosedale
6e2e58a1e4 Merge pull request #847 from ZappoMan/master 
voxel sending/processing improvements
 2013-08-10 15:11:56 -07:00
ZappoMan
55f03608ab make voxel fade shorter elapsed time and logarithmic instead of linear 2013-08-10 12:20:01 -07:00
ZappoMan
8e2fcffd5c enabled Low Res sending while moving by default 2013-08-10 11:58:25 -07:00
ZappoMan
b5e2bc2093 implement threaded voxel processing 2013-08-10 11:35:59 -07:00
ZappoMan
22100bd035 Merge pull request #846 from ZappoMan/master 
fix small build issue in voxel-edit
 2013-08-10 11:32:56 -07:00
ZappoMan
996314012e fix small build issue in voxel-edit 2013-08-10 11:31:48 -07:00
Andrzej Kapolka
a3cee5d052 More efficiency for glow effect. 2013-08-09 16:16:02 -07:00
Andrzej Kapolka
9189a206b8 Merge branch 'master' of https://github.com/worklist/hifi into glow 2013-08-09 10:12:47 -07:00
ZappoMan
30e8b6c95d Merge pull request #845 from ZappoMan/master 
change path of flying bug
 2013-08-08 17:49:36 -07:00
ZappoMan
11212ca8d0 change path of flying bug 2013-08-08 17:48:45 -07:00
Andrzej Kapolka
1828a105d4 Basic glow effect. 2013-08-08 16:55:45 -07:00
Stephen Birarda
da97cf75b4 Merge pull request #842 from Atlante45/master 
Follow mode improvements
 2013-08-08 16:32:35 -07:00
atlante45
521eb19625 PR comments + Changed MIN and MAX scale 2013-08-08 16:22:26 -07:00
Stephen Birarda
60119ddd52 Merge pull request #843 from PhilipRosedale/master 
Better collision and click voxel sounds
 2013-08-08 16:16:19 -07:00
Stephen Birarda
81d53b68a3 Merge pull request #844 from ZappoMan/master 
fixed LOD disappear on backing up
 2013-08-08 16:15:19 -07:00
Philip Rosedale
0e1149a8ef Fixes per review 2013-08-08 16:11:51 -07:00
Stephen Birarda
789c2d9f78 Merge pull request #837 from ZappoMan/split_tool 
added tool for splitting SVOs on jurisdiction boundaries
 2013-08-08 16:11:38 -07:00