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

3105 commits

Author SHA1 Message Date
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