Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-15 06:29:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61951 commits 25 branches 0 tags 1.1 GiB
Commit graph

3002 commits

Author SHA1 Message Date
Liv
1ae4a5c019 remove class from function call 2017-08-15 15:30:43 -07:00
Stephen Birarda
96672becc6 read redirected path info in MappingRequest 2017-08-15 15:19:20 -07:00
Liv
aea5f170f2 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup 2017-08-15 13:58:22 -07:00
Liv
49eab847fd Refactor handleOctreeFileReplacement, style changes, align with handler for other file types 2017-08-15 13:58:02 -07:00
Stephen Birarda
03e952ec38 fix extension check for get mapping redirect 2017-08-14 14:09:35 -07:00
Stephen Birarda
db3524a48f add re-direct of get mapping for baked assets 2017-08-11 14:26:27 -07:00
Stephen Birarda
bef093b8e5 add handling for completed bake 2017-08-11 13:40:30 -07:00
Stephen Birarda
8d0ed51035 clear entity tree in Agent if ES disappears 2017-08-10 11:02:56 -07:00
Menithal
982d4a451f Updated Protocol to add allowTranslation 
There still is a bug for the value no actually updating
 2017-08-08 23:47:37 +03:00
Liv Erickson
da70071b5a Merge branch 'master' into feat/domain-setup 2017-08-07 10:04:54 -07:00
Brad Davis
1ecca9fd29 Merge branch 'master' into zzmp-audio/peak-values 2017-08-06 17:21:00 -07:00
Seth Alves
186035dc5d adjust various things that cause a crash-on-exit on Linux 2017-08-06 11:57:55 -07:00
Ken Cooke
6ea4ed80cd Suppress initial PacketType::SilentAudioFrame on audio gate startup 2017-08-03 09:19:08 -07:00
burtsloane
d4ae298a8d Merge branch 'master' into midi 2017-07-26 13:59:07 -07:00
Burt Sloane
4f7243e444 Merge branch 'master' of https://github.com/burtsloane/hifi into midi 2017-07-26 13:30:57 -07:00
Burt Sloane
d2975c79c9 add midi to 3 CMakeLists.txt for linking 2017-07-26 08:41:26 -07:00
Liv
57b27a7bb7 change packet type to be sourced, change from packet list to single packet 2017-07-25 20:17:20 -07:00
Liv
9458e4a1eb Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup 2017-07-25 11:32:13 -07:00
Liv
76cc833747 move domain management into a separate API 2017-07-21 17:44:53 -07:00
Liv
5ea7fbc62a Add node check on permissions for deletion 2017-07-21 10:27:30 -07:00
Liv
26558da794 Fix stupid typo that was giving connection refused - now working 2017-07-20 18:07:08 -07:00
Liv
4ba9b08125 first attempt at url handling in octree server 2017-07-20 14:00:51 -07:00
Liv
bdb12c38cf Move API call to Entities scripting and out of Users 2017-07-20 11:41:57 -07:00
Andrew Meadows
a069620013 Merge pull request #10970 from Atlante45/feat/ac-shutdown-info 
AC shutdown info + PPID watcher on Unix
 2017-07-19 08:34:45 -07:00
Atlante45
91d65469a0 Use timer instead of dedicated thread to tick avatar 2017-07-17 15:52:52 -07:00
Atlante45
366ce69e66 Add info on how the child AC finished 2017-07-14 11:39:32 -07:00
Brad Hefta-Gaub
b063c2f45d Merge pull request #10942 from AndrewMeadows/cleanup-entity-transmission 
Cleanup OctreeSendThread::packetDistributor()
 2017-07-13 09:58:28 -07:00
Clément Brisset
d346b1c68f Merge pull request #10924 from Atlante45/fix/debug-asserts 
Misc servers debug asserts fixes
 2017-07-12 15:05:15 -07:00
Ken Cooke
cf6c1ae4a5 Replace tabs with spaces 2017-07-12 12:30:02 -07:00
Atlante45
b3d73fd0df Add comments to DebugDraw instanciation 2017-07-12 10:39:15 -07:00
Stephen Birarda
f6d9a79fb5 Revert "Revert "fix for invisible avatars after radius ignore"" 2017-07-12 10:36:53 -07:00
Andrew Meadows
1fe7718b9f restore wasted byte count when unable to fit stats 2017-07-11 15:02:45 -07:00
Andrew Meadows
782155e9ea Merge pull request #10876 from Atlante45/fix/ac-crash 
Fix AC crash (buffer overflow)
 2017-07-11 14:26:08 -07:00
Andrew Meadows
badbe98097 minor cleanup and constency for packet stats 2017-07-11 14:21:49 -07:00
Andrew Meadows
3226d33830 use cached OctreeSendThread::_nodeUuid 2017-07-11 14:02:16 -07:00
Andrew Meadows
15879b2832 + OctreeSendThread::traverseTreeAndSendContents() 
this abstracts a portion of OctreeSendThread::packetDistributor()
which will make it easier to split apart the tree traversal
from the sending of packets

also cleaned up some of the packet stats tracking
 2017-07-11 13:53:08 -07:00
Andrew Meadows
9d111d1f92 remove unused OctreeSendThread::_nodeMissingCount 2017-07-11 13:42:35 -07:00
Andrew Meadows
a5cd11cea7 remove more crufty comments 2017-07-11 10:11:24 -07:00
Andrew Meadows
ca3f0ceecb remove crufty comments 2017-07-11 10:02:18 -07:00
Andrew Meadows
076ae28bed one less strand of spaghetti when counting packets 2017-07-11 09:52:39 -07:00
Andrew Meadows
b74aad32ed minor cleanup in OctreeSendThread::packetDistributor() 2017-07-10 18:27:40 -07:00
Atlante45
c32f4ab0d3 CR 2017-07-10 14:24:53 -07:00
Stephen Birarda
98ccfa80a2 don't add node missing from a replicated kill packet 2017-07-10 11:14:13 -07:00
Atlante45
7160fca4f7 Fix bad read access on shutdown 2017-07-07 17:14:08 -07:00
Atlante45
aa306c3450 Fix debug asserts on shutdown 2017-07-07 17:01:07 -07:00
Stephen Birarda
420e9233b6 Revert "fix for invisible avatars after radius ignore" 2017-07-07 16:50:28 -07:00
Stephen Birarda
f07ce6d294 Merge pull request #10835 from birarda/bug/invisible-avatars 
fix for invisible avatars after radius ignore
 2017-07-07 16:06:44 -07:00
Atlante45
0778fbaea9 Fix Debug Mode Assert 2017-07-07 15:58:39 -07:00
Clément Brisset
34e3f56002 Merge pull request #10843 from birarda/bug/user-activities-interface-only 
disable user activity logger in DS/AC/ac-client
 2017-07-06 14:01:49 -07:00
Atlante45
1d07ab70f0 Fix warnings 2017-07-06 10:56:09 -07:00
Stephen Birarda
916f57772b default the UAL off for all targets, enable manually for Interface 2017-07-06 10:21:07 -07:00
Atlante45
95abbd0ad4 Prevent Interface from trying to send packets bigger than an MTU 2017-07-05 17:08:04 -07:00
Seth Alves
70a7b302fc Merge pull request #10860 from jherico/deadlock_guards 
Don't use blocking connections on the main thread
 2017-07-03 09:05:56 -07:00
Clément Brisset
8744b8e58d Merge pull request #10859 from Atlante45/fix/ac-cleanup 
Fix AC cleanup
 2017-06-30 16:42:15 -07:00
Stephen Birarda
f6fe3f91fd Merge pull request #10829 from birarda/bug/sequence-skips 
fix avatar mixer sending empty avatar identities
 2017-06-30 15:28:29 -07:00
Brad Davis
6fc82bb351 Switch to preprocessor macro for blocking invokes to capture function information 2017-06-30 11:36:24 -07:00
Brad Davis
b52dd7b822 Don't use blocking connections on the main thread 2017-06-29 20:45:17 -07:00
Atlante45
5c731636b1 Sandbox restarts crashed processes 2017-06-29 12:13:52 -07:00
Atlante45
76e39a3ebd Make code windows specific 2017-06-29 10:54:44 -07:00
Atlante45
a66e1148ba Preliminary work on AC auto cleanup 2017-06-28 19:20:18 -07:00
Thijs Wenker
e781f97ddc Merge pull request #10846 from sethalves/fix-server-scripts-more 
make ResourceManager be owned by DependencyManager
 2017-06-28 17:05:30 -07:00
Thijs Wenker
93679f7c3b move the ResourceManager init back to where it was, to prevent problems 2017-06-29 00:52:51 +02:00
Seth Alves
794495c197 make ResourceManager be owned by DependencyManager 2017-06-28 14:18:14 -07:00
Stephen Birarda
86eb5b14ca disable the user activity logger in DS/AC/ac-client 2017-06-28 13:19:58 -07:00
Ken Cooke
a7a049434d CR fix: comments instead of ref code 2017-06-28 11:32:41 -07:00
Stephen Birarda
9e822de196 remove local collection of radius ignored nodes 2017-06-27 17:41:07 -07:00
Stephen Birarda
e6cf7cf106 flag last broadcast for identity in right place 2017-06-27 14:25:53 -07:00
Ken Cooke
a00cd42566 fast compute of HRTF gain 2017-06-27 14:01:28 -07:00
Ken Cooke
ad970c9f5c fast compute of HRTF azimuth 2017-06-27 13:45:18 -07:00
Stephen Birarda
af79555e4b make sure nodeData exists before using it 2017-06-27 12:05:35 -07:00
Stephen Birarda
089a2bb362 do not manage identity data without identity data received 2017-06-27 11:58:03 -07:00
Ryan Huffman
209a4f33b5 Merge pull request #10784 from huffman/feat/pal-replicated 
Disable silence + ban buttons for replicated users
 2017-06-26 12:50:23 -07:00
Brad Davis
9c99b9d4c5 Merge pull request #10783 from sethalves/fix-linux-asan 
Fix linux asan
 2017-06-23 22:43:24 -07:00
Ryan Huffman
b56cfa56c7 Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated 2017-06-23 14:23:20 -07:00
Brad Davis
fe7d4b1d23 Remove dependency between codec plugins and UI 2017-06-23 12:25:18 -07:00
Seth Alves
5e2aeb96d3 Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan 2017-06-23 10:18:33 -07:00
Clément Brisset
3ea7b82d61 Merge pull request #10796 from birarda/bug/audio-codec-replication 
check for codec changes for replicated agents
 2017-06-22 16:51:40 -07:00
Stephen Birarda
ec30d9ad5c always re-process codec for replicated agent 2017-06-22 16:18:46 -07:00
Atlante45
71d2540a23 Prevent replication flat loops 2017-06-22 15:22:32 -07:00
Stephen Birarda
8b7eaaa23a activate the public socket always for upstream/downstream servers 2017-06-22 13:33:57 -07:00
Stephen Birarda
015284c0e6 do not attempt to replicate audio stream stats 2017-06-22 13:33:57 -07:00
Stephen Birarda
a6d34010b2 use reliable packet lists for replicated identity 2017-06-22 13:33:57 -07:00
Stephen Birarda
2de6185855 remove avatar mixer destructor 2017-06-22 13:33:57 -07:00
Stephen Birarda
d05996c13d fix upstream filter check, audio interest set 2017-06-22 13:33:57 -07:00
Stephen Birarda
ea45e341ee send upstream nodes down to avatar/audio 2017-06-22 13:33:57 -07:00
Seth Alves
4c5090e8ac Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan 2017-06-22 13:11:17 -07:00
Stephen Birarda
42cceb02a4 push sequence number when managing identity data for agent 2017-06-22 11:10:43 -07:00
Seth Alves
7ff576ef18 add memory-debugging macro to some cmake files 2017-06-22 10:07:39 -07:00
Stephen Birarda
c516dd06e4 Merge pull request #10714 from highfidelity/replicants 
add broadcasting/replication to downstream avatar mixers and audio mixers
 2017-06-21 17:55:07 -07:00
Stephen Birarda
aeb3f443f8 address code review comments 2017-06-21 16:14:14 -07:00
Brad Hefta-Gaub
f7d42c782d Merge pull request #10764 from thoys/feat/ac-location-jsapi 
Expose location scripting interface to Agent (AC script)
 2017-06-21 10:22:48 -07:00
Ryan Huffman
8ce1474d9a Add isReplicated to avatar identity data 2017-06-21 09:48:34 -07:00
Thijs Wenker
47643e1efe Expose location API to Agent scripts (side-effect, agents now can teleport) 2017-06-21 06:31:36 +02:00
Brad Davis
ed6620fc51 Merge pull request #10718 from jherico/frame_thread 
Cleanup and refactoring
 2017-06-19 13:31:44 -07:00
Stephen Birarda
2933a20a0c some cleanup for audio/avatar replicated packet checking 2017-06-19 10:45:33 -07:00
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
Stephen Birarda
c332244f4f fix race for isUpstream and node hole punch 2017-06-15 17:34:20 -07:00
Stephen Birarda
e6ef153148 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/replicants 2017-06-15 15:43:13 -07:00
Stephen Birarda
d7724b90af address code review comments 2017-06-15 15:01:03 -07:00
seefo
6d480600d8 Fixed a bug where custom port wasn't used in AC when passed through CLI 2017-06-15 14:59:36 -07:00
Stephen Birarda
6cf4ff1daf remove debug and fix peek of session ID 2017-06-15 13:44:44 -07:00
Brad Hefta-Gaub
035a9e898f Merge pull request #10684 from howard-stearns/avatar-whitelist 
avatar whitelist
 2017-06-15 08:45:16 -07:00
Stephen Birarda
747cca9beb don't manage display name or send empty to downstream 2017-06-14 17:17:32 -07:00
Stephen Birarda
1ed0b693da Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist 2017-06-14 16:57:28 -07:00
Ryan Huffman
785156ad9f Move downstram server adding to DS 2017-06-14 16:54:04 -07:00
Stephen Birarda
806ebd3401 add return to queueReplicatedAudioPacket if no type match 2017-06-14 16:13:20 -07:00
Stephen Birarda
4c2fa4be64 fix indentation in AvatarMixerSlave/AvatarMixerSlavePool 2017-06-14 15:53:24 -07:00
Stephen Birarda
afc9978841 add a comment for hop over sequence in AudioMixerClientData 2017-06-14 15:20:47 -07:00
Stephen Birarda
9407a65f80 peek the nodeID to keep message in right place 2017-06-14 15:12:23 -07:00
Stephen Birarda
ca196f6141 Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/avatar-mixer-downstream 2017-06-14 15:03:26 -07:00
Stephen Birarda
9ee1cf88e6 force forwarded sequence numbers from AvatarMixerSlave 2017-06-14 14:44:06 -07:00
Stephen Birarda
50b56ec761 don't unpack avatar identity that is old 2017-06-14 14:02:22 -07:00
Stephen Birarda
9be016fd3e don't skip past UUID in identity packets 2017-06-14 13:26:23 -07:00
howard-stearns
665870b846 comment per cr 2017-06-14 12:06:29 -07:00
Atlante45
3cc2396021 CR 2017-06-14 11:42:25 -07:00
Stephen Birarda
91cef9bb7c Add stats to node data for downstream mixers 2017-06-14 11:40:57 -07:00
Stephen Birarda
4a69bc5fc7 cleanup conditionals in for avatar mixer slave identity packets 2017-06-14 11:34:33 -07:00
Stephen Birarda
ae8a0ab0e5 kill packets already include killed node ID 2017-06-14 11:29:08 -07:00
Stephen Birarda
6fc1045ee9 make sure kill packet has node ID 2017-06-14 11:26:33 -07:00
Stephen Birarda
b7d8c173c1 cleanup replicated node add or update 2017-06-14 11:22:42 -07:00
howard-stearns
b3091de536 forgot proper initial value of flag after changing whitelist to be actual 
list
 2017-06-14 11:16:55 -07:00
Stephen Birarda
57cd819307 Merge pull request #10690 from Atlante45/fix/node-leak 
Fix for Jurisdiction listener
 2017-06-14 11:15:17 -07:00
Stephen Birarda
7d8ddb7b3b cleanup calls in handleReplicatedPackets 2017-06-14 11:06:58 -07:00
Stephen Birarda
324a2601fc send down replicated message to avatar mixer handling 2017-06-14 11:00:22 -07:00
Stephen Birarda
f6f3087580 only broadcast replicated nodes to downstream 2017-06-13 18:11:50 -07:00
Stephen Birarda
29842c67cc use received message faking for cleaner replication in audio 2017-06-13 18:04:59 -07:00
Ryan Huffman
a476a5b82e Change ReplicatedAvatarIdentity packet to be an unreliable packet 2017-06-13 17:19:58 -07:00
Ryan Huffman
0708daa6cc Add separate sendReplicatedIdentityPacket 2017-06-13 17:19:58 -07:00
Stephen Birarda
8f7a3595f5 only send display name changes back to directly connected agents 2017-06-13 17:19:58 -07:00
Stephen Birarda
9085a0896a manually activate sockets for downstream servers 2017-06-13 17:19:58 -07:00
Stephen Birarda
50f46dafa6 add a sequence number to replicated avatar data 2017-06-13 17:19:57 -07:00
Stephen Birarda
76f1a7445e handle replicated bulk avatar data packets 2017-06-13 17:19:57 -07:00
Ryan Huffman
da3cd59a96 Fix avatar mixer not setting last broadcast time for downstream nodes 2017-06-13 17:19:57 -07:00
Ryan Huffman
52150ad971 Add node data to downstream avatar mixers 2017-06-13 17:19:57 -07:00
Ryan Huffman
6c5947d319 Add periodic sending of avatar identity data to downstream nodes 2017-06-13 17:19:57 -07:00
Stephen Birarda
01263d9435 only send identity packets directly to agents not upstream 2017-06-13 17:19:57 -07:00
Stephen Birarda
dc94f83591 build out bulk avatar data replication 2017-06-13 17:19:57 -07:00
Stephen Birarda
98abb23783 remove ReplicatedAvatarData handling 2017-06-13 17:19:57 -07:00
Stephen Birarda
a8ea8724d3 split broadcast of avatar data for agent and downstream mixer 2017-06-13 17:19:57 -07:00
Stephen Birarda
8ce6590f0b remove ReplicatedAvatarData and immediate replication of identity 2017-06-13 17:19:57 -07:00
Stephen Birarda
44a63ca27e handle node killed and remove double IDs in kill packets 2017-06-13 17:19:57 -07:00
Atlante45
5e34795603 Fix packet types filtering 2017-06-13 17:19:57 -07:00
Atlante45
9aebf68664 Parse replicant from domain settings 2017-06-13 17:19:57 -07:00
Atlante45
b4ce9fb4fc Remove blocking call + reduce packet construction 2017-06-13 17:19:57 -07:00
Atlante45
a0d107c72c Only replicate replicated nodes 2017-06-13 17:19:57 -07:00
Atlante45
d0e8612a65 First pass at AvatarMixer replication 2017-06-13 17:19:57 -07:00
howard-stearns
6271b8ee7c avatar whitelist 2017-06-13 16:56:18 -07:00
Stephen Birarda
3f3cc89b8d fix for header of re-replicated packets 2017-06-13 11:58:08 -07:00
Atlante45
a877bf44fb CR 2017-06-13 11:26:40 -07:00
Stephen Birarda
c1bbb2a084 fix incorrect UUID in replicated packets 2017-06-13 11:24:05 -07:00
Stephen Birarda
eca35ce013 fix double check for packet types 2017-06-13 11:22:30 -07:00
Stephen Birarda
aa9574fc5a add re-replication support to audio mixer 2017-06-13 09:46:12 -07:00
Stephen Birarda
30d2e9fd23 add unsafeEachNode to iterate nodes when read lock held elsewhere 2017-06-12 17:54:16 -07:00
Stephen Birarda
4688fe4c39 fix comment for change from replicant to downstream 2017-06-12 16:29:20 -07:00
Stephen Birarda
4539d615d7 add downstream server settings handling to ThreadedAssignment 2017-06-12 16:29:20 -07:00
Stephen Birarda
9fa97d611a remove invoked addOrUpdate and move node to node list thread 2017-06-12 16:29:20 -07:00
Stephen Birarda
03a8d7b8c8 only replicate packets for agents being replicated 2017-06-12 16:29:20 -07:00
Stephen Birarda
1868971cfc fix debug for manual codec in upstream agents 2017-06-12 16:29:20 -07:00
Stephen Birarda
7ed9483467 use blocking queued for addOrUpdateNode because of parenting 2017-06-12 16:29:20 -07:00
Stephen Birarda
91c25d4270 don't continously set codec for upstream agent 2017-06-12 16:29:20 -07:00
Stephen Birarda
88af8b5842 use new downstream/upstream nomeclature 2017-06-12 16:29:20 -07:00
Stephen Birarda
a4aa9689a6 don't construct a packet of exact size for replicated audio packets 2017-06-12 16:29:20 -07:00
Stephen Birarda
fe668b1bb1 make codec negotiation stateless for replicated agents 2017-06-12 16:29:20 -07:00
Stephen Birarda
d5b466e3ae fix replicant handling slot, add node strings for replicants 2017-06-12 16:29:20 -07:00
Stephen Birarda
c7b3b79a23 use replicant nodes for audio packet replication 2017-06-12 16:29:19 -07:00
Ryan Huffman
efdd3060b0 Set isUpstream when receiving a replicated audio packet 2017-06-12 15:00:03 -07:00
Ryan Huffman
3b3465ea05 Add isUpstream to Node 2017-06-12 14:59:45 -07:00
Stephen Birarda
8ebf1db9a8 switch to replicator/replicant and add new node types 2017-06-12 10:58:34 -07:00
Stephen Birarda
a085a55107 register a listener for audio format negotiation 2017-06-12 02:41:15 -07:00
Stephen Birarda
b5c26b596e seek past source UUID in mirrored packets 2017-06-12 02:39:54 -07:00
Stephen Birarda
e629881665 mirror audio format negotiation 2017-06-12 02:18:27 -07:00
Stephen Birarda
0ee0082052 handle new packet types in AudioMixerClientData::processPackets 2017-06-12 02:05:40 -07:00
Stephen Birarda
281793c4c0 update last heard timestamp for mirrored nodes 2017-06-12 01:46:12 -07:00
Stephen Birarda
f726c5bc3a handle mirrored packets in AudioMixerClientData 2017-06-12 01:16:51 -07:00
Stephen Birarda
45bb323723 experimental support for mirrored audio packets to other mixers 2017-06-12 00:19:24 -07:00
Bradley Austin Davis
b4bbf98fe3 Suppress TBB warnings 2017-06-06 15:02:16 -07:00
Bradley Austin Davis
fc6a278217 Fixing dangling thread issues, consolidating thread management 2017-06-06 15:02:16 -07:00
Sam Cake
d19956f93c Fixing warnings 2017-05-31 22:02:47 -07:00
Ken Cooke
0fe404adbb Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noisegate-new 2017-05-23 17:31:03 -07:00
Ken Cooke
f3797798d3 Cleanup 2017-05-23 15:33:37 -07:00
Ken Cooke
c47d80574e Replace the other noise gate, in Agent.cpp 2017-05-23 15:32:41 -07:00
Stephen Birarda
841f8cb86b make sure AvatarData objects have the node session ID 2017-05-22 15:33:57 -07:00
Zach Fox
487319f7ef Increment _identitySequenceId before sending ID packet for agents 2017-05-19 16:53:25 -07:00
Clément Brisset
55b5f08714 Merge pull request #10465 from Atlante45/fix/domain-settings 
Fix domain settings not getting cleared on re-assignment
 2017-05-18 14:16:35 -07:00
Howard Stearns
95111d24b2 Merge branch 'master' into dk/sequenceNumberForAvatarIdentity 2017-05-17 17:09:47 -07:00
David Kelly
057718bde3 remove clockSkew, reference new version for Avatar packets 2017-05-17 15:14:56 -07:00
howard-stearns
0f0ad11344 Ensure avatar identity packet at mixer. 2017-05-17 13:47:24 -07:00
Seth Alves
8a88b30da7 Merge pull request #10468 from AndrewMeadows/cleanup-actions 
cleanup Actions and Constraints part-1
 2017-05-17 11:33:53 -07:00
Brad Hefta-Gaub
ee6bed5c1c Merge pull request #10189 from Atlante45/fix/memory-leak 
Set max packet per second on the agent
 2017-05-16 21:03:05 -07:00
Atlante45
c799ddc927 CR 2017-05-16 14:53:54 -07:00
Andrew Meadows
9b3754c2ee remove unused API from ObjectDynamic and friends 2017-05-15 22:13:03 -07:00
Atlante45
cde7d68570 Fix domain settings not getting cleared on re-assignment 2017-05-15 18:20:47 -07:00
Seth Alves
c6131916e1 Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-12 09:46:21 -07:00
Zach Fox
ae983658be Finally, the actual fix? 2017-05-10 15:59:19 -07:00
Zach Fox
d7e4f02291 This is a better method. 2017-05-09 15:33:33 -07:00
Seth Alves
fd238f5438 working on fixing action/constraint export/import 2017-05-08 11:02:35 -07:00
Seth Alves
cfe118e2c6 start on code to remap constraint IDs during import 2017-05-07 19:42:24 -07:00
Stephen Birarda
a21a34a4a4 add entities file replacement to DS and ES 2017-04-27 16:56:27 -07:00
ZappoMan
76902b15d3 remove one last debug log 2017-04-26 18:51:41 -07:00
ZappoMan
c0df82ff69 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-26 18:49:24 -07:00
ZappoMan
834a447d62 remove debugging code 2017-04-26 18:36:44 -07:00
Ryan Huffman
ac0a738945 Merge pull request #10261 from Atlante45/feat/progressive-load-ktx 
Add progressive load for KTX textures
 2017-04-26 18:36:01 -07:00
ZappoMan
1f9e07b828 more logging 2017-04-26 16:40:13 -07:00
ZappoMan
3de92121e0 more logging 2017-04-26 15:28:10 -07:00
anshuman64
5bd9b2e631 Merge pull request #10130 from ctrlaltdavid/21249 
New avatar record and playback script
 2017-04-26 15:18:30 -07:00
ZappoMan
7154a11192 add some more logging 2017-04-26 14:03:36 -07:00
Andrew Meadows
75c2776836 remove keep-alive packet from avatar-mixer 2017-04-26 12:47:27 -07:00
ZappoMan
7840377109 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-26 12:39:30 -07:00
Andrew Meadows
ac6d4969d6 Merge pull request #10270 from Atlante45/fix/unload 
Fix entity script unloads
 2017-04-26 11:42:14 -07:00
Atlante45
043c587395 Fix byte range for file resource requests 2017-04-26 10:49:23 -07:00
Stephen Birarda
3928e11611 fix valid byte range check and send asset from 0 2017-04-26 10:48:57 -07:00
Stephen Birarda
814970c4e2 cleanup invalid byte range handling 2017-04-26 10:48:57 -07:00
Stephen Birarda
7a3219d8f9 force a negative to in ATP byte range to be invalid 2017-04-26 10:48:57 -07:00
Stephen Birarda
06ce63f421 fix byte range set check in SendAssetTask 2017-04-26 10:48:57 -07:00
Stephen Birarda
8145e416f9 check both sides of range for invalid byte range 2017-04-26 10:48:57 -07:00
Stephen Birarda
397a29039e add support for byte range requests to ATP 2017-04-26 10:48:57 -07:00
David Rowe
4a5f84f4b9 Merge branch 'master' into 21249 
# Conflicts:
#	libraries/audio-client/src/AudioClient.cpp
 2017-04-26 13:24:18 +12:00
ZappoMan
65801cbb4d Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-25 18:21:17 -07:00
ZappoMan
90cdeb9582 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-25 16:09:59 -07:00
ZappoMan
8dc41ca8b9 add support for ignore radius from agent scripts 2017-04-25 15:28:26 -07:00
David Rowe
4c30c0d722 Make UserActivityLogger available to AC scripts 2017-04-25 13:42:12 +12:00
ZappoMan
382645ddd0 more cleanup 2017-04-24 18:01:54 -07:00
ZappoMan
c9aad6b762 new approach to the tpose fix, as well as other improvements 2017-04-24 17:36:05 -07:00
Atlante45
d292451f91 Remove unnecessary const 2017-04-24 15:43:36 -07:00
Atlante45
41cd0d79b2 Set max packet per second on the agent 2017-04-24 10:56:57 -07:00
ZappoMan
088cdae320 CR feedback 2017-04-21 11:14:47 -07:00
ZappoMan
125b3d5f4e ignore old identity packets 2017-04-21 07:51:17 -07:00
Seth Alves
21ca767b7c remove setPosition and setRotation for actions because they were never finished and never used. 2017-04-18 11:59:16 -07:00
Seth Alves
d17d12446b Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 12:49:03 -07:00
Thijs Wenker
6f58e91d76 Merge pull request #10121 from birarda/bug/recording-cache 
cleanup Agent RSI handling, make loadRecording async
 2017-04-14 21:35:51 +02:00
Andrew Meadows
5bdecfbfa0 send keep-alive packets but don't resend identity 2017-04-13 16:00:11 -07:00
Andrew Meadows
14b60165ef don't keep stale avatars alive 2017-04-13 14:55:08 -07:00
Andrew Meadows
63ea16f24b avatar-mixer to send identity packets as 'reliable' 2017-04-13 13:37:18 -07:00
Andrew Meadows
e364b8d33e avatar-mixer resends to avoid stale avatar 2017-04-13 13:35:59 -07:00
Seth Alves
0eb9507a10 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0 2017-04-12 16:25:50 -07:00
Seth Alves
74c0a70cb0 rename base action classes to dynamics, start on constraints 2017-04-11 20:39:13 -07:00
Andrew Meadows
d25c0ace44 AvatarMixer sends min updates for out-of-view avatars 2017-04-11 15:02:27 -07:00
Stephen Birarda
84a5807ff1 return ScriptAvatarData raw pointer from getAvatar 2017-04-10 22:15:45 -07:00
Stephen Birarda
6c49db0f1b add missing include for qScriptRegisterMetaType in Agent 2017-04-10 22:15:45 -07:00
Stephen Birarda
42a406e90a add ScriptAvatar for std::shared_ptr<Avatar> passing to scripts 2017-04-10 22:15:45 -07:00
Stephen Birarda
602d65a71a Merge pull request #10001 from birarda/cleanup-ebp 
cleanup EncodeBitstreamParams to use nodeData when possible
 2017-04-10 15:54:30 -07:00
Howard Stearns
54888f85be strip more 2017-04-10 08:41:50 -07:00
Howard Stearns
c32879d807 fix multi-line sessionDisplayName 2017-04-08 15:41:11 -07:00
Stephen Birarda
c7a28a527a cleanup Agent recording handling, make loadRecording async 2017-04-04 10:56:25 -07:00
Stephen Birarda
6ed4295b8b make sure HeadData is present before processing recording frames 2017-04-03 13:55:11 -07:00
Zach Fox
8a96969471 Merge pull request #9873 from highfidelity/PAL_v2 
PAL v2.0
 2017-03-31 17:00:41 -07:00
Howard Stearns
0c07003768 Merge pull request #10049 from AndrewMeadows/avoid-invisible-avatars 
Avoid invisible avatars
 2017-03-31 13:48:41 -07:00
David Kelly
e66c075f8e Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-30 10:14:29 -07:00
Andrew Meadows
c5eb2e0642 restore spelling in comment 2017-03-28 21:11:32 -07:00
Andrew Meadows
2777ad0397 fix comments 2017-03-28 21:02:49 -07:00