Andrew Meadows
|
f2882618be
|
merge upstream/master into andrew/inertia
Conflicts:
interface/src/avatar/MyAvatar.cpp
|
2014-09-12 17:50:26 -07:00 |
|
ZappoMan
|
2148baae21
|
add boxInFrustum
|
2014-09-11 16:40:32 -07:00 |
|
ZappoMan
|
31fc5bb4f7
|
silence some over active debug messages
|
2014-09-09 13:19:06 -07:00 |
|
Andrew Meadows
|
c9d5508f16
|
merge upstream/master into andrew/ragdoll
|
2014-09-08 10:21:32 -07:00 |
|
Andrew Meadows
|
62438bae6a
|
fixed signed/unsigned comparison and unused variable
|
2014-09-05 16:41:01 -07:00 |
|
Andrew Meadows
|
0ddc8eb448
|
fix signed/unsigned comparison
|
2014-09-05 16:40:14 -07:00 |
|
Andrew Meadows
|
6f22ff01d9
|
merge upstream/master into andrew/ragdoll
|
2014-09-05 16:04:01 -07:00 |
|
ZappoMan
|
f0d72b83fa
|
CR feedback
|
2014-09-05 15:39:29 -07:00 |
|
Andrew Meadows
|
b953d880a3
|
minor optimization on CubeList and VoxelPool
|
2014-09-05 14:41:18 -07:00 |
|
ZappoMan
|
a19ce6e859
|
clean up warning
|
2014-09-05 12:52:04 -07:00 |
|
ZappoMan
|
54a746a846
|
remove noise
|
2014-09-05 12:49:23 -07:00 |
|
ZappoMan
|
e1064d8da7
|
correctly implement data types who assume all child data must be included (e.g. voxels)
|
2014-09-05 12:41:14 -07:00 |
|
ZappoMan
|
a25790b350
|
more work on fixing voxels
|
2014-09-05 11:51:17 -07:00 |
|
ZappoMan
|
f234dbf9a1
|
converting voxel files to new versioned format with buffer breaks
|
2014-09-05 10:51:08 -07:00 |
|
ZappoMan
|
5c5658b6e7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fixingOctreeSave
|
2014-09-05 09:27:27 -07:00 |
|
ZappoMan
|
3c2b534842
|
dead code cleanup and comment cleanup
|
2014-09-05 01:50:43 -07:00 |
|
ZappoMan
|
5ec98b8dec
|
more guards to corrupt voxel files
|
2014-09-05 01:40:41 -07:00 |
|
ZappoMan
|
a189f077b8
|
fix huge-mega-voxels and voxel file corruption
|
2014-09-05 01:13:22 -07:00 |
|
Andrew Meadows
|
faf31f268e
|
use QHash, not QVector, for Octree content query
|
2014-09-04 15:20:07 -07:00 |
|
Andrew Meadows
|
e120697a9b
|
merge upstream/master into andrew/ragdoll
|
2014-09-03 15:49:32 -07:00 |
|
AndrewMeadows
|
bd55da4a83
|
Merge pull request #3335 from ZappoMan/virtualEntities
Model Server to Entity Server Refactoring
|
2014-09-03 15:48:58 -07:00 |
|
Andrew Meadows
|
54463ab668
|
add findContentInCube() and typedef CubeList
|
2014-09-03 13:17:47 -07:00 |
|
ZappoMan
|
756840d541
|
CR feedback
|
2014-09-03 12:48:39 -07:00 |
|
ZappoMan
|
29bbeadbc7
|
fix method names for CR feedback
|
2014-09-03 12:44:57 -07:00 |
|
ZappoMan
|
9a02545d9e
|
useless semicolon removal
|
2014-09-03 12:26:05 -07:00 |
|
ZappoMan
|
f5b9fabdb9
|
fix CR feedback
|
2014-09-03 12:12:08 -07:00 |
|
ZappoMan
|
66a2f58192
|
fix to runaway saving file and optimizations to general encoding paths
|
2014-09-03 10:55:56 -07:00 |
|
ZappoMan
|
0acbefb6a2
|
fix but in getMyChildContaining and performance improvement to moving entities
|
2014-09-03 08:06:42 -07:00 |
|
ZappoMan
|
9fa087571b
|
tweak to save SVO logic
|
2014-09-02 17:10:41 -07:00 |
|
ZappoMan
|
2b5d631290
|
removed a ton of old dead debug code
|
2014-09-02 08:44:43 -07:00 |
|
ZappoMan
|
f16a48e187
|
quiet some debugging
|
2014-09-01 22:38:18 -07:00 |
|
ZappoMan
|
b244e78af4
|
working on addressing issues with sibling cells and server clock skew causing some properties to be ignored
|
2014-09-01 21:48:03 -07:00 |
|
Andrew Meadows
|
aeb355e3da
|
re-enabling legacy avatar-vs-voxel collisions
so that I don't break anything when this merges with upstream
|
2014-08-29 15:53:20 -07:00 |
|
ZappoMan
|
f654fac851
|
fixed a couple crashes in editing entities
|
2014-08-29 10:56:07 -07:00 |
|
ZappoMan
|
2f90df04ee
|
correct cleanup of Models/geometry and all EntityItems for various cases
|
2014-08-27 15:45:45 -07:00 |
|
Andrew Meadows
|
c6253bb51a
|
AACube vs Sphere and Capsule collision tests
Sphere is unit tested.
Also removed the shape collision query against Octree
|
2014-08-27 12:09:41 -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 |
|