Commit graph

907 commits

Author SHA1 Message Date
Seth Alves
cdef502e2e expose setVoxelSphere to js 2015-05-26 14:26:05 -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
727f457f91 hook up RenderablePolyVoxEntityItem::findDetailedRayIntersection to polyvox library's version 2015-05-25 21:01:20 -07:00
Seth Alves
6c67d14fbc experimenting with physics 2015-05-22 16:21:09 -07:00
Seth Alves
e702518041 adjust logic around timestamps used by entity-server to know if something was sent. adjust which physics variables are adjusted by a non-sim-owner packet 2015-05-22 16:11:29 -07:00
Seth Alves
ed082800f5 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-22 08:38:22 -07:00
Eric Levin
fe99941de3 fixed problem with particle entities not showing up on other clients by adding properties to decodeEditEntityPacket and encodeEntityEditPacket methods in EntityItemProperties.cpp 2015-05-21 19:35:27 -07:00
Seth Alves
f85cc89946 clean up diff 2015-05-21 18:17:07 -07:00
Seth Alves
478cb40135 draws in the right place, now 2015-05-21 16:46:27 -07:00
Seth Alves
2cb73b5430 added a volex-volume size member variable. drawing transform still isn't quite right 2015-05-21 16:31:01 -07:00
Seth Alves
fe188f9a43 something draws, now 2015-05-21 10:42:14 -07:00
Seth Alves
72e227eefe Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-21 09:55:14 -07:00
Seth Alves
d7ccd23b07 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-20 18:08:29 -07:00
Seth Alves
aa1d3eb82a respond to code review 2015-05-20 17:31:57 -07:00
Seth Alves
782402b4c8 Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-20 14:53:05 -07:00
Seth Alves
4a59dc24c5 split entity-add and entity-edit messages 2015-05-20 14:52:03 -07:00
Seth Alves
124ff68cee make EntityItemID a subclass of QUuid 2015-05-20 14:22:08 -07:00
Seth Alves
f522334c99 sort out script interface changes 2015-05-20 12:30:06 -07:00
Seth Alves
a769cfdaf2 client decides on new entity-ids, keep EntityItemID class 2015-05-20 10:42:19 -07:00
Ryan Huffman
6f69ed2561 Fix calculated dimensions of spotlight
The spotlights region of effect is the intersection of the spotlight
with radius r, and the sphere of radius r
2015-05-20 09:11:48 -07:00
Ryan Huffman
bb38b3eb3f Update default light cutoff to PI / 2 2015-05-20 09:11:21 -07:00
Seth Alves
f2c1c43da3 polyvox code runs, no rendering yet 2015-05-20 08:44:41 -07:00
Seth Alves
4b263cf5c8 derieve PolyVox Entity from Model Entity 2015-05-19 21:40:05 -07:00
Seth Alves
4166c3224f link polyvox library in with entities 2015-05-19 16:24:13 -07:00
Seth Alves
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07:00
Andrew Meadows
180590145d check for NULL before using pointer to EntityItem 2015-05-16 11:12:19 -07:00
Seth Alves
bb3d1a6a58 rays never pick a line entity. some fixes to pointer.js 2015-05-15 13:10:16 -07:00
Andrew Meadows
53e241fb07 merge upstream/master into andrew/thermonuclear 2015-05-14 12:37:41 -07:00
Andrew Meadows
d28c400cea add restitution and friction Entity properties 2015-05-14 12:36:59 -07:00
Andrew Meadows
81d06e0dc3 Merge upstream/master into andrew/nova
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItemProperties.cpp
2015-05-14 10:09:55 -07:00
ZappoMan
0dcb89fce7 Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItemProperties.cpp
2015-05-13 20:33:10 -07:00
Brad Hefta-Gaub
5da0a8d7a3 Merge pull request #4860 from howard-stearns/entity-sound
Entity sound.
2015-05-13 20:07:44 -07:00
ZappoMan
045c0141e8 Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup
Conflicts:
	libraries/entities/src/EntityItemProperties.cpp
2015-05-13 17:09:21 -07:00
Howard Stearns
dc2e923583 Ordering for packets. 2015-05-13 15:51:11 -07:00
Howard Stearns
1a87ca04da Entity sound. 2015-05-13 13:18:02 -07:00
ZappoMan
b4f15304ba standardize COPY_PROPERTY_FROM_QSCRIPTVALUE for vec3, quat, and color 2015-05-13 13:12:47 -07:00
ZappoMan
4fecd33115 use new macros in Line entity 2015-05-13 12:38:11 -07:00
ZappoMan
095b7701d8 Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup 2015-05-13 12:12:12 -07:00
ZappoMan
f28ca90ac5 clean up COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE to be type safe 2015-05-13 09:38:49 -07:00
Brad Davis
a8d343bbf1 Working on web entities 2015-05-13 00:27:57 -07:00
Andrew Meadows
7e9e223b3e merge upstream/master into andrew/nova 2015-05-12 21:48:55 -07:00
Andrew Meadows
4872a565c9 bid for simulation ownership 2015-05-12 21:46:52 -07:00
Andrew Meadows
45d4fa91ab add a TODO comment 2015-05-12 21:46:04 -07:00
Andrew Meadows
2165d18c05 don't copy simulatorID from script value 2015-05-12 21:45:36 -07:00
Brad Davis
e9b83e1c02 Working on web entities 2015-05-12 21:15:54 -07:00
ZappoMan
8d731b15ee some warning fixes 2015-05-12 17:21:59 -07:00
ZappoMan
8169d82141 consolidate COPY_PROPERTY_TO_QSCRIPTVALUE and COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE to be type safe 2015-05-12 17:13:20 -07:00
ZappoMan
67df6e3c62 make READ_ENTITY_PROPERTY_TO_PROPERTIES() type safe 2015-05-12 16:24:16 -07:00
ZappoMan
98474376de consolidate READ_ENTITY_PROPERTY() macros into single typesafe version 2015-05-12 15:59:45 -07:00