Andrew Meadows
c9b125612c
fix bugs
2016-01-12 15:08:52 -08:00
Andrew Meadows
e1ba4ff0a8
add CollisionMask entity property
2016-01-12 15:08:52 -08:00
Andrew Meadows
0df920d9a3
Merge pull request #6718 from birarda/master
...
cleanup QTimer management in ThreadedAssignment
2016-01-07 10:53:35 -08:00
Seth Alves
096ab44311
fix network version number
2016-01-06 11:01:31 -08:00
Anthony Thibault
95f821d61a
Merge pull request #6732 from sethalves/set-model-entity-joints
...
hook up a way for scripts to set model-entity joint state
2016-01-05 17:31:18 -08:00
Andrew Meadows
9ab5ef358a
remove dangling whitespace
2016-01-05 16:44:36 -08:00
Seth Alves
942e77166e
merge from upstream
2016-01-05 11:11:19 -08:00
Stephen Birarda
ddb8b67267
Merge branch 'master' of https://github.com/highfidelity/hifi
2016-01-05 09:56:05 -08:00
Seth Alves
ce1b8ae6f0
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2016-01-04 19:35:36 -08:00
Seth Alves
8eef1624cb
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
2016-01-04 09:27:59 -08:00
Brad Hefta-Gaub
5b177404d5
Merge pull request #6749 from jherico/resource_override
...
Allow a script to set a resource override.
2016-01-04 09:17:38 -08:00
Brad Hefta-Gaub
02835fc960
Merge pull request #6702 from hyperlogic/tony/soft-attachments
...
Soft Attachment Support
2016-01-03 08:46:16 -10:00
Seth Alves
bfa8cc1969
merge from upstream
2016-01-03 06:47:25 -08:00
Seth Alves
fe0a656d54
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
2015-12-30 12:45:32 -08:00
Brad Davis
07531353e4
Allow a script to set a resource override.
2015-12-30 09:06:04 -08:00
Andrew Meadows
a5c19c04e5
Merge pull request #6672 from ctrlaltdavid/fix-nodelist-shutdown
...
Don't send a domain-server check in when shutting down
2015-12-30 08:43:19 -08:00
Anthony J. Thibault
c2dd00375d
Merge branch 'master' into tony/soft-attachments
2015-12-29 13:21:37 -08:00
Stephen Birarda
a0d6001fa5
actually start domain-server check in timer
2015-12-28 10:54:42 -08:00
Stephen Birarda
2799123b55
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-12-28 10:46:51 -08:00
Seth Alves
83f60d6e97
make entity properties for model-entity joint-states
2015-12-23 15:43:50 -08:00
Seth Alves
5e4a165b4d
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-22 11:23:09 -08:00
Brad Hefta-Gaub
3dfc48e205
Merge pull request #6687 from jherico/marketplace
...
Support the marketplace in QML
2015-12-21 17:55:55 -08:00
Stephen Birarda
74d1685617
remove an extra space
2015-12-21 16:45:33 -07:00
Stephen Birarda
9e2d06710f
fix for connectedToDomain signal signature
2015-12-21 16:37:22 -07:00
Stephen Birarda
49ea560e4e
make QTimers in ThreadedAssignment not be raw pointers
2015-12-21 16:33:40 -07:00
Stephen Birarda
8c6449a886
fix for stopping a nullptr QTimer
2015-12-21 16:20:06 -07:00
Brad Davis
6ef77bc46a
Support the marketplace in QML
2015-12-21 11:34:03 -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
a5d37bed60
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-18 09:12:57 -08:00
Brad Hefta-Gaub
a7824a06d0
fix Assignment copy constructor warning
2015-12-17 18:51:27 -08:00
Seth Alves
9438015f3a
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-17 11:48:04 -08:00
Stephen Birarda
06e9731fe4
don't attempt to read an empty or malformed packet
2015-12-17 11:07:36 -08:00
Seth Alves
d34e166b48
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-17 07:31:52 -08:00
Atlante45
b4dc3b1b47
Fix windows compile error.
2015-12-16 14:27:26 -08:00
Atlante45
95da71b19c
Assignment don't inherit from NodeData
...
This is an artefact from an old design that stuck around
2015-12-16 14:27:26 -08:00
Atlante45
346c28f9e2
Remove OctreeServer's static instance
2015-12-16 14:27:26 -08:00
David Rowe
b25fc5be6c
Don't send a domain-server check in when shutting down
2015-12-17 09:52:34 +13:00
Seth Alves
008065ba38
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-14 09:15:56 -08:00
Seth Alves
24fb43e8cd
first steps toward a puffed-out query-box for child entities
2015-12-12 12:33:14 -08:00
Atlante45
d3224bfde3
More warning fixes
2015-12-11 16:03:44 -08:00
Atlante45
ce51350b65
Fix warnings on windows 64bit
2015-12-11 15:42:15 -08:00
Brad Hefta-Gaub
a7a924153a
Merge pull request #6617 from huffman/entity-query-keyhole
...
Add keyhole radius to OctreeQuery
2015-12-11 09:35:46 -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
cfcc07da2e
Fix current version for EntityQuery
2015-12-10 14:49:28 -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
Seth Alves
d243132b5c
quiet some logging
2015-12-10 10:28:24 -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
