Regalis11
|
b934dda228
|
v1.0.8.0 (Hotfix)
|
2023-03-16 17:00:21 +02:00 |
|
Regalis11
|
2d9c153101
|
v1.0.7.0 Full Release
|
2023-03-13 19:35:34 +02: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 |
|
Regalis11
|
2c5a7923b0
|
Faction Test v1.0.1.0
|
2023-02-16 15:01:28 +02:00 |
|
Regalis11
|
cf9ecd35b3
|
Build 0.21.6.0 (1.0 pre-patch)
|
2023-01-31 18:08:26 +02:00 |
|
Markus Isberg
|
caa5a2f762
|
Faction Test 100.13.0.0
|
2023-01-11 15:36:23 +02:00 |
|
Regalis11
|
b8fa677148
|
Build 0.20.16.1
|
2022-12-20 17:05:53 +02:00 |
|
Regalis11
|
0a0ec64ad5
|
Merge remote-tracking branch 'origin/dev'
# Conflicts:
# Barotrauma/BarotraumaClient/ClientSource/GUI/TabMenu.cs
# Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/CampaignMode.cs
# Barotrauma/BarotraumaClient/ClientSource/StatusEffects/StatusEffect.cs
# Barotrauma/BarotraumaClient/LinuxClient.csproj
# Barotrauma/BarotraumaClient/MacClient.csproj
# Barotrauma/BarotraumaClient/WindowsClient.csproj
# Barotrauma/BarotraumaServer/LinuxServer.csproj
# Barotrauma/BarotraumaServer/MacServer.csproj
# Barotrauma/BarotraumaServer/ServerSource/GameSession/GameModes/CampaignMode.cs
# Barotrauma/BarotraumaServer/WindowsServer.csproj
# Barotrauma/BarotraumaShared/SharedSource/Map/Map/LocationType.cs
# Barotrauma/BarotraumaShared/SharedSource/Networking/ChildServerRelay.cs
# Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs
|
2022-12-14 17:04:04 +02:00 |
|
Markus Isberg
|
2f7205fb4b
|
Build 0.20.15.0
|
2022-12-14 13:44:15 +02:00 |
|
Markus Isberg
|
6f788fb8b4
|
Build 0.20.12.0
|
2022-12-09 20:08:36 +02:00 |
|
Markus Isberg
|
1650735468
|
Faction Test 100.11.0.0
|
2022-12-09 20:08:17 +02:00 |
|
Markus Isberg
|
e0c3754621
|
Faction Test 100.10.0.0
|
2022-12-07 17:46:02 +02:00 |
|
Markus Isberg
|
a10cc13566
|
Build 0.20.11.0
|
2022-12-07 17:40:58 +02:00 |
|
Markus Isberg
|
f5cd0dbd1c
|
Build 0.20.10.1
|
2022-12-07 06:29:38 +02:00 |
|
Markus Isberg
|
de250b4a64
|
Faction Test 100.9.0.1
|
2022-12-07 06:29:18 +02:00 |
|
Markus Isberg
|
55e1d3560a
|
Faction Test 100.9.0.0
|
2022-12-05 19:55:31 +02:00 |
|
Markus Isberg
|
9d2f160314
|
Build 0.20.10.0
|
2022-12-05 19:48:59 +02:00 |
|
Markus Isberg
|
f7f1ebd979
|
Faction Test 100.8.0.0
|
2022-12-01 22:00:25 +02:00 |
|
Markus Isberg
|
31d2dc658e
|
Build 0.20.9.0
|
2022-12-01 21:59:53 +02:00 |
|
Markus Isberg
|
df805574c4
|
Build 0.20.8.0
|
2022-11-25 19:56:30 +02:00 |
|
Markus Isberg
|
0057f5bfce
|
Faction Test 100.6.0.0
|
2022-11-25 19:55:45 +02:00 |
|
Markus Isberg
|
c44fb0ad3a
|
Faction Test 100.5.0.0
|
2022-11-18 18:32:04 +02:00 |
|
Markus Isberg
|
ecb6d40b4b
|
Build 0.20.7.0
|
2022-11-18 18:13:38 +02:00 |
|
Markus Isberg
|
c772b61fc1
|
Faction Test 100.4.0.0
|
2022-11-14 18:28:28 +02:00 |
|
Markus Isberg
|
8c8fd865c5
|
Build 0.20.6.0
|
2022-11-14 18:14:35 +02:00 |
|
Markus Isberg
|
54712b5dc9
|
Build 0.20.4.0
|
2022-11-11 17:57:23 +02:00 |
|
Markus Isberg
|
edaf4b09fe
|
Build 0.20.0.0
|
2022-10-27 17:54:57 +03:00 |
|
Regalis11
|
6cddd03918
|
v0.19.14.0
|
2022-10-20 17:05:24 +03:00 |
|
Markus Isberg
|
05c7b1f869
|
Build 0.19.11.0
|
2022-10-06 17:13:27 +03:00 |
|
Regalis11
|
91f2f6f4f7
|
v0.19.10.0 (Hoist the Sails update)
|
2022-10-05 18:07:55 +03:00 |
|
Juan Pablo Arce
|
d461d504dc
|
v0.19.9.0
|
2022-09-30 12:08:01 -03:00 |
|
Juan Pablo Arce
|
3ca584f2fc
|
v0.19.8.0
|
2022-09-28 21:30:52 -03:00 |
|
Juan Pablo Arce
|
1fd2a51bbb
|
Unstable v0.19.5.0
|
2022-09-14 12:48:12 -03:00 |
|
Juan Pablo Arce
|
3f2c843247
|
Unstable v0.19.3.0
|
2022-09-02 15:10:56 -03:00 |
|
Juan Pablo Arce
|
1219615d64
|
Unstable v0.19.1.0
|
2022-08-19 13:59:08 -03:00 |
|
Regalis11
|
6b55adcdd9
|
v0.19.0.0 (unstable)
|
2022-07-20 18:47:07 +03:00 |
|
Regalis11
|
4a03ee5ab2
|
v0.18.15.0
|
2022-07-14 16:54:36 +03:00 |
|
Markus Isberg
|
497045de7e
|
Build 0.18.13.0
|
2022-07-01 12:16:36 +09:00 |
|
Markus Isberg
|
8e6c601162
|
Build 0.18.11.0
|
2022-06-16 01:03:48 +09:00 |
|
Markus Isberg
|
856f894203
|
Build 0.18.9.0
|
2022-06-14 04:14:47 +09:00 |
|
Markus Isberg
|
4f5a3bf8b9
|
Build 0.18.7.0
|
2022-06-08 21:52:38 +09:00 |
|
Markus Isberg
|
5a10b444ee
|
Build 0.18.6.0
|
2022-06-04 00:34:02 +09:00 |
|
Markus Isberg
|
6be757a45b
|
Build 0.18.5.0
|
2022-06-03 22:29:04 +09:00 |
|
Markus Isberg
|
64db1a6a44
|
Build 0.18.4.0
|
2022-05-31 23:13:05 +09:00 |
|
Markus Isberg
|
077917fa5d
|
Build 0.18.2.0
|
2022-05-19 23:43:21 +09:00 |
|
Markus Isberg
|
d4f6f4cf88
|
Build 0.18.1.0
|
2022-05-13 22:55:07 +09:00 |
|
Markus Isberg
|
7547a9b78a
|
Build 0.18.0.0
|
2022-05-13 00:55:52 +09:00 |
|
Markus Isberg
|
15d18e6ff6
|
Build 0.17.15.0
|
2022-04-27 23:32:17 +09:00 |
|
Markus Isberg
|
6e38444fc4
|
Build 0.17.14.0
|
2022-04-27 07:44:37 +09:00 |
|