Seth Alves
ce1b8ae6f0
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2016-01-04 19:35:36 -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
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
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
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
Ryan Huffman
0759462df7
Remove unused variable in PacketReceiver
2015-12-08 09:38:23 -08:00
Ryan Huffman
71c266bc00
Fix order of initializion in ReceivedMessage
2015-12-08 09:22:17 -08:00
Ryan Huffman
44d740ef57
Remove unused variable 'addr'
2015-12-08 09:22:02 -08:00
James B. Pollack
6cf1ad464f
Merge pull request #6583 from birarda/extension-ci
...
use a case insensitive check for extensions in Application
2015-12-07 17:33:03 -08:00
Stephen Birarda
7beaf5e235
force asset upload to use a lowercase extension
2015-12-07 15:18:32 -08:00
Leonardo Murillo
25494ec867
Merge pull request #6562 from Atlante45/baseball
...
Baseball
2015-12-07 14:11:21 -08:00
Ryan Huffman
34138f07bd
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-12-07 08:58:47 -08:00
Atlante45
1d498af76e
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-12-04 15:18:25 -08:00
Stephen Birarda
ad4f818b21
only attempt to stop QTimer if active
2015-12-04 14:12:41 -08:00
Stephen Birarda
d2fdf6a04b
Merge branch 'master' of https://github.com/highfidelity/hifi into log-handler-crash
2015-12-04 13:55:57 -08:00
Stephen Birarda
165db97cb2
cleanup double reset debug on assignment-client restart
2015-12-04 11:50:27 -08:00
Brad Hefta-Gaub
84b98c93a1
Merge pull request #6559 from birarda/log-handler-crash
...
reset the NodeList on its own thread
2015-12-04 11:44:06 -08:00
Ryan Huffman
89c412c324
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-12-04 11:38:28 -08:00
Stephen Birarda
d5f79b84fc
make the NodeList reset a blocking queued connection
2015-12-04 11:20:46 -08:00
Stephen Birarda
918342df5f
make sure the NodeList is reset on its own thread
2015-12-04 11:18:46 -08:00
Stephen Birarda
ca84fcd7f4
parent the keepalive timer to the NL thread
2015-12-04 11:01:18 -08:00
