Commit Graph

5473 Commits

Author SHA1 Message Date
EvilFactory
fa6b6a590f Merge branch 'master' of https://github.com/Regalis11/Barotrauma 2023-03-13 14:43:39 -03:00
Regalis11
2d9c153101 v1.0.7.0 Full Release 2023-03-13 19:35:34 +02:00
EvilFactory
05c325ac02 Fixed broken Option<T> conversion 2023-03-13 14:31:53 -03:00
EvilFactory
5a3f9ebc80 1.0 Merge fixes 2023-03-13 13:37:24 -03:00
EvilFactory
4a229c6427 Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop 2023-03-13 13:32:14 -03:00
Regalis11
b5ecaf0194 Merge branch 'faction-test'
# Conflicts:
#	Barotrauma/BarotraumaClient/ClientSource/Characters/Character.cs
#	Barotrauma/BarotraumaClient/ClientSource/Characters/CharacterHUD.cs
#	Barotrauma/BarotraumaClient/ClientSource/Characters/Health/CharacterHealth.cs
#	Barotrauma/BarotraumaClient/ClientSource/Characters/Limb.cs
#	Barotrauma/BarotraumaClient/ClientSource/DebugConsole.cs
#	Barotrauma/BarotraumaClient/ClientSource/GUI/HUDLayoutSettings.cs
#	Barotrauma/BarotraumaClient/ClientSource/GUI/MedicalClinicUI.cs
#	Barotrauma/BarotraumaClient/ClientSource/GUI/Store.cs
#	Barotrauma/BarotraumaClient/ClientSource/GUI/TalentMenu.cs
#	Barotrauma/BarotraumaClient/ClientSource/GUI/UpgradeStore.cs
#	Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/CampaignMode.cs
#	Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/SinglePlayerCampaign.cs
#	Barotrauma/BarotraumaClient/ClientSource/Items/Components/ItemContainer.cs
#	Barotrauma/BarotraumaClient/ClientSource/Items/Components/LightComponent.cs
#	Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Fabricator.cs
#	Barotrauma/BarotraumaClient/ClientSource/Items/ItemPrefab.cs
#	Barotrauma/BarotraumaClient/ClientSource/Map/Map/Map.cs
#	Barotrauma/BarotraumaClient/ClientSource/Networking/GameClient.cs
#	Barotrauma/BarotraumaClient/ClientSource/Networking/ServerSettings.cs
#	Barotrauma/BarotraumaClient/ClientSource/Particles/ParticleEmitter.cs
#	Barotrauma/BarotraumaClient/ClientSource/Screens/CampaignSetupUI/CampaignSetupUI.cs
#	Barotrauma/BarotraumaClient/ClientSource/Screens/CharacterEditor/CharacterEditorScreen.cs
#	Barotrauma/BarotraumaClient/ClientSource/Screens/MainMenuScreen.cs
#	Barotrauma/BarotraumaClient/ClientSource/Screens/NetLobbyScreen.cs
#	Barotrauma/BarotraumaClient/ClientSource/Screens/SubEditorScreen.cs
#	Barotrauma/BarotraumaClient/ClientSource/Screens/TestScreen.cs
#	Barotrauma/BarotraumaClient/LinuxClient.csproj
#	Barotrauma/BarotraumaClient/MacClient.csproj
#	Barotrauma/BarotraumaClient/WindowsClient.csproj
#	Barotrauma/BarotraumaServer/LinuxServer.csproj
#	Barotrauma/BarotraumaServer/MacServer.csproj
#	Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs
#	Barotrauma/BarotraumaServer/ServerSource/GameSession/GameModes/MultiPlayerCampaign.cs
#	Barotrauma/BarotraumaServer/ServerSource/GameSession/MedicalClinic.cs
#	Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs
#	Barotrauma/BarotraumaServer/WindowsServer.csproj
#	Barotrauma/BarotraumaShared/SharedSource/Characters/AI/EnemyAIController.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/AI/HumanAIController.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveFightIntruders.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveFindSafety.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveGoTo.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveRescueAll.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/HumanoidAnimController.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/Attack.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/CharacterInfo.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/Health/Afflictions/Affliction.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/Health/Afflictions/AfflictionPrefab.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/Health/CharacterHealth.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/Limb.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/Abilities/AbilityConditionals/AbilityConditionData/AbilityConditionMission.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/Abilities/AbilityConditionals/AbilityConditionDataless/AbilityConditionHasPermanentStat.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/Abilities/CustomAbilities/CharacterAbilityUnlockApprenticeshipTalentTree.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/TalentTree.cs
#	Barotrauma/BarotraumaShared/SharedSource/DebugConsole.cs
#	Barotrauma/BarotraumaShared/SharedSource/Enums.cs
#	Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/NPCChangeTeamAction.cs
#	Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/SpawnAction.cs
#	Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/TagAction.cs
#	Barotrauma/BarotraumaShared/SharedSource/Events/EventManager.cs
#	Barotrauma/BarotraumaShared/SharedSource/Events/Missions/AbandonedOutpostMission.cs
#	Barotrauma/BarotraumaShared/SharedSource/Events/Missions/Mission.cs
#	Barotrauma/BarotraumaShared/SharedSource/Extensions/IEnumerableExtensions.cs
#	Barotrauma/BarotraumaShared/SharedSource/GameSession/Data/Factions.cs
#	Barotrauma/BarotraumaShared/SharedSource/GameSession/Data/Reputation.cs
#	Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/CampaignMode.cs
#	Barotrauma/BarotraumaShared/SharedSource/GameSession/GameSession.cs
#	Barotrauma/BarotraumaShared/SharedSource/GameSession/MedicalClinic.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/Components/Door.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Holdable.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/RangedWeapon.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Throwable.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemContainer.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/Components/Projectile.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/Components/Repairable.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/LightComponent.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/Components/Turret.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/ItemPrefab.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/RelatedItem.cs
#	Barotrauma/BarotraumaShared/SharedSource/Map/Explosion.cs
#	Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Biome.cs
#	Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Level.cs
#	Barotrauma/BarotraumaShared/SharedSource/Map/Levels/LevelData.cs
#	Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs
#	Barotrauma/BarotraumaShared/SharedSource/Map/Map/LocationType.cs
#	Barotrauma/BarotraumaShared/SharedSource/Map/Map/Map.cs
#	Barotrauma/BarotraumaShared/SharedSource/Map/Outposts/OutpostGenerationParams.cs
#	Barotrauma/BarotraumaShared/SharedSource/Map/Outposts/OutpostGenerator.cs
#	Barotrauma/BarotraumaShared/SharedSource/Map/PriceInfo.cs
#	Barotrauma/BarotraumaShared/SharedSource/Map/Submarine.cs
#	Barotrauma/BarotraumaShared/SharedSource/Map/SubmarineInfo.cs
#	Barotrauma/BarotraumaShared/SharedSource/Prefabs/PrefabCollection.cs
#	Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs
#	Barotrauma/BarotraumaShared/SharedSource/Steam/Workshop.cs
#	Barotrauma/BarotraumaShared/SharedSource/SteamAchievementManager.cs
#	Barotrauma/BarotraumaShared/SharedSource/Upgrades/UpgradePrefab.cs
#	Barotrauma/BarotraumaShared/SharedSource/Utils/Option/Option.cs
#	Barotrauma/BarotraumaShared/SharedSource/Utils/SerializableDateTime.cs
#	Barotrauma/BarotraumaShared/changelog.txt
#	Barotrauma/BarotraumaTest/SerializableDateTimeTests.cs
2023-03-13 18:26:50 +02:00
Regalis11
bf73ddb6c3 v1.0.7.0 (Full Release) 2023-03-13 10:30:37 +02:00
EvilFactory
3fe775405c Added more util functions 2023-03-08 17:22:49 -03:00
EvilFactory
ef28f7c5fe Initialize with the quickstart command (fixes #121) 2023-03-06 20:08:26 -03:00
EvilFactory
e8ca69dede Added debug symbols to the installer script 2023-03-06 12:59:55 -03:00
EvilFactory
4e0f2e1a49 Added Timer.NextFrame 2023-03-04 14:23:16 -03:00
EvilFactory
d9789b8438 Added some missing math functions from lua 2023-03-03 17:26:53 -03:00
EvilFactory
27cde50c08 Register particles, added Game.Paused which is always false to server-side, and exposed ParticleManager 2023-02-28 16:57:17 -03:00
EvilFactory
fb374a9ae3 Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop 2023-02-21 13:27:49 -03:00
EvilFactory
8d745e3e6b Improved docs: Enums are now automatically generated 2023-02-16 13:51:35 -03:00
Regalis11
2c5a7923b0 Faction Test v1.0.1.0 2023-02-16 15:01:28 +02:00
EvilFactory
757998a1e4 Improved docs: Members now have their realm set automatically and server-only members are now also included 2023-02-15 19:24:54 -03:00
EvilFactory
4e4e6c5465 Registered and added Event types to default lib 2023-02-15 16:55:10 -03:00
EvilFactory
5003d0beb7 Fixed GetComponentString not working with custom types and registered/added missing types 2023-02-13 17:06:48 -03:00
IDEKENTERPRISES
aaffb54141 Added saving http response content as a byte array to a file. (#124) 2023-02-09 17:48:01 -03:00
EvilFactory
3e1c0ca9af Added ability to include custom headers when sending http requests and made use of the new HttpClient 2023-02-07 17:08:37 -03:00
EvilFactory
4b206ada3e Fixed formatting again on the lua docs generator project 2023-02-06 18:11:17 -03:00
EvilFactory
cd5901f73a Removed leftover dead code from generate_docs.sh 2023-02-06 12:15:41 -03:00
EvilFactory
14c45e4900 Fixed indentation on docs generator project 2023-02-04 14:20:55 -03:00
Joonas Rikkonen
48c66adcdc Update bug_report.yml 2023-02-02 21:41:39 +02:00
EvilFactory
81970b3fd4 Added MissionType, Mission, MissionPrefab to default lib 2023-02-01 16:35:16 -03:00
EvilFactory
1023ca2062 Fixed NRE when calling receive in singleplayer (should just do nothing) 2023-02-01 15:27:11 -03:00
EvilFactory
ca9f232aaf Added Remove method for removing net messages 2023-01-31 19:16:38 -03:00
EvilFactory
0c00839458 Only send network debug when verbose logging is enabled and enabled compatibility for the net lobby screen 2023-01-31 14:47:27 -03:00
EvilFactory
bd5811eb48 Fixed failing tests 2023-01-31 13:37:33 -03:00
EvilFactory
a8171bd4e4 Fixed compile errors 2023-01-31 13:26:59 -03:00
EvilFactory
d60efb17cd Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop 2023-01-31 13:17:15 -03:00
Regalis11
cf9ecd35b3 Build 0.21.6.0 (1.0 pre-patch) 2023-01-31 18:08:26 +02:00
Joonas Rikkonen
e1c04bc31d Update bug_report.yml 2023-01-31 17:05:59 +02:00
EvilFactory
ba543aef2c Improved Networking
Network messages are now sent through a 2-byte Id to minimize overhead of using strings.
2023-01-29 13:21:19 -03:00
EvilFactory
5d552d9dd8 Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop 2023-01-29 13:17:30 -03:00
Joonas Rikkonen
7ef0cb140d Update bug_report.yml 2023-01-27 17:27:44 +02:00
Joonas Rikkonen
283721f160 Update bug_report.yml 2023-01-25 20:09:24 +02:00
EvilFactory
c0f7b1548a Merge https://github.com/Regalis11/Barotrauma into develop 2023-01-22 13:16:41 -03:00
EvilFactory
3ee27aaec3 Added AITarget to default lib 2023-01-21 19:10:01 -03:00
Joonas Rikkonen
4c40e43d15 Update bug_report.yml 2023-01-20 18:18:14 +02:00
EvilFactory
8fcf0f7c8c Removed CsScriptRunner since its useless 2023-01-18 22:53:55 -03:00
Joonas Rikkonen
e8cb38a094 Update bug_report.yml 2023-01-18 18:13:16 +02:00
EvilFactory
2073cdf5e5 Fixed timer crash once for all - yes it was a race condition 2023-01-17 14:17:43 -03:00
EvilFactory
17d125e6d5 Fixed RoundStarted returning incorrect values in sub editor 2023-01-17 13:16:30 -03:00
EvilFactory
a8da4f9cd1 Removed unused variable and added exception in case timer is null 2023-01-16 17:52:31 -03:00
EvilFactory
070d2c11a7 Fixed incorrect logger compatibility 2023-01-13 21:15:56 -03:00
EvilFactory
c9ea347789 Merge remote-tracking branch 'upstream/master' into develop 2023-01-13 20:36:45 -03:00
Joonas Rikkonen
b7201c497d Update bug_report.yml 2023-01-13 17:26:16 +02:00
EvilFactory
c6f67ec01e Update intro.md 2023-01-12 23:39:14 -03:00