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
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
