Stephen Birarda
3b5ba71163
fix a crash in ESS from missing dependency
2018-08-22 12:23:24 -07:00
Stephen Birarda
3e2d4dc696
fixes and improvments addressing CR comments
2018-08-21 10:53:52 -07:00
Stephen Birarda
7e127749f7
move AssignmentDynamicFactory to entity-server only
2018-08-21 10:32:05 -07:00
Stephen Birarda
f0ba61ff05
add missing local ID, reset client processed trait versions
2018-08-21 10:32:05 -07:00
Stephen Birarda
6c204b682d
include trait bytes written in over budget calculation
2018-08-21 10:32:05 -07:00
Stephen Birarda
fc5b72e9b9
cleanup sent trait versions for removed avatars on mixer
2018-08-21 10:31:15 -07:00
Stephen Birarda
f9230eca7f
don't send override avatar URL if override matches
2018-08-21 10:31:15 -07:00
Stephen Birarda
a56e9b0860
allow agent to create and get avatar entities from script
2018-08-21 10:31:15 -07:00
Stephen Birarda
e6b419d283
add instanced traits and migrate avatar entities
2018-08-21 10:31:15 -07:00
Stephen Birarda
ea7c0e923a
make client traits handler a unique ptr in AvatarData
2018-08-21 10:31:15 -07:00
Stephen Birarda
a0df68f32f
move skeleton model URL emit to AvatarData
2018-08-21 10:31:14 -07:00
Stephen Birarda
be7eb57205
handle whitelist avatar URL override via traits
2018-08-21 10:31:14 -07:00
Stephen Birarda
a80d19a44a
remove skeleton from identity, handle in clients
2018-08-21 10:31:14 -07:00
Stephen Birarda
26a1f03314
send traits in bulk to avatar mixer client
2018-08-21 10:31:14 -07:00
Stephen Birarda
f23a036f4a
add node local ID retreivable from NodeData
2018-08-21 10:31:14 -07:00
Stephen Birarda
ac835650b7
add skeleton trait sending to Agent, queuing in AvatarMixer
2018-08-21 10:31:14 -07:00
Stephen Birarda
486557e28a
initial trait packet sending on skeleton URL change
2018-08-21 10:31:14 -07:00
John Conklin II
7f3bbaf3f8
Merge pull request #13755 from SimonWalton-HiFi/script-agent-destroy-engine
...
Fix for ScriptEngines not being released upon AC shutdown
2018-08-16 13:16:04 -07:00
John Conklin II
bbf6162361
Merge pull request #13632 from Atlante45/fix/udt-rtt
...
Fix potential reliable connection lockup.
2018-08-16 13:15:23 -07:00
John Conklin II
1edf1b4337
Merge pull request #13555 from SamGondelman/destroy
...
Trying to fix dependency shutdown
2018-08-16 13:14:58 -07:00
Stephen Birarda
91365aeff4
make avatar kill packets from mixer reliable
2018-08-10 11:31:17 -07:00
John Conklin II
19ad9c52da
Merge pull request #13773 from birarda/bug/last-broadcast-guard
...
check for null node data pointers in handleIgnoreRequestPacket
2018-08-09 14:53:53 -07:00
Stephen Birarda
e686df6fb9
Merge pull request #13720 from Atlante45/feat/test-tool
...
Stack tester changes
2018-08-08 13:40:05 -04:00
Simon Walton
df9c65e410
Move back RecordingScriptingInterface destruction
2018-08-07 12:08:10 -07:00
Stephen Birarda
c7ce8e5ce0
check node data pointers in handleNodeIgnoreRequestPacket
2018-08-07 11:00:24 -07:00
Sam Gondelman
2edefe3209
Merge branch 'master' into destroy
2018-08-06 09:51:14 -07:00
Simon Walton
59271881ba
Create & destroy ScriptEngines on AC thread but move to main after creation
2018-08-03 17:45:06 -07:00
John Conklin II
243bd5ea69
Merge pull request #13536 from SimonWalton-HiFi/script-engine-thread-agent
...
ScriptsModel instances should be created & destroyed on the same thread (for Agent)
2018-08-03 13:32:11 -07:00
Brad Davis
3c7f1a0c4b
Merge remote-tracking branch 'upstream/master' into destroy
2018-08-02 15:34:19 -07:00
Simon Walton
88fafc7a1f
Merge pull request #13704 from SimonWalton-HiFi/delay-physics
...
Enable physics after ES indicates all nearby entities received
2018-08-01 18:15:00 -07:00
SamGondelman
1ba28de5b6
try to fix nodelist not getting destroyed
2018-08-01 17:52:27 -07:00
Simon Walton
6f1487bbf8
Don't explicitly use data method of shared node pointer
2018-08-01 17:11:26 -07:00
Simon Walton
d7a49ee594
Merge pull request #13622 from SimonWalton-HiFi/ac-monitor-resources
...
Raise POSIX descriptor-limit in AC Monitor if necessary
2018-08-01 17:07:33 -07:00
John Conklin II
fd1a431729
Merge pull request #13689 from ctrlaltdavid/M15244
...
Move scriptable caches' APIs into scripting interfaces
2018-08-01 11:50:13 -07:00
Simon Walton
9d42a6e08f
Change method name per coding standards
2018-08-01 10:37:28 -07:00
Simon Walton
6f61642cb0
Call setFinished() if script engine hasn't started up
2018-07-31 18:10:49 -07:00
Simon Walton
5a92032bdd
ThreadedAssignment::stop no longer deprecated
2018-07-31 16:14:00 -07:00
Simon Walton
ecfba312ef
Merge remote-tracking branch 'upstream/master' into script-engine-thread-agent
2018-07-31 15:54:54 -07:00
Simon Walton
d991dd230f
Remove call to aboutToFinish from AssetServer
2018-07-31 15:39:38 -07:00
Simon Walton
64fc3e1091
ThreadedAssignment calls virtual stop() upon domain disconnect
2018-07-31 15:30:33 -07:00
Simon Walton
a320308eaf
Fix sequence number encoding issue
...
Don't mix QDataStream and readPrimitive. Also fix logic
issues in completion check; move new packet type; don't
reset known sent entities upon initial completion;
other reviewer recommendations.
2018-07-31 13:54:22 -07:00
Simon Walton
8c512ec19b
Send spherical view from Interface rather than creating in ES
2018-07-30 18:03:45 -07:00
Clement
949c7f8c19
Add automated test tool scripting interface
2018-07-30 17:18:32 -07:00
Clement
9e84603ca4
Make proper -v and -h options for interface
2018-07-30 17:18:32 -07:00
John Conklin II
6d7116fad7
Merge pull request #13676 from thoys/fix/api/agent
...
MS15184: Remove deprecated functions in Agent API
2018-07-30 14:48:10 -07:00
Thijs Wenker
92efc1a3b5
style and memory leak fixes
2018-07-30 18:51:19 +02:00
Simon Walton
3d1fe7da9f
Reset known entity-state when leaving initial send state
2018-07-27 18:22:36 -07:00
Howard Stearns
e8e04673a4
Merge pull request #13683 from zfox23/MS17039_dontDeleteDDV
...
Implement MS17039: Don't delete entities during DDV when Metaverse API call returns error
2018-07-27 15:05:05 -07:00
Simon Walton
0cec9a72d6
Implement client-side enable physics once indicated EntityData has arrived
...
Also now use Entity Server Protocol sequence numbers.
2018-07-26 18:10:38 -07:00
David Rowe
baf88ab508
Revise scriptable resource caches' interfaces
2018-07-26 16:12:16 +12:00
Simon Walton
2c06487df0
Move sending of completion packet up to EntityTreeSendThread
...
I hadn't appreciated the continuous nature of the scene
traversal. Looks good now. Also changed some identifier names.
2018-07-25 17:05:05 -07:00
Simon Walton
8f02834447
Set params.stopReason in another place
2018-07-25 14:46:47 -07:00
David Rowe
16e06de9cd
Move scriptable caches into scripting interfaces
...
Removed non-working getResource() API functions.
2018-07-25 22:10:14 +12:00
Simon Walton
2d653db064
Remove #include from header
2018-07-24 17:44:17 -07:00
Simon Walton
187259c838
Raise posix descriptor limit if necessary
2018-07-24 17:44:17 -07:00
Simon Walton
06d1602c0d
Use max of --max & --n for resources; other clean-up
2018-07-24 17:41:13 -07:00
Simon Walton
7181c3ad48
Fix typo in preprocessor symbol
2018-07-24 17:41:13 -07:00
Simon Walton
6098c53d32
Remove #include from header
2018-07-24 17:41:13 -07:00
Simon Walton
0cc96f2be1
Raise posix descriptor limit if necessary
2018-07-24 17:41:13 -07:00
Simon Walton
47e99cdeac
Initial code for AC side of Enabling Physics plan
...
When interface sets query flag send only entities
close to main frustrum origin, until no more available,
then send unreliabe sequence # reliably.
2018-07-24 16:50:37 -07:00
Dante Ruiz
b750a005cf
fix script memory issue
2018-07-24 16:31:12 -07:00
Zach Fox
a0319f1f71
Implement MS17039: Don't delete entities during DDV when Metaverse API call returns error
2018-07-24 15:09:08 -07:00
Thijs Wenker
e2d7431456
move agent scripting interface to its own class to get rid of deprecated API
2018-07-24 16:54:24 +02:00
Clement
0bfe2671dd
Cleanup udt dead code
2018-07-20 18:12:24 -07:00
qliacoombs
db109589f6
Merge pull request #13535 from huffman/fix/asset-server-corrupt-mappings
...
Fix potential map.json corruption in Asset Server
2018-07-17 13:11:43 -06:00
Simon Walton
b60ea1f6a2
Fixes from reviewer
...
Call base version from aboutToFinish(); add comment for
script-engine logic.
2018-07-16 18:25:46 -07:00
Simon Walton
ab4faca2fd
Emit finished() in new AudioMixer::aboutToFinish().
2018-07-13 11:18:28 -07:00
Simon Walton
c1e6221391
Merge branch 'master' into script-engine-thread-agent
2018-07-13 10:06:49 -07:00
Simon Walton
a305a6a534
Emit finished in Agent::aboutToFinish() if script execution hasn't started yet
2018-07-12 16:48:41 -07:00
Simon Walton
2c629e2ec8
Don't destroy ScriptEngines in aboutToFinish()
2018-07-09 17:38:39 -07:00
Simon Walton
1c23fc75a4
Emit finished signal from AC derived classes
...
To avoid Agent destruction-in-use move emit finished from
setFinished to Agent methods. For other ACs emit from
aboutToFinish().
2018-07-09 16:56:54 -07:00
Simon Walton
000423673e
Don't explicitly destroy script engine; emit finished when actually finished
2018-07-09 13:30:44 -07:00
John Conklin II
e6801c303a
Merge pull request #13432 from SimonWalton-HiFi/avatar-identity-request
...
Implement AvatarRequestIdentity and use if interface gets unknown avatar data
2018-07-09 10:07:19 -07:00
Clément Brisset
f2a3907e3d
Merge pull request #13357 from SimonWalton-HiFi/memcheck-fixes
...
Entity Script Server memory leak when taking down EntityTree
2018-07-05 15:30:45 -07:00
Simon Walton
ec67b8ad56
Address reviewer comments
2018-07-03 15:31:34 -07:00
Clément Brisset
ee03670215
Merge pull request #13492 from SimonWalton-HiFi/script-engine-thread
...
ScriptsModel instances should be created & destroyed on the same thread (for ESS)
2018-07-03 13:30:29 -07:00
Ryan Huffman
23a279434c
Fix potential map.json corruption in Asset Server
2018-07-03 10:33:25 -07:00
John Conklin II
3f975cfa84
Merge pull request #13506 from sabrina-shanman/fix-osx-crash-on-exit
...
Fix Mac Crashes On Shutdown
2018-07-02 15:27:26 -07:00
Clement
ba53e7add8
Fix ACs startup crash
2018-06-29 16:29:32 -07:00
Simon Walton
7270ab9078
Create and destroy ScriptModel on its owning thread
...
QFileSystemWatcher, a component, must be destroyed on
the thread that created it.
2018-06-27 16:46:45 -07:00
howard-stearns
698b66313c
guard startDynamicDomainVerification against missing entity
2018-06-25 14:49:33 -07:00
Simon Walton
d638bdd986
First pass at requesting ID for unknown data
...
Keep list of AvatarData that was created from a
data packet without a matching ID. If items get
old enough send an ID request and remove them.
2018-06-20 12:21:39 -07:00
Simon Walton
c8c135a985
Use eachMatchingNode instead of eachNode
2018-06-19 12:01:27 -07:00
Simon Walton
5bf075457c
Add avatar identity request packet
2018-06-19 10:21:30 -07:00
Stephen Birarda
883c758722
Merge pull request #13144 from huffman/fix/remove-entity-server-backups
...
Remove old entity backups and OctreePersistThread refactoring
2018-06-13 15:25:46 -07:00
Stephen Birarda
4142280e2b
Merge pull request #12999 from birarda/bug/avatar-data-max-allowed
...
allow avatar data to use full segment size
2018-06-13 14:00:26 -07:00
Ryan Huffman
c2f08dfdba
Update Octree to atomically persist data
2018-06-13 12:24:09 -07:00
Ryan Huffman
4e230c9e5d
Remove redundant setvbuf and update signal/slot syntax in OctreeServer
2018-06-13 11:23:37 -07:00
Ryan Huffman
38df5d3db5
Merge branch 'master' of github.com:highfidelity/hifi into feat/uncompressed-ktx-in-texmeta
2018-06-11 16:17:56 -07:00
Simon Walton
99a8ecc6db
Break simulation/entity-tree cycle
2018-06-11 13:52:44 -07:00
Zach Fox
688d82b286
Go back to 60%
2018-06-11 13:23:41 -07:00
Simon Walton
e3c8895c89
Take down DependencyManager<AssignmentParentFinder> upon restart
2018-06-08 18:17:03 -07:00
Ryan Huffman
9afc9d19c5
Cleanup comments and process structure in OctreePersistThread
2018-06-08 16:22:11 -07:00
Ryan Huffman
d0af06939f
Update persistInterval to use std::chrono in OctreePersistThread
2018-06-08 16:22:11 -07:00
Ryan Huffman
d476146a56
Move OctreePersistThread off GenericThread and add octree negotiation
2018-06-08 16:22:11 -07:00
Ryan Huffman
2143bae100
Remove unused entity server backups
...
The domain server now handles entity backups so this code is no longer
used.
This also fixes a bug where, if the entity server went down while
writing the persist file, it would leave a lock file behind. When
starting up the next time it would try to recover from the last backup.
Because the entity server no longer gets any backup rules, and the way
it searches for backups, it would end up finding the lock file and
treating it as the most recent backup. This meant that the
models.json.gz file was replaced with an empty file.
2018-06-08 16:17:30 -07:00
Ryan Huffman
faafd26d2a
Add uncompressed KTX files to baked texture output
2018-06-08 11:39:47 -07:00
Zach Fox
76b5dae721
Let's try 20%
2018-06-08 10:19:55 -07:00
Zach Fox
f7de3cf218
Try a value of 1.8
2018-06-07 14:45:33 -07:00
Zach Fox
448a522b70
MS15673: Do some experiments on bubble size
2018-06-07 13:29:33 -07:00
Clement
e096ff91f6
Explicitely manage HTTPManager lifetime
2018-05-24 17:30:32 -07:00
Liv Erickson
de05388ebf
Merge branch 'master' of github.com:highfidelity/hifi into clone-server
2018-05-18 10:42:26 -07:00
David Rowe
2669a39e0f
Deprecate Agent API items that shouldn't be exposed in the API
2018-05-18 07:32:25 +12:00
David Rowe
fdeb0e3305
Avatar API JSDoc stubs
2018-05-16 09:20:54 +12:00
David Rowe
e255fa3863
JSDoc typos
2018-05-11 21:08:57 +12:00
David Rowe
42d0620fd1
EntityViewer API JSDoc stubs
2018-05-11 20:56:00 +12:00
David Rowe
3891ebe703
Agent API JSDoc stubs
2018-05-11 20:20:07 +12:00
David Back
3241c18271
first pass cloneables WIP
2018-05-09 18:10:40 -07:00
Clement
da9fb9c751
Fix non self-sufficient headers
2018-05-04 16:26:41 -07:00
Stephen Birarda
ec354620db
Merge pull request #12956 from huffman/feat/client-texture-selection-baking
...
Add support for client texture selection
2018-05-04 16:14:43 -07:00
Clement
487a63025f
Fix warning
2018-05-03 18:19:52 -07:00
Clement
d87cd2af6e
Update avatar query names
2018-05-03 18:19:30 -07:00
Clement
27c471ee97
Move all wire frustums to conical frustums
2018-05-03 18:19:29 -07:00
Clement
67c119cd2e
Send Entity Query via conical frustums
2018-05-03 18:19:29 -07:00
Clement
e400eb4ed2
Rename ViewFrustum packets to AvatarQuery
2018-05-03 18:19:29 -07:00
Clement
d774dc2060
WIP Only use conical frustums on the server
2018-05-03 18:19:29 -07:00
Stephen Birarda
21396287a4
Merge pull request #12990 from Atlante45/fix/spec-cam-av
...
Add support for multifrustum avatar queries
2018-05-03 18:18:51 -07:00
Stephen Birarda
31d5633b4a
Merge pull request #12930 from Atlante45/fix/spec-cam
...
Add support for multifrustum entity queries
2018-05-03 18:13:51 -07:00
Clement
7fe16f82fb
Move variables to Agent.cpp
2018-05-03 17:08:17 -07:00
Clement
83a438eb22
Set avatar view packets on their own timer
2018-05-01 18:10:55 -07:00
Clement
a283d28686
Send number of frustums in packet
2018-05-01 18:03:21 -07:00
Clement
ddde0228ba
Fix AC not sending Avatar Mixer a frustum
2018-05-01 18:03:21 -07:00
Clement
538f24162f
Define ViewFrustums type alias
2018-05-01 18:03:21 -07:00
Clement
1b2b70b769
Send both frustums to Avatar Mixer
2018-05-01 18:03:21 -07:00
Clement
21213e81f4
Multiview support for priority queue
2018-05-01 18:03:21 -07:00
Clement
d47ddbd6e4
CR
2018-05-01 18:02:29 -07:00
Clement
69a7f2d4aa
Fix entity server crash
2018-05-01 18:02:29 -07:00
Clement
3862a02cee
DRY traversal scan callbacks
2018-05-01 18:02:29 -07:00
Clement
7f67547fae
Update HeadlessViewer to not always send a frustum
2018-05-01 18:02:29 -07:00
Clement
49fad3d868
EntityServer traversal aware of all ViewFrustums
2018-05-01 18:02:29 -07:00
Ryan Huffman
12d4cf12cf
Bump model and texture baking versions in AssetServer
2018-05-01 14:11:50 -07:00
Oren Hurvitz
a226790295
Eliminated warnings in gcc
...
Note that the call to encodeNode() in FBXWriter.cpp can never be reached, so it's safe to remove it.
2018-04-30 15:05:27 +03:00
Stephen Birarda
956cc411d5
Merge branch 'RC66.1' of github.com:highfidelity/hifi into sixty-six-one-mergeback
2018-04-25 14:33:23 -07:00
Stephen Birarda
f3f29bb661
allow avatar data to use full segment size
2018-04-25 12:15:00 -07:00
Stephen Birarda
6c0177e2bd
use the correct joint count for other avatar last sent
2018-04-25 11:50:53 -07:00
Atlante45
d82333534c
Ensure the tree lock is always taken before the simulation lock
2018-04-24 13:46:05 -07:00
Ken Cooke
ae33205d80
Merge pull request #12944 from humbletim/fix-pal-adjusted-injector-gain
...
Support per-avatar gain adjustment on positional audio streams
2018-04-23 09:22:53 -07:00
humbletim
b86f553550
poke per-avatar gain into per-stream HRTF
2018-04-20 15:36:31 -04:00
Simon Walton
9f9a68188d
Merge remote-tracking branch 'upstream/master' into short-id
2018-04-20 11:10:21 -07:00
Seth Alves
ba43640950
Merge pull request #12785 from birarda/bug/xcode-warnings
...
fix some xcode warnings for unnecessary captured this
2018-04-20 10:30:27 -07:00
humbletim
238f59f229
make positional streams honor user-specified gain overrides
2018-04-20 00:08:25 -04:00
Simon Walton
c964852e45
Another use of NULL_LOCAL_ID
2018-04-18 15:09:00 -07:00
Clement
a8d6a4e0b6
CR
2018-04-18 15:05:49 -07:00
Simon Walton
01c39d4310
Use NULL_LOCAL_ID in more places, as requested by review
2018-04-18 11:53:47 -07:00
Clement
2e8a6e1961
Remove more dead octree code
2018-04-17 18:21:51 -07:00
Stephen Birarda
a0e1d2e54e
Merge pull request #12764 from SimonWalton-HiFi/bakedassettype-enum
...
Make BakedAssetType a scoped enum
2018-04-17 11:50:14 -07:00
Seth Alves
7f285c5f90
Merge pull request #12571 from Atlante45/fix/es-concurrent-traversal
...
Fix unprotected tree traversals
2018-04-14 14:33:25 -07:00
Ken Cooke
a5feb07bdf
Merge pull request #12863 from kencooke/audio-gainadj-stereo
...
Support per-avatar gain adjustment on stereo input streams
2018-04-13 06:52:54 -07:00
Ken Cooke
2593d224c5
CR feedback
2018-04-12 13:24:31 -07:00
Ken Cooke
537e54e9d4
Optimize the mixing loops
2018-04-11 10:54:31 -07:00
Ken Cooke
48ddfb09c2
Support per-avatar gain adjustment on stereo input streams
2018-04-11 10:08:33 -07:00
Andrew Meadows
a0f3e3a031
add simulation ownership expiry
2018-04-11 09:40:32 -07:00
Clément Brisset
c62a701a2d
Merge pull request #12838 from highfidelity/RC66
...
RC66 merge back to master
2018-04-09 13:17:12 -07:00
Clement
6e7f8a2ef6
Fix value collision for baking version
2018-04-06 17:24:16 -07:00
John Conklin II
9e21bab67e
Merge pull request #12748 from AndrewMeadows/untangle-003
...
cleanup around simulation-ownership
2018-04-05 10:58:45 -07:00
Atlante45
895023ca4b
Fix unprotected tree traversals
2018-04-04 14:54:21 -07:00
Stephen Birarda
3a8c9de4fb
fix some xcode warnings for unnecessary captured this
2018-04-04 10:38:32 -07:00
Andrew Meadows
70d6aa99e8
more 'const uint64_t&' purges
2018-04-03 21:55:31 -07:00
Clément Brisset
3d4490f3fd
Merge pull request #12737 from highfidelity/RC66
...
RC66 mergeback
2018-04-03 15:39:16 -07:00
Simon Walton
d1cb4aab89
Make BakedAssetType a scoped enum
2018-04-02 17:55:23 -07:00
Simon Walton
efb1fdbc0d
Local IDs - add an explicit null value, use it for replicated packets
2018-03-30 18:29:26 -07:00
Simon Walton
734b48eee0
Local IDs - Reviewer's suggested improvements
2018-03-30 17:27:52 -07:00
Zach Fox
59fb448698
Remove duplicate function
2018-03-30 10:28:40 -07:00
Zach Fox
bd6dbadade
No magic numbers
2018-03-30 10:18:03 -07:00
Clement
cb07fc47dc
Fix ESS remote method calls for connect only users
2018-03-28 14:01:03 -07:00
Simon Walton
bed4033554
Local node IDs now working correctly
...
Move typedef to single location; fixes for replicated packets
(probably still not correct); reserve zero as local ID;
pass domain server's local ID in domain server list;
other tweaks.
2018-03-27 18:18:14 -07:00
Simon Walton
d3464378b7
Short local source IDs - checkpoint
...
DS assigns 16-bit IDs as well as UUIDs; ACs track mappings;
nodes use short IDs in packets. Initial setup works; then
fails prob. due to DS UUID.
2018-03-27 13:46:58 -07:00
Zach Fox
00c70278c8
Add getCreatedAgo()
2018-03-26 15:03:10 -07:00
Zach Fox
bf48ecda6d
Fix cert location for content sets
2018-03-26 14:48:05 -07:00
Ryan Huffman
e90c051744
Merge pull request #11872 from huffman/feat/version-wo
...
Add asset server baking versioning
2018-03-23 08:27:37 -07:00
Ryan Huffman
d2ae30f8e0
Disable support for baking scripts in the Asset Server
2018-03-22 16:22:59 -07:00
Ryan Huffman
655636c44f
Remove redundant if block in AssetServer.cpp
2018-03-21 12:16:12 -07:00
John Conklin II
3937f43fa5
Merge pull request #12648 from SimonWalton-HiFi/serversExist-crash
...
EntityScriptServer should wait for script engine to complete for deleting itself
2018-03-21 11:19:50 -07:00
Simon Walton
4fd6eb559b
Remove dangling packet sender pointer before it's invalid.
2018-03-14 17:06:38 -07:00
Stephen Birarda
0c0ce1d6b8
Merge pull request #12508 from SimonWalton-HiFi/server-script
...
Stop server-script URLs when deleted from entity properties (case 11244)
2018-03-14 14:01:01 -07:00
Simon Walton
d67044f220
EntityScriptServer should wait for script engine to finish when stopping
...
Script engine will still running and using EntityEditPacketSender,
which is owned by EntityScriptServer, which was destroyed.
https://highfidelity.manuscript.com/f/cases/11071/
2018-03-14 13:32:48 -07:00
Ryan Huffman
0a00227ce3
Update message for failed bakes inside of AssetServer.cpp
2018-03-13 15:03:20 -07:00
Ryan Huffman
6ed89fb9cc
Cleanup asset server versioning changes
2018-03-13 14:52:35 -07:00
Ryan Huffman
df8a25cbdc
Add warning to AssetServer.h to update bake version in .cpp
2018-03-13 14:52:35 -07:00
Ryan Huffman
9a7497c9ec
Update AssetServer to check for baking disabled on startup
2018-03-13 14:52:35 -07:00
Ryan Huffman
0003a32701
Fix AssetServer not detecting missing bakeVersion
2018-03-13 14:52:35 -07:00
Ryan Huffman
e38ef699cc
Remove BakingVersion.h
2018-03-13 14:52:35 -07:00
Ryan Huffman
8a89e8f9fb
Remove BakedTypeInfo
2018-03-13 14:52:35 -07:00
Ryan Huffman
6f3155db32
Fix existing baked assets not being recognized
2018-03-13 14:52:35 -07:00
Ryan Huffman
6ac8cdecd1
Re-enable js baking
2018-03-13 14:52:35 -07:00
Ryan Huffman
091dae730b
Add versioning to Asset Server
2018-03-13 14:52:35 -07:00
Simon Walton
30206ff33e
Call killed-avatar slot directly rather than by signal
...
Rename nodeKilled slot to handleKilledAvatar since the node
isn't killed in this case and call directly from
handleKillAvatarPacket().
2018-03-06 12:28:55 -08:00
Simon Walton
8fb3015ec8
Fix for missing avatar on second replay
...
Fixes a logic problem in the handshake request handling; deals with
KillAvatar from the Agent by removing the node-linked data, not
the actual Node; tweaks some of the network debug output.
2018-03-05 16:51:05 -08:00
Ken Cooke
328b5a1e8b
Merge pull request #12479 from kencooke/audio-nearfield-hrtf
...
Near-field HRTF
2018-02-28 07:44:24 -08:00
Stephen Birarda
9cc348ef27
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
2018-02-27 09:59:37 -08:00
Simon Walton
051d4c0d35
Merge branch 'master' into server-script
2018-02-27 09:57:58 -08:00
Ken Cooke
cc7b9a254b
Optimized compute of distance attenuation
2018-02-27 09:02:03 -08:00
Ken Cooke
bb2f3cac2c
Use named constant for the onset of near-field corrections (1 meter)
2018-02-27 08:51:55 -08:00
Ryan Huffman
44f3b00a92
Merge pull request #12509 from huffman/feat/content-settings
...
Fix entity data not being stored when Id and DataVersion are null
2018-02-27 08:43:44 -08:00
Ryan Huffman
88931d9c95
Fix entity data not being stored when Id and DataVersion are null
2018-02-27 08:33:20 -08:00
John Conklin II
25144f0fec
Merge pull request #12456 from Atlante45/fix/min-spec-crash
...
Fix crash when passing --checkMinSpec flag
2018-02-26 17:35:46 -08:00
Stephen Birarda
2af0e5fc2b
Merge pull request #12501 from huffman/feat/content-settings
...
Code review changes
2018-02-26 17:58:08 -07:00
Ryan Huffman
ec210e1750
Move OctreeUtils to OctreeDataUtils
2018-02-26 16:51:42 -08:00
Ryan Huffman
3fa538d42d
Add RawEntityData subclass
2018-02-26 16:32:09 -08:00
Atlante45
3592fcf3c2
CR
2018-02-26 14:52:27 -08:00
Ryan Huffman
dbfbee5406
CR
2018-02-26 13:53:20 -08:00
Simon Walton
e81fba22ed
EntityServer should update a previously matched entity.
...
EntityServer currently keeps a per-Node set of entities that matched
the JSON filter. This commit will send an update for an entity that
no longer matches then remove it from the set.
https://highfidelity.fogbugz.com/f/cases/11244/
2018-02-26 13:43:35 -08:00
Ryan Huffman
c368c84f59
Make BakeAssetTask::abort thread-safe
2018-02-23 11:06:11 -08:00
Atlante45
c106fee659
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration
2018-02-22 19:45:43 -08:00
Stephen Birarda
a0f7d4dd34
use const auto & where possible as per CR comments
2018-02-22 18:08:08 -08:00
Atlante45
277e556b48
Create a standard function to init Hifi Apps
2018-02-22 17:06:09 -08:00
Stephen Birarda
d9d2b26519
delete baked content for unmapped files on AS startup
2018-02-22 16:55:35 -08:00
Atlante45
80c0f2a21e
Fix crash when passing --checkMinSpec flag
...
That flag caused a DLL to be loaded before Application was
instanced.
This triggers a Qt bug inside Q_COREAPP_STARTUP_FUNC that causes
the previous registration pointing the startup function in
the main executable to be overridden with the address of the
function in the DLL (Since they both link the same static
library)
This leads to the correct function running in the wrong address
space (the DLLs), hence not initializing some global variables
correctly.
2018-02-22 16:29:38 -08:00
Ken Cooke
f25b8e8df0
Refactor distance attenuation for near-field HRTF.
...
Adds near-field attenuation from 0.125m to 1m, calibrated to 0dB at 1m. Overload will trigger dynamic range compression at the peak-limiter.
2018-02-22 16:05:01 -08:00
Simon Walton
619901caa0
Move up main #include for other AudioMixer*
...
Having #include first will make more robust for MOC compile problems.
Also fixes previous commit to use <> form and correct case.
See Case 12527.
2018-02-21 11:12:09 -08:00
Simon Walton
16ffcc7fe2
Add #include of Forward.h to AudioMixer.h
...
This makes the compile by Qt MOC less dependent on order of processing.
See Manuscript case 12527.
2018-02-21 09:48:15 -08:00
Atlante45
f6e9d2c6dd
Fix race condition in Asset Server
2018-02-15 18:16:30 -08:00
Atlante45
4482f9c83c
Queue all requests until the AS is fully setup
2018-02-15 11:27:21 -08:00
Ryan Huffman
0bbbff95cd
Fix replacement octree data not working
2018-02-15 10:09:21 -08:00
Ryan Huffman
2a667fcd60
Cleanup entity -> ds persist
2018-02-15 10:09:21 -08:00
Ryan Huffman
1b7b4eee50
Fix entity data not being gzipped when adding id+version
2018-02-15 10:09:20 -08:00
Ryan Huffman
cb9327e030
Add entity file sync and domain content backups
2018-02-15 10:09:20 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals
2018-02-14 17:33:01 -08:00
Stephen Birarda
6ba2f4b279
Merge pull request #12286 from Atlante45/feat/asset-server-backup
...
Add asset server backups capabilities to the Domain Server
2018-02-13 17:40:11 -07:00
SamGondelman
4500ed17e7
merge from master
2018-02-13 13:58:39 -08:00
John Conklin II
d084e58f48
Merge pull request #12328 from Atlante45/fix/misc-bugs
...
Misc bug fixes
2018-02-12 14:31:38 -08:00
SamGondelman
9e8aa1898c
warnings, load material from URL, shapeID -> parentMaterialID
2018-02-12 12:50:09 -08:00
Atlante45
46449256ce
CR
2018-02-09 11:38:46 -08:00
Atlante45
87f77b6257
Asset Server Backup
2018-02-09 11:32:42 -08:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets
...
Remove some unneeded Qt dependencies
2018-02-05 15:32:54 -08:00
Atlante45
8ebb3e52d8
Misc bug fixes
2018-02-02 13:10:49 -08:00
Stephen Birarda
ffd10b79bf
refuse to handle positional audio streams with NaN position
2018-02-02 11:21:50 -08:00
David Rowe
280264d7ed
Add location.domainID as a synonym for location.domainId
...
And deprecate location.domainId.
2018-01-30 20:46:27 +13:00
MiladNazeri
9baf02b7a1
Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request
...
Leopoly_Phase1_003_Asset-Request
2018-01-29 11:40:41 -08:00
Brad Davis
0781d8eaf0
Remove some unneeded Qt dependencies
2018-01-28 22:18:24 -08:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar
...
Fix for avatars with crooked spine/head when exiting HMD mode
2018-01-22 11:50:44 -08:00
Anthony J. Thibault
cd4d9255bd
Added defaultPoseFlags to avatar protocol
...
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation. Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
2018-01-19 15:34:27 -08:00
humbletim
dfb1619dc6
CR feedback; using namespace AssetUtils => inline AssetUtils::
2018-01-18 21:49:53 -05:00
humbletim
49bb9420cc
Merge branch 'master' into Leopoly_Phase1_003_Asset-Request
2018-01-17 17:11:33 -05:00
Stephen Birarda
c90cdf52b4
remove unecessary parenting of Agent script engine
2018-01-17 11:02:56 -08:00
Sam Gateau
d4571bd86a
Merge pull request #12181 from humbletim/rename-model-graphics
...
Rename libraries/model -> libraries/graphics
2018-01-16 18:12:25 -08:00
Clément Brisset
858221d4db
Merge pull request #12118 from Atlante45/fix/avatar-mixer-crash
...
Fix concurrent access crash in avatar mixer
2018-01-16 11:07:59 -08:00
humbletim
08ccda9cfc
rename libraries/model(src/model) -> libraries/graphics(src/graphics)
2018-01-16 12:44:44 -05:00
Ken Cooke
7c5085bd24
Handle stereo changes while active, by restarting the codec on both ends
2018-01-11 16:10:50 -08:00
Ken Cooke
6a2e3cc272
Enable stereo codecs for AvatarAudioStream
2018-01-10 15:14:18 -08:00
Ken Cooke
660032d8fb
Fix bug in how emitAudioPacket() determines mono/stereo.
...
Compressed bytes were counted as if audio samples.
2018-01-10 06:54:27 -08:00
Ken Cooke
c363a9281e
Fix another bug in audio-mixer audio packet parsing.
...
For SilentAudioFrame packets, numSamples was being read as channel flag.
2018-01-09 16:54:14 -08:00
Ken Cooke
ad2a031060
Fix bug in audio-mixer audio packet parsing.
...
Codec string was being read as channel flag.
2018-01-09 16:44:48 -08:00
Atlante45
776a2e8373
Fix concurrent access crash in avatar mixer
2018-01-09 11:24:34 -08:00
humbletim
a863aec4a0
put existing AssetUtils functions in namespace per CR feedback
2018-01-03 04:01:43 -05:00
Atlante45
28f164d7e5
Remove legacy jurisdiction code
2017-12-29 12:46:52 -08:00
Stephen Birarda
e3cbfd92a0
Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back
2017-12-22 15:48:04 -08:00
Stephen Birarda
18993a8f72
fix for AvatarData retrieval from SortableAvatar in PriorityQueue
2017-12-21 15:11:34 -08:00
Thijs Wenker
1bfb62bd7f
list assignment types in assignment-client help
2017-12-18 15:32:32 -08:00
Stephen Birarda
139976d8bb
allow staging METAVERSE_SERVER_URL to be toggled by env
2017-12-12 16:22:08 -08:00
