Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git into Regalis11-master

This commit is contained in:
Evil Factory
2021-12-15 14:45:31 -03:00
388 changed files with 12646 additions and 8136 deletions
@@ -78,6 +78,7 @@
<Character file="Content/Characters/Crawler/Crawler.xml" />
<Character file="Content/Characters/Crawlerhusk/Crawlerhusk.xml" />
<Character file="Content/Characters/Endworm/Endworm.xml" />
<Character file="Content/Characters/Variants/Doomworm.xml" />
<Character file="Content/Characters/Fractalguardian/Fractalguardian.xml" />
<Character file="Content/Characters/Fractalguardian2/Fractalguardian2.xml" />
<Character file="Content/Characters/Swarmfeeder/Swarmfeeder.xml" />
@@ -134,6 +135,7 @@
<Submarine file="Submarines/Kastrull.sub" />
<Submarine file="Submarines/KastrullDrone.sub" />
<Submarine file="Submarines/Orca.sub" />
<Submarine file="Submarines/Orca2.sub" />
<Submarine file="Submarines/Remora.sub" />
<Submarine file="Submarines/RemoraDrone.sub" />
<Submarine file="Submarines/Selkie.sub" />
@@ -204,7 +206,8 @@
<LevelObjectPrefabs file="Content/Map/Biomes/Common/CommonLevelObjects.xml" />
<Particles file="Content/Particles/ParticlePrefabs.xml" />
<Decals file="Content/Particles/DecalPrefabs.xml" />
<RandomEvents file="Content/randomevents.xml" />
<RandomEvents file="Content/randomevents_lineardifficulty.xml" />
<RandomEvents file="Content/randomevents_campaign.xml" />
<RandomEvents file="Content/OutpostEvents.xml" />
<EventManagerSettings file="Content/EventManagerSettings.xml" />
<LocationTypes file="Content/Map/locationTypes.xml" />