ZappoMan
1663ff86d7
removed dead code
2014-08-25 12:45:09 -07:00
ZappoMan
700b945d71
disabled some debugging
2014-08-25 11:35:28 -07:00
ZappoMan
d0ceca1935
moved EntityTree operator related classes to own files to match coding standard
2014-08-25 11:29:11 -07:00
ZappoMan
58759d344f
cleanup in prep for PR
2014-08-25 10:56:43 -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
ddae85ce4a
updated todo
2014-08-19 14:24:39 -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
7d675b78fe
more todo
2014-08-19 09:41:46 -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
Clément Brisset
ddc67a8edb
Merge pull request #3285 from AndrewMeadows/ragdoll
...
Cleanup of Ragdoll API
2014-08-18 12:36:27 -07:00
AndrewMeadows
4b7208ac53
Merge pull request #3280 from huffman/19907
...
Code Review for Job #19907
2014-08-18 10:20:01 -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
Philip Rosedale
28abc6ab2a
Merge pull request #3290 from ey6es/metavoxels
...
Big change in the way shared borders are handled in order to fix seams between blocks. Fixes for height/ray queries. Minimal rectangles for deltas, switch between PNG and deflated JPG encodings.
2014-08-15 07:57:46 -07:00
Andrzej Kapolka
67266b41df
Deflated JPEG encoding for blocks above 16x16.
2014-08-14 19:21:32 -07:00
Andrzej Kapolka
05d6b628fa
Alllmost ready with the big edge sharing rejiggery.
2014-08-14 17:10:45 -07:00
AndrewMeadows
1a5230ef08
Merge pull request #3286 from birarda/mixer-analytics
...
de-couple audio mixer packet receive thread from processing
2014-08-14 16:42:21 -07:00
Andrew Meadows
432c14408c
removed hackery from ContactPoint enforcement
2014-08-14 15:29:57 -07:00
Andrew Meadows
98d27ad2b5
more correct names for ContactPoint API
...
renamed (and disabled) the useless enforce() to applyFriction()
changed the buildConstraints() method to more correct name: enforce()
will eventually change how ContactPoint actually works, but later
2014-08-14 15:17:03 -07:00
Andrew Meadows
60d411ead5
cleanup Ragdoll API (less "ragdoll" qualifiers)
2014-08-14 14:41:51 -07:00
Andrew Meadows
46c91052c9
split SkeletonModel and Ragdoll classes apart
2014-08-14 14:29:03 -07:00
Stephen Birarda
c58bae9021
attempt to change buffers to 1MB only
2014-08-14 14:27:09 -07:00
Stephen Birarda
1e65a093f2
decouple audio-mixer packet receipt from main thread
2014-08-14 12:37:57 -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
Stephen Birarda
64c11ebf8f
don't change the socket buffer sizes if it is already larger
2014-08-14 10:36:54 -07:00
Andrew Meadows
ee0d0a1566
remove ragdoll from simulation in dtor
2014-08-14 09:20:53 -07:00
Philip Rosedale
395f643f1b
Merge pull request #3277 from AndrewMeadows/ragdoll
...
Ragdoll Part 10: a little more stability
2014-08-13 19:05:01 -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
Stephen Birarda
ec260dbab2
change both send and receive socket buffers
2014-08-13 15:50:11 -07:00
Andrzej Kapolka
62b84edc7f
Brush fix.
2014-08-13 15:13:06 -07:00
Andrew Meadows
f66398d366
adding comment about parameter's purpose
2014-08-13 15:06:34 -07:00
Andrew Meadows
7852321152
merge upstream/master into andrew/ragdoll
2014-08-13 14:52:14 -07:00
Andrew Meadows
b177686f74
minor tweak to how ContactPoint is updated
2014-08-13 14:50:25 -07:00
ZappoMan
49e616dd49
first cut at using erase entity message to delete entities
2014-08-13 14:11:56 -07:00
Andrew Meadows
2f1a56a87c
ContactPoint tries to help maintain collisions
...
so that collision events will continue to update the contact
2014-08-13 13:48:04 -07:00
Andrew Meadows
bc432aa8e8
use relative masses for ContactPoint contsrtaint
2014-08-13 11:29:54 -07:00
Andrew Meadows
4de43b7cbe
cleanup and reordering of code
2014-08-13 11:19:32 -07:00
Andrzej Kapolka
56c6c3c972
Working on the height/ray queries.
2014-08-13 11:05:48 -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
Andrzej Kapolka
21d6c3c48a
More work on edge rejiggery.
2014-08-12 18:21:04 -07:00
