Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 16:41:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
43223 commits 25 branches 0 tags 1.1 GiB
Commit graph

2550 commits

Author SHA1 Message Date
Ryan Huffman
0d2ae4f3a4 Merge branch 'atp' of github.com:birarda/hifi into atp-model 2016-03-09 16:33:53 -08:00
Ryan Huffman
d299ce2677 Fix missing semicolon 2016-03-09 14:56:56 -08:00
Ryan Huffman
f5497aa1e7 Add new AssetMappingsScriptingInterface and add mappings model 2016-03-09 14:53:04 -08:00
Stephen Birarda
96ba57a946 remove client side caching of ATP mappings 2016-03-09 14:24:14 -08:00
Ryan Huffman
64bd41c37f Add AssetMappingItem and extra data to items 2016-03-09 14:03:56 -08:00
Ryan Huffman
4da4fd889a Add AssetMappingModel 2016-03-09 14:03:56 -08:00
Ryan Huffman
38edfe0557 Fix GetAllMappings reading 2016-03-09 14:03:56 -08:00
Ryan Huffman
fd5a5dd8f4 Add QJSEngine compatible AssetMappingScriptInterface 2016-03-09 14:03:25 -08:00
Stephen Birarda
2e9ee4f8a7 Merge branch 'atp' of github.com:birarda/hifi into atp 2016-03-09 12:16:59 -08:00
Stephen Birarda
9a2b2b4c16 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-09 12:16:46 -08:00
Clément Brisset
3f50abcd17 Merge pull request #82 from birarda/atp-rename-mapping 
add rename mapping operation for atomic rename
 2016-03-09 11:57:20 -08:00
Zach Pomerantz
54af58834a Mark Resource loaded after postprocessing 2016-03-09 10:34:07 -08:00
Stephen Birarda
87d5958eb8 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-08 17:11:18 -08:00
Stephen Birarda
8d5111a332 move MappingRequest and subclasses to separate file 2016-03-08 15:30:59 -08:00
Stephen Birarda
181b20f673 move the AssetScriptInterface to script-engine 2016-03-08 14:49:26 -08:00
Stephen Birarda
f9f42a085a add client side handling for mapping rename 2016-03-08 14:43:55 -08:00
Stephen Birarda
793d20306d handle multiple paths for mapping delete operations 2016-03-08 14:24:03 -08:00
Zach Pomerantz
925ea8bcda Add Resource::isCacheable 2016-03-08 13:30:58 -08:00
Stephen Birarda
cf5de317ba use correct error handling for MappingRequest errors 2016-03-08 12:21:54 -08:00
Stephen Birarda
1ece9aac26 remove extension from asset upload task 2016-03-08 12:08:02 -08:00
Stephen Birarda
e92a9c9741 fix comment for asset packet version push 2016-03-08 11:53:53 -08:00
Stephen Birarda
88c1892bf6 remove a comment block re-added in merge 2016-03-08 11:51:59 -08:00
Stephen Birarda
8107287e6c remove start from mapping request subclasses 2016-03-08 11:42:57 -08:00
Stephen Birarda
bfb9801b22 Merge branch 'atp' of github.com:birarda/hifi into atp-mappings 2016-03-08 11:37:27 -08:00
Ryan Huffman
5368ae3f91 Remove extraneous thread checks in MappingRequest subclasses 2016-03-08 11:20:15 -08:00
Ryan Huffman
93d3fb5ccf Fix network error response for mapping requests 2016-03-08 11:19:08 -08:00
Ryan Huffman
c9bd67bc3e Add MappingRequest superclass and mapping specific errors 2016-03-08 11:18:10 -08:00
Ryan Huffman
e06c1591fb Remove initializer 2016-03-08 10:43:26 -08:00
Ryan Huffman
0a75a94790 Remove commented out private slot 2016-03-08 10:31:40 -08:00
Ryan Huffman
e3523c8604 Remove commented out function 2016-03-08 10:28:31 -08:00
Ryan Huffman
7db296fa69 Remove unused get/set/deleteMapping in AssetServer 2016-03-08 10:23:48 -08:00
Ryan Huffman
88760d389f Merge branch 'master' of https://github.com/highfidelity/hifi into atp-mappings 2016-03-08 10:21:32 -08:00
Ryan Huffman
6ca4b72479 Add deleteMapping to asset scripting interface 2016-03-08 10:11:57 -08:00
Ryan Huffman
a18486d97d Fix GetAllMappingsRequest not storing mappings 2016-03-08 10:11:37 -08:00
Ryan Huffman
cf9d4c256a Add proper cache checking to GetAssetMapping 2016-03-08 10:10:48 -08:00
Stephen Birarda
bf8a2bc9e5 update read for get mapping to toHex 2016-03-08 10:03:29 -08:00
Stephen Birarda
909979bab9 fix SLOT connection for local address check 2016-03-08 09:11:38 -08:00
Stephen Birarda
73b7e787d3 change signature of errorTestingLocalSocket 2016-03-08 09:09:28 -08:00
Stephen Birarda
20ab108d51 remove some debug for local socket check error 2016-03-07 18:01:57 -08:00
Stephen Birarda
ed9faf4189 add a secondary check for local IP address 2016-03-07 18:00:09 -08:00
Ryan Huffman
bc99e871e1 Add asset mapping cache 2016-03-07 16:51:49 -08:00
Ryan Huffman
37c0417ea6 Add GetAll and Delete mapping requests 2016-03-07 16:31:49 -08:00
Stephen Birarda
08f181be76 handle mapping requests from AssetResourceRequest 2016-03-07 16:30:26 -08:00
Stephen Birarda
12a774d47f return error if persistence fails for set/delete operations 2016-03-07 15:46:44 -08:00
Seth Alves
ee55721f79 allow sending interface-local messsages 2016-03-07 15:13:24 -08:00
Stephen Birarda
83b563cf9c use AssetHash alias for hash in AssetResourceRequest 2016-03-07 14:00:12 -08:00
Stephen Birarda
4bf69f20b7 fix removal of requestHash method during cherry-pick 2016-03-07 13:59:17 -08:00
Stephen Birarda
e6ce517041 remove committed version control marker 2016-03-07 13:57:41 -08:00
Stephen Birarda
267ed3af82 remove client side handling of extension for ATP hash URLs 2016-03-07 13:57:02 -08:00
Ryan Huffman
19cd352a77 Add read/writeString to PacketList and Packet 2016-03-07 13:53:36 -08:00
Ryan Huffman
7317d3b2ea Revert AssetRequest back to using hash 2016-03-07 13:53:29 -08:00
Ryan Huffman
7dd436a7a8 Add AssetScriptingInterface methods for mapping 2016-03-07 13:52:04 -08:00
Ryan Huffman
462f00077c Add get/set mapping request 2016-03-07 13:50:57 -08:00
Ryan Huffman
6b485cf81d Update atp mapping operations to use a single packet 2016-03-07 13:49:55 -08:00
Ryan Huffman
292bc12f37 Add read/writeString to PacketList and Packet 2016-03-07 13:24:12 -08:00
Ryan Huffman
2986aa1937 Revert AssetRequest back to using hash 2016-03-07 13:23:47 -08:00
Ryan Huffman
6dd3b1b4ee Add AssetScriptingInterface methods for mapping 2016-03-07 13:23:27 -08:00
Ryan Huffman
4e7b63c72e Add get/set mapping request 2016-03-07 13:23:00 -08:00
Ryan Huffman
db98e46bb8 Update atp mapping operations to use a single packet 2016-03-01 16:18:35 -08:00
Stephen Birarda
04fd7bcdb2 create the directory to hold account file if not present 2016-03-01 14:42:09 -08:00
Atlante45
7b179ab91a First draft for mapping requests 2016-03-01 13:08:46 -08:00
Stephen Birarda
f44cf3903c re-instate verified domain ownership for full automatic networking 
This reverts commit 34408c8144.
 2016-03-01 13:04:37 -08:00
Stephen Birarda
b0c11e6562 Merge pull request #7217 from huffman/udt-random-seq 
Randomize initial send sequence number in UDT
 2016-03-01 12:59:10 -08:00
Atlante45
14ae35e741 CR 2016-03-01 12:00:43 -08:00
Atlante45
4944d0a8d0 Handle threading inside AssetServer 2016-03-01 12:00:43 -08:00
Atlante45
6a4b93a4e7 Proper fix for DiskCacheInfo 2016-03-01 12:00:43 -08:00
Atlante45
40d307a37b Temporary fix to disk cache editor crash 2016-03-01 12:00:43 -08:00
Atlante45
2c1762526d Move all resource requests to the same thread 2016-03-01 12:00:43 -08:00
Ryan Huffman
aa63dcc9d2 Add PacketType qMetaType 2016-03-01 11:36:49 -08:00
Ryan Huffman
cc9c87d281 Fix packet version mismatch not showing for domain packets 2016-03-01 11:36:49 -08:00
Ryan Huffman
548a672df9 Update DomainList version to 18 2016-02-29 15:31:38 -08:00
Ryan Huffman
04f512c99b Add extra debug to udt connection 2016-02-29 14:58:25 -08:00
Ryan Huffman
57a6cbc9dd Remove _hasReceivedData 2016-02-29 14:22:49 -08:00
Ryan Huffman
2229e397fa Move seq num initialization to handshake 2016-02-29 14:22:26 -08:00
Ryan Huffman
b442075205 Add initial seq number to handshake 2016-02-29 14:22:08 -08:00
Ryan Huffman
a7bb47fbcc Fix initialization of variables for SendQueue and Connection 2016-02-26 11:20:31 -08:00
Ryan Huffman
a0203cf9d5 Update BasePacket to 0-initialize data 2016-02-26 11:13:10 -08:00
Stephen Birarda
34408c8144 Revert "verified domain ownership for full automatic networking" 2016-02-25 17:02:08 -08:00
Brad Hefta-Gaub
82cbf19bca Merge pull request #7078 from zzmp/fix/light-intensity 
Reimplement light attenuation for spot and point lights
 2016-02-25 16:08:28 -08:00
Clément Brisset
2e7c7eace5 Merge pull request #7179 from birarda/domain-security 
verified domain ownership for full automatic networking
 2016-02-25 15:24:09 -08:00
Zach Pomerantz
32ce7c6eab Rename light surfaceRadius->falloffRadius 2016-02-25 10:02:33 -08:00
Zach Pomerantz
c2ed5e5474 Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity 2016-02-24 16:24:09 -08:00
Stephen Birarda
f8392e62a8 some wording tweaks in comments 2016-02-23 17:43:01 -08:00
Stephen Birarda
0191d75e86 allow temporary domain to upload public key 2016-02-23 17:29:15 -08:00
Stephen Birarda
5fe74bb33c send hearbeat denied packet back from ice-server 2016-02-23 15:12:17 -08:00
Stephen Birarda
bb561e98d0 actually process the connection denied packets 2016-02-23 15:00:42 -08:00
Stephen Birarda
39d9e64ee5 process a handshake if the connection has ever received data 2016-02-23 14:59:27 -08:00
Stephen Birarda
2c7112e9a8 add initial send sequence number to SendQueue 2016-02-23 14:59:27 -08:00
Stephen Birarda
6cab831ea0 re-gen the interface keypair while being denied from domain 2016-02-23 14:52:12 -08:00
Stephen Birarda
540d1615cd re-attempt keypair generation for domain check in if missing 2016-02-23 12:05:12 -08:00
Stephen Birarda
83e8c248bd repairs to failure case for keypair generation 2016-02-23 11:20:21 -08:00
Stephen Birarda
bfdf74367e don't update the AM keypair until uploaded 2016-02-23 11:09:28 -08:00
Stephen Birarda
e2f02347dd repairs to issues discovered during ID change 2016-02-23 10:57:54 -08:00
Stephen Birarda
d510ee0e47 complete ice-server signature verification 2016-02-22 18:00:05 -08:00
Atlante45
4c18a50473 Only debug if define set 2016-02-22 15:42:11 -08:00
Atlante45
97aebaf52a Fix log regexes 2016-02-22 15:33:53 -08:00
Atlante45
cb4f400c7e Cleanup obfuscation code 2016-02-22 15:32:00 -08:00
Atlante45
17b4d6fcf9 Factor members copy 2016-02-22 15:15:38 -08:00
Atlante45
f06ac911c5 Fix XORing algorithm 2016-02-22 15:15:38 -08:00
Atlante45
3a11e84c94 Use hex for msvc compatibility 2016-02-22 15:15:38 -08:00
Atlante45
c29ad09306 Fix obfuscation 2016-02-22 15:15:38 -08:00
Atlante45
bf5a65ca45 Add missing copies 2016-02-22 15:15:38 -08:00
Atlante45
4605cf5087 Move all udt header constants to Constant.h 2016-02-22 15:15:38 -08:00
Atlante45
3d7d812044 Add resend mecanic with obfuscation 2016-02-22 15:15:38 -08:00
Atlante45
6d9405d91d Add obfuscation level to packets 2016-02-22 15:15:38 -08:00
Atlante45
f6526272de Add header descriptions 2016-02-22 15:15:38 -08:00
Stephen Birarda
11a1bc4488 add signed heartbeat sending to domain-server 2016-02-22 15:12:02 -08:00
Zach Pomerantz
292842261d Bump packet version to LIGHT_HAS_SURFACE_RADIUS 2016-02-22 15:07:07 -08:00
Stephen Birarda
90e9089e85 repairs for storage of domain ID in AM accounts file 2016-02-22 13:23:01 -08:00
Stephen Birarda
e30b2b7051 generate new domain keypair on domain ID change 2016-02-22 10:28:32 -08:00
Stephen Birarda
837c4c0810 handle upload of domain public key to metaverse API 2016-02-19 16:55:12 -08:00
Stephen Birarda
6e4ecffb09 expose generated public key and private key from generator 2016-02-19 16:48:58 -08:00
Stephen Birarda
5de8601b43 simpler cleanup of result from RSAKeypairGenerator 2016-02-19 16:41:56 -08:00
Stephen Birarda
fa5f2571d7 cleanup migrations from previous account file system 2016-02-19 16:31:31 -08:00
Stephen Birarda
f553becabe data-server name tweak and isAgent behaviour change 2016-02-19 16:04:45 -08:00
Stephen Birarda
98b06112bd handle persistence of AccountManager info to sep file 2016-02-19 15:45:20 -08:00
Stephen Birarda
af181e00b1 allow for creation of domain-server keypair in AccountManager 2016-02-19 14:34:19 -08:00
Seth Alves
5659589ea1 Merge pull request #7088 from birarda/offline-domain 
fix STUN failover for offline machines
 2016-02-12 09:16:20 -08:00
Stephen Birarda
a6ba8dd8e5 fix null STUN server socket check in LNL 2016-02-11 14:14:16 -08:00
Atlante45
51168a8a29 Explicitely cast to float 2016-02-11 09:35:31 -08:00
Atlante45
f32562b191 Coding standard 2016-02-10 16:35:06 -08:00
Atlante45
1e3bf67fab Fix division by 0 2016-02-10 16:35:06 -08:00
Stephen Birarda
1773233af4 cleanup management of HRTF objects across connected Nodes 2016-02-09 14:30:44 -08:00
Stephen Birarda
42e9a4ebf0 fix ATP SendQueue failure to receive after re-activity 2016-02-04 13:43:50 -08:00
Stephen Birarda
095f0b9349 rename canAdjustLocks to isAllowedEditor for multi-purpose 2016-02-01 16:46:11 -08:00
Stephen Birarda
c91f8c7685 add debug for DDOS AC drop 2016-01-29 14:04:45 -08:00
Stephen Birarda
5551a05261 removed debug for queued check-ins 2016-01-29 14:04:45 -08:00
Stephen Birarda
e50e75cba7 drop assignment even if DDOS locks NL thread 2016-01-29 14:04:45 -08:00
Brad Davis
664100b9b1 Attachment dialog 2016-01-26 21:55:40 -08:00
Brad Hefta-Gaub
58b7708315 Merge pull request #6899 from birarda/fix-go-home 
repairs to index path behaviour
 2016-01-21 21:29:24 -08:00
Stephen Birarda
9061e33a1f send path query once connected to domain 2016-01-21 18:24:17 -08:00
Stephen Birarda
fac30bb0ae use the index path as default with network address 2016-01-21 18:24:16 -08:00
Brad Davis
f9f9ddd8bd Yet more atmosphere removal 2016-01-21 15:15:17 -08:00
Stephen Birarda
4cfe3941f4 delete the lookup timeout timer once fired 2016-01-21 11:18:53 -08:00
Stephen Birarda
e69424e155 add parentheses to old style signal 2016-01-20 09:27:47 -08:00
Stephen Birarda
e3df02e589 fix parenting of single shot timer 2016-01-19 20:51:33 -08:00
Stephen Birarda
60bf617ea1 allow STUN to succeed started late or immediately 2016-01-19 20:41:39 -08:00
Stephen Birarda
e5d47f3379 fix for accidental filtering of stun packets 2016-01-19 17:26:41 -08:00
Stephen Birarda
8bc063e758 Merge branch 'master' of https://github.com/highfidelity/hifi into console 2016-01-19 16:21:19 -08:00
Stephen Birarda
4cbbd24c7e complete handling of immediate temp name grab 2016-01-19 13:04:05 -08:00
Stephen Birarda
0b118a8e98 replace ApplicationVersion with BuildInfo 2016-01-15 15:41:34 -08:00
Ryan Huffman
0f2b9744d1 Merge branch 'console' of github.com:birarda/hifi into console-logging 2016-01-15 10:46:22 -08:00
Ryan Huffman
a5eb54b1b7 Move DomainServer script location to app data directory 2016-01-15 10:36:09 -08:00
Ryan Huffman
196161fe93 Merge pull request #66 from birarda/console-dev 
some initial packaging work and console fixes
 2016-01-14 10:17:24 -08:00
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
Stephen Birarda
1646ac55ef include application version in networking 2016-01-04 15:32:07 -08:00
Stephen Birarda
b3e46d1ed8 some macro renaming and cleanup 2016-01-04 10:26:37 -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
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
Ryan Huffman
d9eddbe738 Remove unnecessary ptr get() in PacketList 2015-12-02 13:32:56 -08:00
Atlante45
70dd8ec19a Remove left/right relative pos/rot from c++ 2015-12-01 11:44:42 -08:00
Atlante45
3bbd20a7bd Merge branch 'master' of https://github.com/highfidelity/hifi into baseball-test 2015-11-30 18:02:34 -08:00
Seth Alves
b7ebe5b92b merge from upstream 2015-11-30 16:59:52 -08:00
Stephen Birarda
f07314f4ef resolve conflicts on merge with huffman/baseball 2015-11-30 13:34:36 -08:00
Stephen Birarda
4573e5c59e resolve conflicts on merge with upstream/master 2015-11-30 13:32:38 -08:00
Ryan Huffman
5849befb3d Add caching back to AssetRequest 2015-11-30 11:53:53 -08:00
Ryan Huffman
304b105dac Add proper message failure handling to Connection 2015-11-30 11:53:08 -08:00
Ryan Huffman
2e76f0e0d8 Update ReceivedMessage progress to only trigger every 100 packets 2015-11-30 11:52:49 -08:00
Ryan Huffman
5e27af5076 Remove old comment in PacketReceiver 2015-11-30 11:52:21 -08:00
Ryan Huffman
242167ebf2 Remove debug messages 2015-11-30 11:52:07 -08:00
Ryan Huffman
bb6bb85d12 Update comment in ReceivedMessage 2015-11-30 09:16:57 -08:00
Ryan Huffman
dc48b9a266 Limit progress signal in ReceivedMessage to once every 50 packets 2015-11-30 09:15:25 -08:00
Ryan Huffman
4220d7a3cc Add atp hash checking back in 2015-11-30 09:13:59 -08:00
Seth Alves
ca75802b9c unmangle merge 2015-11-26 06:43:28 -08:00
Anthony J. Thibault
2a9adafc09 Bumped avatar packet version number 2015-11-25 12:13:40 -08:00
Ryan Huffman
dac491ef41 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-24 09:59:22 -08:00
samcake
a1668cdc73 Let the AssertClient JS interface use global vars 2015-11-23 22:28:59 -08:00
Seth Alves
f013f95e9b merge from upstream 2015-11-21 08:43:00 -08:00
Clément Brisset
5d75fcbfce Merge pull request #6430 from birarda/unique_linked_data 
use a unique_ptr for linkedData in Node
 2015-11-20 15:01:41 -08:00
Brad Hefta-Gaub
c7673aad4a Merge pull request #6447 from huffman/polyline-texture 
Add texture property to polyline entity type
 2015-11-20 13:31:34 -08:00
Brad Davis
eef01f8a13 Merge pull request #6443 from ZappoMan/assetJS 
fix crash with no asset server
 2015-11-20 12:58:16 -08:00
Stephen Birarda
b34934b849 resolve conflicts on merge with upstream/master 2015-11-20 11:52:53 -08:00
Brad Hefta-Gaub
f1badc017b CR feedback 2015-11-20 11:43:50 -08:00
Brad Hefta-Gaub
caa8b0b5b6 fix unix build 2015-11-20 11:07:01 -08:00
Brad Hefta-Gaub
4bbfcb6092 Merge branch 'master' of https://github.com/highfidelity/hifi into messaging 2015-11-20 10:30:38 -08:00
Ryan Huffman
0d6279da17 Merge remote-tracking branch 'origin/polyline-texture' into baseball 2015-11-20 10:19:30 -08:00
Brad Hefta-Gaub
0e5e33446e handle old protocol case 2015-11-20 09:57:30 -08:00
Brad Hefta-Gaub
abf169ebd9 fix senderID in messages, dry up code 2015-11-20 09:03:21 -08:00
Brad Hefta-Gaub
5c6cd9b06c fix thread safety and crash with no asset server 2015-11-19 18:53:12 -08:00
Brad Hefta-Gaub
f80a765a29 add Assets.uploadData() and Assets.downloadData() 2015-11-19 17:28:20 -08:00
Ryan Huffman
07d21514c5 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-19 10:47:37 -08:00
Stephen Birarda
271387f96e use a unique_ptr for linkedData in Node 2015-11-18 18:03:31 -08:00
Ryan Huffman
2a416ebc61 Merge branch 'master' of https://github.com/highfidelity/hifi into received-message 2015-11-18 16:52:23 -08:00
Stephen Birarda
08e6b63090 cleanup debug of received domain-server settings 2015-11-18 15:43:31 -08:00
Ryan Huffman
c2648fd6dd Remove _packetListenerMap 2015-11-18 15:30:43 -08:00
Ryan Huffman
f0ad7f85dc Add readHead* to ReceivedMessage 2015-11-18 15:30:30 -08:00
Stephen Birarda
f2ecce6043 use safer domain settings request in audio-mixer 2015-11-18 15:13:29 -08:00