Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 17:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
47341 commits 71 branches 56 tags 1.2 GiB
Commit graph

2114 commits

Author SHA1 Message Date
Stephen Birarda
f117bd5867 fix check for string assets path 2016-02-11 15:38:50 -08:00
Stephen Birarda
7c0b3953e4 handle custom path in asset-server for assets 2016-02-11 15:34:43 -08:00
Clément Brisset
911591c0ea Merge pull request #7082 from birarda/hrtf-map-crash 
fix for HRTF map crash
 2016-02-11 09:57:20 -08:00
Stephen Birarda
52cd4ae1a5 make sure the AudioMixerClientData exists before using it 2016-02-11 09:34:21 -08:00
Stephen Birarda
367e558b19 address PR comments for whitespace and constant 2016-02-11 09:30:07 -08:00
Stephen Birarda
f0ca412b29 use the existing not mixed count for injector inactivity 2016-02-10 18:22:57 -08:00
Stephen Birarda
edfb65acf6 more stats printing removal from audio-mixer 2016-02-10 17:38:56 -08:00
Stephen Birarda
6707535ced remove unused and incorrect stats from DS stats 2016-02-10 17:33:56 -08:00
Stephen Birarda
97cd65cf80 don't use usecTimestampNow for per second actions 2016-02-10 15:07:58 -08:00
Stephen Birarda
8598360f2e allow string values to be graphable in DS stats 2016-02-10 11:50:23 -08:00
Stephen Birarda
a9fc69b4ac cleanup percentage calculation for AM mix stats 2016-02-10 10:49:13 -08:00
Stephen Birarda
26fd0c305a push the length threshold to 1e-30 2016-02-09 17:14:23 -08:00
Stephen Birarda
a8841b475f specify float instead of implicitly converted double 2016-02-09 17:05:16 -08:00
Stephen Birarda
1a7738353a use a length check against source listener distance 2016-02-09 17:01:18 -08:00
Stephen Birarda
e0cb8db914 handle zero distance from listener to source 2016-02-09 16:51:23 -08:00
Stephen Birarda
87b85d6951 more useful stats for new HRTF mixer 2016-02-09 16:39:45 -08:00
Stephen Birarda
87d1d0a49c call renderSilent when audio-mixer is struggling 2016-02-09 15:30:51 -08:00
Stephen Birarda
95d0734d7f fix for windows size_t warning 2016-02-09 15:20:34 -08:00
Stephen Birarda
2cecfc499b correct azimuth for HRTF 2016-02-09 15:03:55 -08:00
Stephen Birarda
84b87b6f38 remove the unused AUDIO_MIXER_DEBUG define 2016-02-09 14:34:02 -08:00
Stephen Birarda
04dc55686b remove some comments for HRTF cleanup tests 2016-02-09 14:31:31 -08:00
Stephen Birarda
7b2726f89b ensure that injectors are cleaned up once inactive 2016-02-09 14:30:59 -08:00
Stephen Birarda
1773233af4 cleanup management of HRTF objects across connected Nodes 2016-02-09 14:30:44 -08:00
Stephen Birarda
a6a694c704 fix mixing bugs post HRTF integration 2016-02-09 11:58:55 -08:00
Stephen Birarda
1ce1a73f92 some concurrency repairs for AudioMixerClientData streams 2016-02-09 10:29:02 -08:00
Stephen Birarda
73690fe4cb use unique_ptr for audio streams in AudioMixerClientData 2016-02-08 18:45:14 -08:00
Stephen Birarda
fd96f0d960 leverage new HRTF in audio-mixer mix preparation 2016-02-08 18:12:25 -08:00
Stephen Birarda
445662f5ae clean sweep of old now unused audio files 2016-02-08 15:38:12 -08:00
James B. Pollack
3c9043987f Merge pull request #7019 from birarda/absolute-paths 
allow absolute path to entity-server persist file
 2016-02-04 08:53:21 -08:00
James B. Pollack
8b09cf3b82 Merge pull request #7024 from birarda/audio-mute-crash 
fix for audio-mixer mute env crash
 2016-02-04 08:53:10 -08:00
Andrew Meadows
63df34541d Merge pull request #6802 from huffman/agent-simulation 
Fix Agents bidding on simulation ownership
 2016-02-03 13:45:12 -08:00
Stephen Birarda
ea9d84bdc4 handle downloading of absolute persist file contents 2016-02-03 13:18:29 -08:00
Stephen Birarda
0e20392e66 remove debug for mute environment packet 2016-02-03 11:07:16 -08:00
Stephen Birarda
26abca92ae don't move the re-used mute environment packet 2016-02-03 10:55:07 -08:00
Stephen Birarda
2c1623ed42 use extension with preceeding period 2016-02-02 16:07:14 -08:00
Stephen Birarda
8ab15770b8 use absolutePath for absolute persist path 2016-02-02 15:52:12 -08:00
Stephen Birarda
99d1fa08fd handle incorrect casing in persist file extension 2016-02-02 15:49:40 -08:00
Stephen Birarda
90b78feb1e force models file to end in .json.gz 2016-02-02 15:37:34 -08:00
Stephen Birarda
4d91b8b7d6 fix check for existing persist file directory 2016-02-02 14:38:17 -08:00
Stephen Birarda
cfff765731 allow for absolute path handling at entity-server 2016-02-02 14:21:34 -08:00
Stephen Birarda
79dc2d5d55 add some debug for mute environment crash 2016-02-02 11:40:15 -08:00
Ryan Huffman
eff02d3e3a Fix Agents bidding on simulation ownership 2016-02-02 10:47:51 -08:00
Stephen Birarda
095f0b9349 rename canAdjustLocks to isAllowedEditor for multi-purpose 2016-02-01 16:46:11 -08:00
Stephen Birarda
0e016838b4 tweak size of values in AudioMixer 2016-01-29 14:04:45 -08:00
Howard Stearns
f00ec8de5d Merge pull request #6947 from huffman/fix-entity--mkdir 
Update entity server to always make resource directory if it does not…
 2016-01-27 13:03:00 -08:00
Ryan Huffman
a731a571e0 Update entity server to always make resource directory if it does not exist 2016-01-26 13:50:58 -08:00
Stephen Birarda
1e87fe77f2 return the result of PositionalAudioStream parseData 2016-01-25 13:47:20 -08:00
Stephen Birarda
7430b12db6 add some debug for stream overflows in audio-mixer 2016-01-25 13:30:19 -08:00
Stephen Birarda
cc96d90a21 Merge pull request #6897 from huffman/fix-asset-migration 
Fix asset server not creating resources directory before migrating
 2016-01-21 18:25:48 -08:00
Brad Hefta-Gaub
7bfe2730e8 Merge pull request #6849 from jherico/atmosphere 
Remove old atmosphere rendering
 2016-01-21 17:58:59 -08:00
Ryan Huffman
f9718931b0 Fix asset server not creating resources directory before migrating 2016-01-21 17:40:12 -08:00
Stephen Birarda
9127edc968 Merge pull request #6892 from huffman/fix-asset-migration 
Fix ATP file copy
 2016-01-21 17:15:46 -08:00
Brad Hefta-Gaub
094e41c993 Merge pull request #6888 from Atlante45/fix/wifi-ping-spikes 
Fix wifi ping spikes
 2016-01-21 17:07:38 -08:00
Ryan Huffman
99bb1fcbe1 Remove dirs from atp copy 2016-01-21 16:46:45 -08:00
Ryan Huffman
c9ea6e7eb6 Fix ATP file copy 2016-01-21 16:45:13 -08:00
Leonardo Murillo
a3ccf7014c Merge pull request #6890 from huffman/fix-asset-migration 
Fix asset server data migration
 2016-01-21 18:12:07 -06:00
Ryan Huffman
996f3f5df7 Fix entity server data migration to work with default persist filename 2016-01-21 15:43:45 -08:00
Ryan Huffman
e63ac03123 Fix asset server data migration 2016-01-21 15:26:52 -08:00
Brad Davis
b8109af196 Ignite the atmosphere 2016-01-21 15:15:15 -08:00
Atlante45
db18d188b8 Fix wifi ping spikes 
Moves the setting of Qt's bearer poll timeout earlier to be sure
it's caught.
 2016-01-21 15:05:32 -08:00
Leonardo Murillo
098b7a4ff3 Merge pull request #6870 from birarda/console 
Your Stack Manager is now a Server Console
 2016-01-21 14:31:34 -06:00
Stephen Birarda
7c9dc2e2bb add a comment for QProcess non-dangling pointer 2016-01-21 11:02:34 -08:00
Stephen Birarda
63da0074b4 repair the audio-mixer coma debug 2016-01-21 10:26:03 -08:00
Stephen Birarda
5e451360f7 add some debug for the next audio mixer coma 2016-01-20 18:22:37 -08:00
Ryan Huffman
c31ceeca86 Add deletion of old log files 2016-01-20 15:35:30 -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
fdda93a62d set the build version on assignment-client 2016-01-19 16:04:41 -08:00
Ryan Huffman
4ce20242b1 Fix asset server data migration 2016-01-19 15:50:45 -08:00
Ryan Huffman
37cfac404e Move octree server data directory to /web 2016-01-19 15:23:14 -08:00
Ryan Huffman
58344416fd Remove extra whitespace 2016-01-19 15:16:17 -08:00
Ryan Huffman
84f4b4b935 Remove dead code 2016-01-19 15:15:54 -08:00
Ryan Huffman
4afb6992c3 Move entities resources into /entities 2016-01-19 14:41:57 -08:00
Ryan Huffman
c417bc0fb3 Move asset resource directory out of /resources 2016-01-19 14:41:57 -08:00
Stephen Birarda
fcaf38cc57 don't set AC version for data directory fix 2016-01-15 15:56:47 -08:00
Stephen Birarda
0876da7a7d call manual install of ssleay from console install 2016-01-15 15:41:34 -08:00
Stephen Birarda
cf5b6198fd use install command to manually place ssleay library 2016-01-15 15:41:34 -08:00
Stephen Birarda
05e48528bd make sure SSL_EAY_LIBRARY_* is set when used 2016-01-15 15:41:34 -08:00
Stephen Birarda
c1a9a7f4c1 add ssleay copy for win AC/DS/Interface 2016-01-15 15:41:34 -08:00
Stephen Birarda
0b118a8e98 replace ApplicationVersion with BuildInfo 2016-01-15 15:41:34 -08:00
Stephen Birarda
1faa78fe72 install fixed up DS and AC beside console 2016-01-15 15:41:34 -08:00
Stephen Birarda
e421624e99 put AC and DS binaries beside server-console 2016-01-15 15:41:34 -08:00
Stephen Birarda
e6ccce6a38 fix placement of _logDirectory member variable 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
a9afa53fb7 Add migration of old octree server data 2016-01-14 12:57:48 -08:00
Ryan Huffman
fc42254be1 Add migration of old Asset server data 2016-01-14 12:57:29 -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
Thijs Wenker
6808e25fdf zone ranges to min and max variables, this way it is more oversee-able with the new negative positioning system 2016-01-13 01:26:32 +01:00
Brad Davis
d28f80aa07 Moving running scripts functionality to scripting library 2016-01-11 12:44:03 -08:00
Ryan Huffman
46ed5f6479 Fix AssignmentParentFinder not handling null parentID 2016-01-09 14:27:57 -08:00
Ryan Huffman
4851def51c Add status HTTP server to AC Monitor 2016-01-08 10:35:04 -08:00
Stephen Birarda
404fb2f781 Merge branch 'master' of https://github.com/highfidelity/hifi into console 2016-01-07 16:02:32 -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
7304e695b3 resolve conflicts on merge with upstream/master 2016-01-04 15:40:16 -08:00
Stephen Birarda
b3e46d1ed8 some macro renaming and cleanup 2016-01-04 10:26:37 -08:00
Brad Davis
3b4f5d36a5 PR feedback 2016-01-03 12:29:32 -08:00
Stephen Birarda
abea65fa84 resolve conflicts on merge with upstream/master 2015-12-29 17:54:45 -08:00
Seth Alves
f0bffe7a24 fix success return value 2015-12-21 14:29:07 -08:00
Seth Alves
bc52576ba2 Merge branch 'fix-entity-server-crash' of github.com:sethalves/hifi into near-grab-via-parenting 2015-12-19 08:14:15 -08:00
Seth Alves
9271209d89 another 2015-12-19 08:13:53 -08:00
Seth Alves
a175bb85f9 Merge branch 'fix-entity-server-crash' of github.com:sethalves/hifi into near-grab-via-parenting 2015-12-19 08:09:44 -08:00
Seth Alves
8b9de716f1 fix bad pointer juju 2015-12-19 08:08:10 -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
2c8be15e66 Unnecessary shutdown (Already shutting down) 2015-12-16 15:56:22 -08:00
Atlante45
b709c8162c Fix node flapping race 2015-12-16 14:27:26 -08:00
Atlante45
6bda8d3f18 CR logging category 2015-12-16 14:27:26 -08:00
Atlante45
b55d8f750f CR 2015-12-16 14:27:26 -08:00
Atlante45
0f7093bed7 Whitespace 2015-12-16 14:27:26 -08:00
Atlante45
df24fafe49 CR feedback 2015-12-16 14:27:26 -08:00
Atlante45
a655557af0 Make variable name more obvious 2015-12-16 14:27:26 -08:00
Atlante45
b4dc3b1b47 Fix windows compile error. 2015-12-16 14:27:26 -08:00
Atlante45
a541fdd2df Move OctreeSendThread to the OctreeServer 2015-12-16 14:27:26 -08:00
Atlante45
51ec7ae2ed Keep UUID of node in send thread 2015-12-16 14:27:26 -08:00
Atlante45
3cd1eea1dc Use weak pointer to the Node instead of strong ownership 2015-12-16 14:27:26 -08:00
Atlante45
346c28f9e2 Remove OctreeServer's static instance 2015-12-16 14:27:26 -08:00
Atlante45
09701fdcf1 deadlock 101 2015-12-16 14:27:26 -08:00
Atlante45
b65cdd2865 Add logging categories to assignment client. 2015-12-16 14:27:26 -08:00
Atlante45
bd7fa266cf Bit of cleanup 2015-12-16 14:27:26 -08:00
Seth Alves
45d19167c9 fix a couple of missing-parent bugs 2015-12-16 10:09:46 -08:00
Ryan Huffman
b907a04a3f Add log directory to AssignmentClientMonitor 2015-12-16 09:08:51 -08:00
Ryan Huffman
195f58e130 Add log-directory option to AC monitor 2015-12-16 08:51:13 -08:00
Seth Alves
a3631ea1d1 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-15 10:12:49 -08:00
Seth Alves
b9fc368857 Merge pull request #6633 from huffman/agent-spatial-finder 
Add AssignmentParentFinder to Agent
 2015-12-14 09:35:27 -08: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
c74f8bca49 location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent 2015-12-14 09:13:36 -08:00
Atlante45
ce51350b65 Fix warnings on windows 64bit 2015-12-11 15:42:15 -08:00
Ryan Huffman
66ed8dc053 Add AssignmentParentFinder to Agent 2015-12-11 14:51:14 -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
Brad Hefta-Gaub
c1fe30ff49 Merge pull request #6620 from huffman/fix-agent-entity-delete 
Fix EntityErase packets not being handled on agents
 2015-12-10 17:27:21 -08:00
Ryan Huffman
4c8b7aa800 Fix EntityErase packets not being handled on agents 2015-12-10 16:26:16 -08:00
Ryan Huffman
b5e3dce376 Add keyhole radius to OctreeQuery 2015-12-10 14:34:28 -08:00
Brad Hefta-Gaub
2fbabf20db properly handle repack attempts 2015-12-10 14:03:06 -08:00
Leonardo Murillo
dda99bfea6 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-08 14:07:50 -08:00
Leonardo Murillo
25494ec867 Merge pull request #6562 from Atlante45/baseball 
Baseball
 2015-12-07 14:11:21 -08:00
Clément Brisset
42365acef5 Merge pull request #6561 from ZappoMan/cruftRemovalRedux 
More Cruft Removal
 2015-12-07 11:39:54 -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
Seth Alves
62b4eac875 fix avatar-mixer parents-related crash 2015-12-04 16:41:56 -08:00
Atlante45
1d498af76e Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-12-04 15:18:25 -08:00
Brad Hefta-Gaub
46946212cf remove WANT_LOW_RES_MOVING_BIT from OctreeQuery always true 2015-12-04 14:24:31 -08:00
Brad Hefta-Gaub
f44a9daa21 remove WANT_DELTA from OctreeQuery 2015-12-04 14:04:57 -08:00
Brad Hefta-Gaub
0d9d5375c7 remove optional WANT_COMPRESSION from OctreeQuery 2015-12-04 13:29:18 -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
Brad Hefta-Gaub
d9a1563396 Merge pull request #6152 from sethalves/parents 
Parents
 2015-12-04 10:26:57 -08:00
Brad Hefta-Gaub
49a7852d76 Merge pull request #6540 from Atlante45/warnings 
Fix warnings on OS X
 2015-12-04 10:19:25 -08:00
Atlante45
cb758ca6b4 Fix override warnings on XCode 7 2015-12-04 08:55:43 -08:00
Brad Hefta-Gaub
f472b515c3 remove wantsColor support since its always true and required for entities 2015-12-03 21:03:32 -08:00
Brad Hefta-Gaub
81fb4476bc remove coverage map and occulusion culling, since it was always disabled 2015-12-03 20:29:23 -08:00
Brad Hefta-Gaub
5a75a17174 Revert "Cruft removal" 2015-12-03 17:40:41 -08:00
Brad Hefta-Gaub
1a5bc5d111 removing optional compression 2015-12-03 12:40:24 -08:00
Brad Hefta-Gaub
849a8707d2 remove wantsColor support since its always true and required for entities 2015-12-03 11:11:15 -08:00
Seth Alves
4e74c98ae7 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-03 11:00:13 -08:00
Brad Hefta-Gaub
0c05ffe9ce remove coverage map and occulusion culling, since it was always disabled 2015-12-03 10:20:04 -08:00
Ryan Huffman
ce882a9c11 Replace QSharedPointer ctor with ::create 2015-12-03 09:43:36 -08:00
Brad Hefta-Gaub
4497d21aec remove nodes that disconnect from out viewer stats 2015-12-02 14:51:48 -08:00
Brad Hefta-Gaub
1e51a90204 add edit times and entity ids to the viewer stats 2015-12-02 14:43:00 -08:00
Seth Alves
6eae98fb28 merge from upstream 2015-12-02 14:38:26 -08:00
Brad Hefta-Gaub
08ba535c38 add some basic send tracking 2015-12-02 13:43:05 -08:00
Brad Hefta-Gaub
75a57c3cb8 Merge pull request #6500 from Atlante45/octree_crash 
Octree crash fix
 2015-12-02 09:59:56 -08:00
Atlante45
c3e2d920ee Move timing at the top 2015-12-02 09:45:51 -08:00
Seth Alves
0595ef0938 merge from upstream 2015-12-02 09:30:19 -08:00
Leonardo Murillo
f5dfc7d3e4 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-02 10:42:57 -06:00
Brad Hefta-Gaub
82d6718d8b Merge pull request #6510 from birarda/es-deadlock 
fix infinite loop on shutdown in OctreeInboundPacketProcessor
 2015-12-02 08:16:28 -08:00
Atlante45
0bc914bf19 Don't grab subTree outside lock 2015-12-01 19:33:44 -08:00
Atlante45
f06b5b05b3 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-12-01 15:14:58 -08:00
Howard Stearns
8f7f3eed6e ScriptAvatar now gets the .fbx joints: 
Because the joint mappings in the .fst can be wrong when the .fst isn't updated for quick changes in the .fbx.
  Because models now really need the preRotation, which is only in the avatar .fbx.
 2015-12-01 11:52:42 -08:00
Stephen Birarda
557ab315d9 make resettable stats atomic 2015-12-01 10:51:52 -08:00
Stephen Birarda
27227181f0 fix for infinite loop in OctreeeInboundPacketProcessor 2015-12-01 10:45:19 -08:00
Leonardo Murillo
418b9c8fea Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-01 11:57:38 -06:00
Atlante45
083205916f Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-30 18:25:53 -08:00
Seth Alves
b7ebe5b92b merge from upstream 2015-11-30 16:59:52 -08:00
Clément Brisset
e168966b87 Merge pull request #6409 from birarda/injector-hybrid 
more efficient threading of networked AudioInjector objects
 2015-11-30 15:36:41 -08:00
Atlante45
4aaa9ca02f Make OctreeElementBag safer to use 2015-11-30 15:23:49 -08:00
Stephen Birarda
4573e5c59e resolve conflicts on merge with upstream/master 2015-11-30 13:32:38 -08:00
Ryan Huffman
1b0413f8e3 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-30 10:23:40 -08:00
Seth Alves
081174fe69 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-11-30 10:18:01 -08:00
Andrew Meadows
49a6f63663 remove whitespace and fix warning (unused var) 2015-11-30 10:00:05 -08:00
Seth Alves
ca75802b9c unmangle merge 2015-11-26 06:43:28 -08:00
Atlante45
a364e85e1d Remove DeleteHooks 2015-11-25 17:21:56 -08:00
Leonardo Murillo
b7cdca75b7 Checkpoint towards integrated delivery 2015-11-24 16:12:04 -06:00
Ryan Huffman
669d3c3523 Rename several ReceivedMessage params from packet to message 2015-11-24 11:29:02 -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
Stephen Birarda
7f7d05fc42 fix double initialization of AssetClient in Agent 2015-11-24 10:46:35 -06:00
Stephen Birarda
ab7cbc0b76 Merge branch 'master' of https://github.com/highfidelity/hifi into injector-hybrid 2015-11-24 10:45:00 -06:00
Brad Hefta-Gaub
82ff0af05c Merge pull request #6472 from murillodigital/stack-manager 
Stack manager - integration checkpoint
 2015-11-23 16:53:53 -08:00
Seth Alves
5fe41662d8 fix comment header paths 2015-11-23 14:31:40 -08:00
Stephen Birarda
0997d3dcae resolve conflicts on merge with upstream/master 2015-11-23 16:15:15 -06:00
Seth Alves
ba30e01664 include global position in avatar-mixer protocol so server knows where avatars are in world-space 2015-11-23 14:12:49 -08:00
samcake
25654824a2 Copy pasting the code that Stephen did and also adding the AssetServer to the list of dependent nodes for the agent 2015-11-23 12:32:27 -08:00
Leonardo Murillo
ec6be93938 Merge branch 'master' of https://github.com/highfidelity/hifi into stack-manager 2015-11-23 14:22:05 -06:00
samcake
301f0ba145 Trying to instenciate the AssetCLient in the Agent 2015-11-23 11:48:02 -08:00
Seth Alves
f013f95e9b merge from upstream 2015-11-21 08:43:00 -08:00
samcake
5d17fa0b34 Merge pull request #6458 from ZappoMan/acPlayback 
allow playbackAgents to auto-register
 2015-11-20 16:25:02 -08:00
Stephen Birarda
b24b095c90 add a missing space in Agent 2015-11-20 16:09:41 -08:00
Brad Hefta-Gaub
f56d2fba7f allow playbackAgents to auto-register 2015-11-20 16:00:43 -08:00
Leonardo Murillo
5d2700309d Merge branch 'master' of github.com:highfidelity/hifi into stack-manager 2015-11-20 17:43:25 -06:00
Stephen Birarda
9ddebc8d13 resolve conflicts on merge with upstream/master 2015-11-20 15:29:44 -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
b5d764814c Merge pull request #6450 from birarda/agent-script-fail 
fix for agent script download fail
 2015-11-20 13:29:10 -08:00
Leonardo Murillo
d17bf28bce Merge branch 'master' of github.com:highfidelity/hifi into stack-manager 2015-11-20 15:20:08 -06:00
Leonardo Murillo
e17d0b2af3 Bundling and consolidating deployment package 2015-11-20 15:10:56 -06:00
Stephen Birarda
b34934b849 resolve conflicts on merge with upstream/master 2015-11-20 11:52:53 -08:00
Stephen Birarda
cf204ad5b0 cleanup executeScript comment in Agent 2015-11-20 11:44:58 -08:00
Stephen Birarda
aa836aa4b5 add a script request timeout 2015-11-20 11:44:04 -08:00
Stephen Birarda
3b40119992 use Agent session UUID to request script 2015-11-20 11:35:24 -08:00
Brad Hefta-Gaub
7441e20f58 cleanup 2015-11-20 11:20:36 -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
Brad Hefta-Gaub
e530aa6545 don't assert on sender mismatch 2015-11-20 09:58:28 -08:00
Brad Hefta-Gaub
abf169ebd9 fix senderID in messages, dry up code 2015-11-20 09:03:21 -08:00
Stephen Birarda
8f5212acac use destroy instead of accidental set 2015-11-19 17:26:10 -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
Brad Hefta-Gaub
e318537af4 Merge pull request #6425 from birarda/handshake-ds-settings 
fix case where servers could run without settings
 2015-11-19 10:10:28 -08:00
Seth Alves
98073de0b8 Merge pull request #6426 from ZappoMan/entitiesFileDownload 
implement support to download the persist file from entity server status page
 2015-11-19 09:47:10 -08:00
Stephen Birarda
271387f96e use a unique_ptr for linkedData in Node 2015-11-18 18:03:31 -08:00
samcake
74beeefe06 Merge pull request #6420 from jherico/dargo 
Make recording and playback work in interface, playback in agent
 2015-11-18 17:52:09 -08:00
Brad Hefta-Gaub
456da661ff implement support to download the persist file from entity server status page 2015-11-18 17:30:07 -08:00
Brad Davis
98cc7408b1 Fixing issues found in AC playback test 2015-11-18 17:17:20 -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
3773995bb7 remove true return for readAdditionalConfiguration 2015-11-18 15:41:27 -08:00
Stephen Birarda
cb708859fb resolve conflicts on merge with upstream master 2015-11-18 15:34:56 -08:00
Stephen Birarda
3ba0c9d042 resolve conflicts on merge with upstream master 2015-11-18 15:29:39 -08:00
Stephen Birarda
20485b817c use safer domain-server settings request in entity-server 2015-11-18 15:27:57 -08:00
Stephen Birarda
eafc11e054 use safer domain settings request in AvatarMixer 2015-11-18 15:18:16 -08:00
Stephen Birarda
f2ecce6043 use safer domain settings request in audio-mixer 2015-11-18 15:13:29 -08:00
Brad Davis
5b8047ded4 Make recording and playback work in interface, playback in agent 2015-11-18 14:04:45 -08:00
Brad Hefta-Gaub
35677d3a48 Merge pull request #6418 from birarda/test-ds-settings-fail 
move keepalive pings transparently to NL
 2015-11-18 11:12:16 -08:00
Stephen Birarda
d90c073102 leverage NL keep alive pings in Agent 2015-11-18 10:25:18 -08:00
Brad Davis
2636e43fab Merge pull request #6413 from samcake/controllers 
Recording: Moving the Recording js interface to the Script engine
 2015-11-18 10:22:55 -08:00
samcake
368f19b4e2 Merging with todays upstream and checking 2015-11-17 18:58:10 -08:00
Stephen Birarda
2355ba70ca just remove messages-mixer settings grabbing all together 2015-11-17 18:55:09 -08:00
Stephen Birarda
c21fbc9a46 fix for messages-mixer bail early on empty settings 2015-11-17 18:53:23 -08:00
samcake
d2f3b48637 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-17 17:36:38 -08:00
Stephen Birarda
5dc48dc9dc resolve conflicts on merge with upstream/master 2015-11-17 17:04:12 -08:00
Stephen Birarda
8e4d7c69ce handle AudioInjectorManager for scripted ACs 2015-11-17 17:01:11 -08:00
Brad Hefta-Gaub
6dfcc53c27 properly handle removing subscribers from channels when the subscriber node disconnects 2015-11-17 14:19:13 -08:00
Brad Hefta-Gaub
32bf81ef0d move MessagesClient to agent 2015-11-17 12:59:12 -08:00
Brad Hefta-Gaub
5b9791d800 add message received signal 2015-11-17 11:50:10 -08:00
Brad Hefta-Gaub
e7a8df306c fix warnings 2015-11-17 11:18:36 -08:00
Brad Hefta-Gaub
1c2c37ff44 more cleanup work 2015-11-17 11:10:12 -08:00
Brad Hefta-Gaub
034debc483 cleanup 2015-11-17 10:59:53 -08:00
Brad Hefta-Gaub
1f7c70a0d1 implement proper sending 2015-11-17 10:28:50 -08:00
Brad Hefta-Gaub
6b61ec569c more work on channels 2015-11-17 09:47:50 -08:00
Sam Gateau
5b92929833 Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client 2015-11-17 09:32:22 -08:00
ZappoMan
f712fae4d2 more hacking 2015-11-17 08:56:21 -08:00
Brad Hefta-Gaub
5f04e4a167 more work 2015-11-16 19:29:54 -08:00
samcake
8553033d59 Refactoring the mess for the Agent 2015-11-16 19:27:28 -08:00
Brad Hefta-Gaub
1e0b66a68f more work 2015-11-16 19:23:39 -08:00
Brad Hefta-Gaub
12f206e2f0 more work on messages 2015-11-16 17:00:03 -08:00
Stephen Birarda
aa77c4894c add an AudioInjectorManager for more efficient threading 2015-11-16 16:04:10 -08:00
Brad Hefta-Gaub
d42a1a721f first cut at messages-mixer 2015-11-16 15:26:17 -08:00
Stephen Birarda
3fa0bcbcd9 ping the AssetClient from the agent 2015-11-16 10:38:59 -08:00
Stephen Birarda
5908f2d398 put Agent AssetClient on sep thread, cleanup 2015-11-16 10:38:45 -08:00