Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 03:57:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
5754 commits 25 branches 0 tags 1.1 GiB
Commit graph

1185 commits

Author SHA1 Message Date
atlante45
688bc17954 Fixed avatar related files memory wastes 2013-09-03 13:37:25 -07:00
ZappoMan
38f54a3130 Merge branch 'master' of https://github.com/worklist/hifi into threaded_voxel_server 2013-08-21 17:03:34 -07:00
atlante45
12459079e9 Fixed magic number 2013-08-21 16:41:24 -07:00
atlante45
447d9a65ce Fixed only square png import + reduced amount of code 2013-08-21 16:36:50 -07:00
ZappoMan
25e21f862c flush delete queue after encode is complete 2013-08-21 16:23:55 -07:00
ZappoMan
e524ed889e Merge branch 'master' of https://github.com/worklist/hifi into threaded_voxel_server 
Conflicts:
	libraries/voxels/src/VoxelTree.cpp
	libraries/voxels/src/VoxelTree.h
 2013-08-21 13:48:23 -07:00
ZappoMan
4fd23a0cd9 CR feedback 2013-08-21 13:09:51 -07:00
ZappoMan
4bdaf7589f Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 2013-08-21 12:16:09 -07:00
ZappoMan
2c362e6288 adding support for better multithreading in VoxelTree 2013-08-21 12:09:00 -07:00
atlante45
867303e673 Code cleanup 2013-08-21 11:33:10 -07:00
atlante45
3eb5ace715 merge + few efficiency ameliorations to importDialog 2013-08-20 18:04:25 -07:00
ZappoMan
db6e327741 fixed build buster 2013-08-20 12:00:07 -07:00
ZappoMan
50532bc67d added NodeListHook to JurisdictionListener to properly remove nodes that are killed 2013-08-20 11:42:30 -07:00
ZappoMan
b0664163a7 removed debug 2013-08-20 11:27:31 -07:00
ZappoMan
da6bd2e3b0 cleanup, handle no JurisdictionMap case in JurisidictionSender 2013-08-20 11:22:51 -07:00
ZappoMan
436f70ab5d removed dead code 2013-08-20 11:12:22 -07:00
ZappoMan
0f7ea55e82 make animation-server work with jurisdictions 2013-08-20 11:08:20 -07:00
ZappoMan
5e7e6fc9d7 First cut at JurisdictionListener and PACKET_TYPE_VOXEL_JURISDICTION_REQUEST 2013-08-19 20:15:46 -07:00
atlante45
24531fdd10 Dialogbox for import fully functionnal 2013-08-19 15:54:51 -07:00
ZappoMan
2be85d439b Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 
Conflicts:
	interface/src/Application.cpp
	interface/src/VoxelPacketProcessor.cpp
	libraries/voxels/src/VoxelEditPacketSender.cpp
 2013-08-19 11:13:38 -07:00
ZappoMan
e64664c0d1 first cut at JurisdictionSender and related changes 2013-08-19 11:05:29 -07:00
ZappoMan
5a96f51602 first cut at JurisdictionSender and related changes 2013-08-19 10:30:22 -07:00
atlante45
6b58e1bfec merge 2013-08-16 20:24:18 -07:00
ZappoMan
68845da901 added doxygen comments and cleanup for VoxelSceneStats class 2013-08-16 10:10:17 -07:00
atlante45
68a1c56ad6 More work on import interface 2013-08-15 17:21:23 -07:00
Stephen Birarda
50e062edf2 some spacing cleanup in AvatarData 2013-08-15 16:06:48 -07:00
Stephen Birarda
154c6b4f32 fix disabling of occlusion culling from menu 2013-08-15 15:32:44 -07:00
Stephen Birarda
b288cc43a2 fix disabling of delta sending and low res while moving 2013-08-15 15:29:05 -07:00
Stephen Birarda
c930d058b1 fix monochrome option menu hook 2013-08-15 15:23:26 -07:00
ZappoMan
7045dff7d3 moved VoxelEditPacketSender to libraries 2013-08-15 14:26:31 -07:00
ZappoMan
209c9f93ed remove Application dependency from VoxelEditPacketSender class 2013-08-15 14:21:21 -07:00
ZappoMan
04440d30d8 Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 
Conflicts:
	libraries/voxels/src/JurisdictionMap.h
 2013-08-15 12:27:00 -07:00
Stephen Birarda
443203201e Merge remote-tracking branch 'upstream/master' into menu 2013-08-15 12:22:37 -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
8b867df762 style fix 2013-08-15 10:47:59 -07:00
ZappoMan
90fcfca561 style fix 2013-08-15 10:45:53 -07:00
ZappoMan
c157aad775 starting to add PACKET_TYPE_VOXEL_JURISDICTION 2013-08-15 10:44:43 -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
Stephen Birarda
c7b784aa1f signed UNKNOWN_NODE_ID should be 0 2013-08-14 15:31:23 -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
4305ad552d fix issue with JurisdictionMap being passed across wire 2013-08-14 14:19:06 -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
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