ZappoMan
|
2f90df04ee
|
correct cleanup of Models/geometry and all EntityItems for various cases
|
2014-08-27 15:45:45 -07:00 |
|
ZappoMan
|
30e00bbd69
|
final pass on entities import/export/overlays working as well as production
|
2014-08-27 11:34:50 -07:00 |
|
ZappoMan
|
73d5e8c519
|
more quieting of debug messages
|
2014-08-22 17:21:27 -07:00 |
|
ZappoMan
|
75bb42fb73
|
debug cleanup
|
2014-08-22 10:54:00 -07:00 |
|
ZappoMan
|
17426a1c71
|
removed tons of debugging
|
2014-08-20 17:47:16 -07:00 |
|
ZappoMan
|
ef86d86234
|
split out entity rendering into subclasses, improved rendering of models
|
2014-08-20 15:49:50 -07:00 |
|
ZappoMan
|
3a5a38c342
|
support chunk sizes in SVO file, allows for chunk based reading of SVO file and fixes issues with entities spanning chunks in file
|
2014-08-19 10:53:45 -07:00 |
|
ZappoMan
|
960e9eb2f4
|
debugging tweaks
|
2014-08-19 09:43:09 -07:00 |
|
ZappoMan
|
daffb00bf2
|
build issues fixed after merge
|
2014-08-18 15:41:20 -07:00 |
|
ZappoMan
|
32d5eb3cea
|
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
assignment-client/CMakeLists.txt
interface/CMakeLists.txt
libraries/entities/CMakeLists.txt
libraries/models/src/ModelEditPacketSender.cpp
libraries/models/src/ModelEditPacketSender.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelItem.h
libraries/octree/src/OctreeEditPacketSender.cpp
libraries/octree/src/OctreeEditPacketSender.h
libraries/octree/src/OctreePacketData.h
libraries/octree/src/OctreeQuery.cpp
libraries/particles/src/ParticleEditPacketSender.cpp
libraries/particles/src/ParticleEditPacketSender.h
libraries/script-engine/CMakeLists.txt
tests/octree/CMakeLists.txt
|
2014-08-18 15:16:35 -07:00 |
|
ZappoMan
|
1b1c386e78
|
handle root element data that spans multiple MTU
|
2014-08-18 14:53:57 -07:00 |
|
ZappoMan
|
49cf6dff3a
|
more DIDNT_FIT logic improvements/fixes
|
2014-08-18 14:09:01 -07:00 |
|
ZappoMan
|
588d051595
|
use memmove() instead of memcpy() for overlapping updates and some debugging
|
2014-08-18 14:07:39 -07:00 |
|
ZappoMan
|
a3bb8b1239
|
have partial elements set a stop reason of DIDNT_FIT to fix partial encoding issues
|
2014-08-18 09:37:07 -07:00 |
|
ZappoMan
|
f8f0da189f
|
more work on more entities in a cell
|
2014-08-15 17:13:59 -07:00 |
|
ZappoMan
|
84ba810dc4
|
work on reseved bytes in octree packet data
|
2014-08-15 11:26:55 -07:00 |
|
ZappoMan
|
abe892ddc3
|
quiet some debugging
|
2014-08-14 11:36:53 -07:00 |
|
ZappoMan
|
fbe409a0c2
|
added lots of debugging for octree edit packet sender bug fixed threading issue
|
2014-08-14 11:23:56 -07:00 |
|
ZappoMan
|
b7e258519b
|
fix entity delete message by not adjusting clock skew on it, since there's no clock times in the packet
|
2014-08-13 17:12:03 -07:00 |
|
ZappoMan
|
49e616dd49
|
first cut at using erase entity message to delete entities
|
2014-08-13 14:11:56 -07:00 |
|
ZappoMan
|
4bdb8765f5
|
implement improved pruning on updates/moves/delete passes of the tree added some debug support
|
2014-08-13 10:29:25 -07:00 |
|
ZappoMan
|
6ce6d8ae47
|
dont try to create child elements that are smaller than the entities
|
2014-08-12 14:29:55 -07:00 |
|
ZappoMan
|
3551bd676f
|
quiet a lot of debugging, fix issue with updating entities that overhang the domain bounds
|
2014-08-12 13:14:28 -07:00 |
|
Stephen Birarda
|
9d8818eee5
|
remove OpenSSL requirement from octree library
|
2014-08-08 13:18:32 -07:00 |
|
Stephen Birarda
|
a99b19d28a
|
make Qt5 and ZLIB required finds, add OpenSSL to interface
|
2014-08-08 13:17:54 -07:00 |
|
Stephen Birarda
|
b1310c065c
|
remove TARGET_NAME from cmake macros where it is not required
|
2014-08-08 13:17:54 -07:00 |
|
Stephen Birarda
|
26f7b1ba62
|
add macro to link shared dependencies to target
|
2014-08-08 13:17:54 -07:00 |
|
Stephen Birarda
|
c9f8433a2d
|
tweak setup_hifi_library to bubble up full path of Qt modules
|
2014-08-08 13:17:54 -07:00 |
|
Stephen Birarda
|
17df6484d4
|
remove ssize_t and replace with size_t or int where appropriate
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
87cf262b9e
|
get to successful cmake after library link macro changes
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
31488e72fe
|
repairs for interface build to succeed
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
2bb37f2d64
|
more Qt module dependencies sorted out for libraries
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
33e5826842
|
remove animation server, bubble up qt modules
|
2014-08-08 13:17:52 -07:00 |
|
Stephen Birarda
|
9a50532b1f
|
bubble up sub dependencies to link_hifi_library
|
2014-08-08 13:17:52 -07:00 |
|
ZappoMan
|
d1589e0d8e
|
removed addOrUpdateEntity() replaced with more efficient approach
|
2014-08-07 10:10:44 -07:00 |
|
ZappoMan
|
273853ef24
|
more work on virtual entities
|
2014-08-04 16:18:24 -07:00 |
|
ZappoMan
|
3a8c5018ee
|
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
interface/src/Application.h
libraries/entities/src/EntityTreeElement.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelItem.h
libraries/models/src/ModelTree.cpp
libraries/models/src/ModelTree.h
libraries/models/src/ModelTreeElement.cpp
libraries/networking/src/PacketHeaders.h
libraries/octree/src/OctreeEditPacketSender.cpp
libraries/octree/src/OctreeEditPacketSender.h
|
2014-08-04 12:01:23 -07:00 |
|
ZappoMan
|
23aa5a124e
|
fix up lastEdited behavior
|
2014-07-31 11:41:18 -07:00 |
|
ZappoMan
|
77e1867b11
|
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
assignment-client/src/Agent.cpp
assignment-client/src/Agent.h
examples/editModels.js
interface/src/Application.h
|
2014-07-31 10:34:23 -07:00 |
|
Stephen Birarda
|
ef58453fda
|
turn off verbose octree packet debug
|
2014-07-30 18:10:11 -07:00 |
|
Stephen Birarda
|
db25cd9d2c
|
call PaymentManager when an OctreeEditPacketSender needs to pay
|
2014-07-30 18:07:08 -07:00 |
|
Stephen Birarda
|
eba92eb517
|
have the OctreeEditPacketSender emit a signal when payment is required
|
2014-07-30 17:21:04 -07:00 |
|
Stephen Birarda
|
04effabe48
|
Merge branch 'master' into domain-server-auth
|
2014-07-30 17:14:03 -07:00 |
|
Stephen Birarda
|
2796f71419
|
library cleanup to suppress warnings on cmake 3.0
|
2014-07-30 15:06:15 -07:00 |
|
Stephen Birarda
|
ab1be38fd5
|
reset the cost of the packet back to 0 so it doesn't keep accumulating
|
2014-07-30 14:02:46 -07:00 |
|
Stephen Birarda
|
7a128e5f77
|
add satoshi cost to voxel packet debug
|
2014-07-30 10:14:51 -07:00 |
|
Stephen Birarda
|
66592466ad
|
pipe satoshi cost down to queuePacketToNodes
|
2014-07-30 10:05:21 -07:00 |
|
Stephen Birarda
|
6a534a6ff1
|
send along satoshi costs for voxel additions from VoxelEditPacketSender
|
2014-07-29 17:31:12 -07:00 |
|
ZappoMan
|
3667eadff0
|
some various fixes
|
2014-07-29 13:34:08 -07:00 |
|
ZappoMan
|
230c2f2684
|
cleanup storage of entity ids on the server, added improved checks for server vs client
|
2014-07-29 12:52:46 -07:00 |
|