Seth Alves
ce1b8ae6f0
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2016-01-04 19:35:36 -08:00
Anthony J. Thibault
1618e0a92f
Network, Preferences and UI support for soft attachments
...
Added an isSoft field to the AttachmentData which is edited
by the Attachment Dialog Menu, sent over the network via
AvatarData identity packets and saved in the Interface.ini preferences.
AvatarData and AvatarBulkData version number has been bumped.
Changed Avatar attachment collections to use smart pointers to models
instead of raw ones. Removed _unusedAttachmentModels.
I don't think the caching was worth the added code complexity.
2015-12-18 13:32:09 -08:00
Seth Alves
24fb43e8cd
first steps toward a puffed-out query-box for child entities
2015-12-12 12:33:14 -08:00
Ryan Huffman
87e30a2157
Remove EntityQuery version and just append new data to end
2015-12-11 09:03:39 -08:00
Ryan Huffman
6acf3603d0
Update naming and number of entity query version
2015-12-10 14:58:08 -08:00
Ryan Huffman
46d645376b
Fix misspelling of entities
2015-12-10 14:38:44 -08:00
Ryan Huffman
b6ecd539df
Merge branch 'master' of https://github.com/highfidelity/hifi into entity-query-keyhole
2015-12-10 14:36:03 -08:00
Ryan Huffman
b5e3dce376
Add keyhole radius to OctreeQuery
2015-12-10 14:34:28 -08:00
Anthony J. Thibault
e9f529bf12
Entities: Removed Start Automatically property from Animation Group
...
There is an issue when startAutomatically was set to true and animationPlaying was set to false.
This would cause clients to play the animation when they connected to the entity server, even though the server was not.
2015-12-09 17:59:56 -08:00
Seth Alves
f013f95e9b
merge from upstream
2015-11-21 08:43:00 -08:00
Ryan Huffman
3d0afc3c5f
Update entities version number for polyline change
2015-11-18 14:00:00 -08:00
Brad Hefta-Gaub
6b61ec569c
more work on channels
2015-11-17 09:47:50 -08:00
Brad Hefta-Gaub
40e69f6946
Merge branch 'master' of https://github.com/highfidelity/hifi into messaging
2015-11-16 15:31:06 -08:00
Brad Hefta-Gaub
d42a1a721f
first cut at messages-mixer
2015-11-16 15:26:17 -08:00
Stephen Birarda
1c9396d66e
handle disconnect request in domain-server
2015-11-12 15:43:03 -08:00
Stephen Birarda
8bdb81d832
send disconnect packet from node when leaving domain
2015-11-12 15:03:19 -08:00
Stephen Birarda
0a64242160
cleanup string grabbing for PacketType enum
2015-11-12 14:43:25 -08:00
Stephen Birarda
288ee0e9e8
add a NodeDisconnect packet
2015-11-12 11:39:32 -08:00
ericrius1
31fe5fa953
Bump version num, use different shader for additive blending effect
2015-11-03 17:15:10 -08:00
Seth Alves
3ac0fef1ea
merge from upstream
2015-11-01 15:22:57 -08:00
samcake
393f6a4c76
Fixing a bad field ID for keyLight.AmbientURL and bumping the domain version
2015-10-30 11:35:50 -07:00
samcake
bc7ad9d3f7
Move the keyLIght properties in their own group and add the ambientURL in
2015-10-26 09:27:06 -07:00
Seth Alves
778dc8dc15
add parentID and parentJointIndex EntityItemProperties
2015-10-22 11:52:56 -07:00
Brad Hefta-Gaub
ef054ffc6d
Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings
...
Conflicts:
libraries/networking/src/udt/PacketHeaders.cpp
libraries/networking/src/udt/PacketHeaders.h
2015-10-07 11:27:50 -07:00
Atlante45
f5f349e13a
Bumped packet version numbers
2015-10-02 14:20:20 -07:00
Brad Hefta-Gaub
6aa9ef9910
first cut at migrating animation settings into a property group
2015-09-30 20:51:25 -07:00
David Rowe
12e2cf3ce9
Emit in all directions from a point or the surface of a spheroid
2015-09-17 17:14:35 -07:00
David Rowe
d51cab3e3d
Replace particle velocity with speed and orientation
2015-09-16 14:51:08 -07:00
Stephen Birarda
e1c395f5ea
resolve conflicts on merge with upstream/master
2015-09-08 14:56:23 -07:00
David Rowe
cb9468c311
Add colorSpread entity particle property
2015-09-07 16:27:42 -07:00
David Rowe
12b8a5a1d5
Add alpha property support to ParticleEffect entities
...
Add at same "level" as color so that it's available for other entity
types to use in the future.
2015-09-05 10:23:27 -07:00
David Rowe
18bc7befee
Merge branch 'master' into 20669
...
Conflicts:
libraries/networking/src/udt/PacketHeaders.cpp
libraries/networking/src/udt/PacketHeaders.h
2015-09-04 13:49:46 -07:00
David Rowe
c910da7179
Add radiusStart and radiusFinish entity particle properties
2015-09-04 12:27:18 -07:00
Stephen Birarda
ed19987b7d
resolve conflicts on merge with upstream/master
2015-09-04 12:31:46 -06:00
David Rowe
45ff118249
Add new radiusSpread entity particle property
2015-09-03 14:55:08 -07:00
Seth Alves
64d0ce47f3
attempting to stitch polyvox entites together
2015-08-30 09:59:33 -07:00
Stephen Birarda
80cf7b6c76
resolve conflicts on merge with upstream/master
2015-08-27 14:50:04 -07:00
Ryan Huffman
aa7d8678e1
Merge branch 'protocol' of github.com:birarda/hifi into atp-server
2015-08-26 12:26:11 -07:00
Atlante45
179ee73e26
Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol
2015-08-26 16:50:33 +02:00
ericrius1
13892db866
removed logging
2015-08-24 11:41:03 -07:00
Ryan Huffman
5884fcb17b
Merge branch 'ordered-sending' into atp-server
2015-08-19 12:23:31 -07:00
Ryan Huffman
63d0205d1e
Move domain settings retrieval to UDT
2015-08-18 23:11:33 -07:00
Stephen Birarda
fd43c48eac
resolve conflicts on merge with birarda/protocol
2015-08-18 11:48:36 -07:00
Stephen Birarda
0f77ab8611
resolve conflicts on merge with upstream/master
2015-08-18 11:45:55 -07:00
ZappoMan
014bf661fa
bump packet version
2015-08-17 11:18:25 -07:00
Eric Levin
ec25d7994c
bumped protocol number for new particle properties
2015-08-14 21:58:22 -07:00
ZappoMan
44fcf71f07
change domain to be 32k and still have origin centered at 0
2015-08-14 15:26:49 -07:00
Howard Stearns
daae750d68
No symbolic names for non-entity contants.
2015-08-12 16:40:00 -07:00
ZappoMan
4fe8f49d4c
move origin to center of domain
2015-08-11 23:47:40 -07:00
Howard Stearns
a5d8125aa7
Remove obsolete AvatarMixer wire data. (Was duplicated in joint states that are also sent.)
2015-08-11 17:53:49 -07:00
