Seth Alves
4961c10e17
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 19:05:01 -07:00
Seth Alves
4fa6f388b9
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 18:20:59 -07:00
Andrew Meadows
0a0eba8277
merge
2015-05-27 18:07:00 -07:00
Andrew Meadows
aba539928d
fix grab glitches and failure to own simulation
2015-05-27 18:05:59 -07:00
Brad Hefta-Gaub
0553f7ca4c
Merge pull request #4961 from hyperlogic/ajt/particle-net-anim-fix
...
Particle entities should avoid resetting simulation when setMaxParticles is called
2015-05-27 17:44:44 -07:00
Seth Alves
c3c701f807
polyvox no longer has a color
2015-05-27 15:23:01 -07:00
Seth Alves
8cb5717b86
formatting, cleanups
2015-05-27 15:16:15 -07:00
Seth Alves
5cc038e1c6
polyvox no longer has a color
2015-05-27 15:12:26 -07:00
Seth Alves
ded79609de
back out unrelated change
2015-05-27 15:10:27 -07:00
Seth Alves
1109444c3d
attempt to make sure the ray that picks against polyvox entities is long enough
2015-05-27 14:57:12 -07:00
Seth Alves
386b3301f4
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 14:46:37 -07:00
Seth Alves
7f99f261c2
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 13:59:13 -07:00
David Rowe
a2272d3f42
Fix Windows C4351 build warning
...
VS2013 warns about default initialization of arrays because it behaved
differently in previous versions. Default initialization is what we expect
now that we're using VS2013 so we can disable this warning globally.
2015-05-27 11:49:00 -07:00
Eric Levin
eb0f35e041
removed const keyword from qinvokables for avatar getter methods such as getVelocity
2015-05-27 11:44:37 -07:00
Howard Stearns
380723d1c5
Merge pull request #4970 from AndrewMeadows/thermonuclear
...
rewritten MassProperties with complete unit tests
2015-05-27 10:42:17 -07:00
Seth Alves
5e66a079c4
make this build on older gcc
2015-05-27 10:38:15 -07:00
Seth Alves
6fd38fabe4
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 10:06:53 -07:00
Seth Alves
14c68519f3
limit size of polyvox data property to below MTU
2015-05-27 09:59:18 -07:00
Seth Alves
429cc631f3
limit size of polyvox data property to below MTU
2015-05-27 09:48:32 -07:00
Seth Alves
3af916e27e
use enum for polyvox surface style
2015-05-27 09:32:10 -07:00
Brad Hefta-Gaub
afb09e81a6
Merge pull request #4962 from howard-stearns/entity-events-in-normal-scripts
...
Entity events in normal scripts
2015-05-27 09:24:50 -07:00
andrew
2a6955ce12
fix windows build
2015-05-27 09:14:11 -07:00
Seth Alves
1749ec83db
adapting to entitypointer merge
2015-05-27 09:00:59 -07:00
Seth Alves
f310da9cd3
adapting to entitypointer merge
2015-05-27 08:59:44 -07:00
Seth Alves
b02e452b19
adapting to entitypointer merge
2015-05-27 08:58:03 -07:00
Seth Alves
c1f75506ae
adapting to entitypointer merge
2015-05-27 08:57:22 -07:00
Seth Alves
df795cf296
adapting to entitypointer merge
2015-05-27 08:54:15 -07:00
Seth Alves
c80f2970fd
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 07:37:51 -07:00
Seth Alves
0f81445cee
flag for polyvox to select minecraft vs walking-cubes. uppack to unpack
2015-05-27 07:04:44 -07:00
Andrew Meadows
39d8244255
use highfideltiy style for class data member names
2015-05-26 22:59:29 -07:00
Andrew Meadows
708203089c
replace tabs with spaces
2015-05-26 22:53:57 -07:00
Andrew Meadows
efbb9b0238
rewritten MassProperties with complete unit tests
2015-05-26 22:48:45 -07:00
Seth Alves
6930008f74
remove debugging spew
2015-05-26 21:40:50 -07:00
Seth Alves
6b5020285b
set last-edited in properties when changing voxel data
2015-05-26 21:32:33 -07:00
Seth Alves
5acc018bda
debugging
2015-05-26 20:58:23 -07:00
Seth Alves
ebae87136f
debugging
2015-05-26 20:57:58 -07:00
Seth Alves
cd2b6473ba
debugging
2015-05-26 18:21:45 -07:00
Seth Alves
517d4372fa
debugging
2015-05-26 16:53:11 -07:00
Seth Alves
0ecd60a489
update voxel mesh when new data arrives from the wire
2015-05-26 16:45:29 -07:00
Seth Alves
55028f6cb0
voxel data sent over wire and saved to json
2015-05-26 16:34:35 -07:00
Seth Alves
66760afadb
quiet compiler
2015-05-26 14:27:22 -07:00
Seth Alves
22cc298861
Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox
2015-05-26 14:26:11 -07:00
Seth Alves
cdef502e2e
expose setVoxelSphere to js
2015-05-26 14:26:05 -07:00
Seth Alves
28e052ffdb
Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox
2015-05-26 14:12:11 -07:00
Seth Alves
728e6d121b
changes sam made to get normals to work on a mesh
2015-05-26 14:12:01 -07:00
Andrew Meadows
16e5710325
Merge pull request #4954 from ZappoMan/entitysmartpointers
...
EnitityItem smart pointers
2015-05-26 14:05:03 -07:00
Seth Alves
1ec384ab4d
allow QByteArray data to be sent with a length. Use appendRawData in places that used to append raw byte-arrays
2015-05-26 13:43:22 -07:00
Seth Alves
988ecf9d55
send PolyVox voxel dimensions and compressed data over the wire
2015-05-26 13:18:52 -07:00
Seth Alves
ed6fdcfb31
add QByteArray data uppacking
2015-05-26 13:18:25 -07:00
Howard Stearns
3a7a290094
Uglify conditional returns. :-)
2015-05-26 11:38:36 -07:00