Andrzej Kapolka
|
26411a42b1
|
More focal length bits.
|
2013-09-06 15:07:15 -07:00 |
|
atlante45
|
b8c18bee2d
|
merge
|
2013-09-04 15:31:12 -07:00 |
|
atlante45
|
5da525fc3e
|
memory wastes and code cleaning PR comments
|
2013-09-04 15:12:24 -07:00 |
|
atlante45
|
b03482ead5
|
Some more memory leaks and codes formatting
|
2013-09-03 17:16:06 -07:00 |
|
atlante45
|
15a3a8d252
|
Some more code reformatting.
|
2013-09-03 10:32:38 -07:00 |
|
atlante45
|
26691118de
|
Some code reformatting.
|
2013-09-03 10:30:46 -07:00 |
|
atlante45
|
38133ac6f2
|
Merge branch 'master' of https://github.com/worklist/hifi into some_more_work_on_imports
|
2013-09-03 10:16:44 -07:00 |
|
atlante45
|
0068b838b2
|
Fixed importer crashing on non ARGB32 png.
|
2013-08-30 15:56:28 -07:00 |
|
atlante45
|
1dc8d8dd0c
|
Added LOD to preview + Shared voxelSystem for reduced memory consumption
|
2013-08-29 17:59:36 -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
|
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
|
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 |
|
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 |
|
ZappoMan
|
7045dff7d3
|
moved VoxelEditPacketSender to libraries
|
2013-08-15 14:26:31 -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 |
|
ZappoMan
|
4f16157e51
|
CR feedback
|
2013-08-15 11:39:00 -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
|
18e5d49d75
|
move move constructors and assignments into IFDEFS for now to fix build buster
|
2013-08-14 14:46:40 -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 |
|
ZappoMan
|
bac2362706
|
Merge branch 'master' of https://github.com/worklist/hifi into split_tool
|
2013-08-08 14:51:42 -07:00 |
|
ZappoMan
|
1bb7d75794
|
added tool for splitting SVOs on jurisdiction boundaries
|
2013-08-08 14:36:42 -07:00 |
|
Stephen Birarda
|
955b7f0d24
|
Merge branch 'master' of github.com:worklist/hifi into assignee
|
2013-08-07 10:26:26 -07:00 |
|
ZappoMan
|
88e2e3dd3f
|
added visulization for voxel add/kill
|
2013-08-06 12:05:43 -07:00 |
|
ZappoMan
|
73510ec975
|
added notifications with jurisdiction details for when voxel servers come and go
|
2013-08-06 10:33:09 -07:00 |
|
Stephen Birarda
|
d3b2ba1070
|
fix QtCore includes in voxels library
|
2013-08-05 17:40:01 -07:00 |
|
ZappoMan
|
acd3acb81e
|
correctly handle freeing of memory for _jurisdictionRoot in VoxelSceneStats
|
2013-08-05 16:51:01 -07:00 |
|
ZappoMan
|
01ba5ee81a
|
adding jurisdiction to scene stats to implement add/drop effect, added command line to voxel server to not send environments
|
2013-08-05 16:30:08 -07:00 |
|
ZappoMan
|
06e249b872
|
added command line options for jurisdiction settings
|
2013-08-02 15:38:43 -07:00 |
|