vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
Files
89b91d1c3efc715e15933473693afa73417f3e92
LuaCsForBarotraumaEP/Barotrauma/BarotraumaClient
T
History
Regalis11 89b91d1c3e Merge branch 'master' into dev 
# Conflicts:
#	Barotrauma/BarotraumaClient/ClientSource/Characters/Character.cs
#	Barotrauma/BarotraumaClient/ClientSource/DebugConsole.cs
#	Barotrauma/BarotraumaClient/ClientSource/GUI/Store.cs
#	Barotrauma/BarotraumaClient/ClientSource/Items/Inventory.cs
#	Barotrauma/BarotraumaClient/ClientSource/Items/Item.cs
#	Barotrauma/BarotraumaClient/ClientSource/Map/Map/Radiation.cs
#	Barotrauma/BarotraumaClient/ClientSource/Map/MapEntity.cs
#	Barotrauma/BarotraumaClient/ClientSource/Networking/ServerList/ServerInfo.cs
#	Barotrauma/BarotraumaClient/ClientSource/Screens/MainMenuScreen/MainMenuScreen.cs
#	Barotrauma/BarotraumaClient/ClientSource/Screens/ServerListScreen/ServerListScreen.cs
#	Barotrauma/BarotraumaClient/ClientSource/Screens/SubEditorScreen.cs
#	Barotrauma/BarotraumaClient/ClientSource/Serialization/SerializableEntityEditor.cs
#	Barotrauma/BarotraumaClient/ClientSource/Settings/SettingsMenu.cs
#	Barotrauma/BarotraumaClient/ClientSource/SpamServerFilter.cs
#	Barotrauma/BarotraumaClient/ClientSource/Sprite/Sprite.cs
#	Barotrauma/BarotraumaClient/ClientSource/Steam/Lobby.cs
#	Barotrauma/BarotraumaClient/LinuxClient.csproj
#	Barotrauma/BarotraumaClient/MacClient.csproj
#	Barotrauma/BarotraumaClient/WindowsClient.csproj
#	Barotrauma/BarotraumaServer/LinuxServer.csproj
#	Barotrauma/BarotraumaServer/MacServer.csproj
#	Barotrauma/BarotraumaServer/ServerSource/GameMain.cs
#	Barotrauma/BarotraumaServer/ServerSource/Steam/SteamManager.cs
#	Barotrauma/BarotraumaServer/ServerSource/Traitors/TraitorManager.cs
#	Barotrauma/BarotraumaServer/WindowsServer.csproj
#	Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/HumanoidAnimController.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/Ragdoll.cs
#	Barotrauma/BarotraumaShared/SharedSource/DebugConsole.cs
#	Barotrauma/BarotraumaShared/SharedSource/Extensions/IEnumerableExtensions.cs
#	Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/CampaignMode.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/ItemPrefab.cs
#	Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs
#	Barotrauma/BarotraumaShared/SharedSource/Serialization/Editable/ConditionallyEditable.cs
#	Barotrauma/BarotraumaShared/SharedSource/Settings/GameSettings.cs
#	Barotrauma/BarotraumaShared/changelog.txt
#	Libraries/BarotraumaLibs/BarotraumaCore/Utils/MathUtils.cs
2024-04-24 17:38:13 +03:00
..
ClientSource
Merge branch 'master' into dev
2024-04-24 17:38:13 +03:00
Content/Effects
Unstable 1.1.14.0
2023-10-02 16:43:54 +03:00
Properties
Unstable 0.17.0.0
2022-02-26 02:43:01 +09:00
Shaders
Unstable 1.1.14.0
2023-10-02 16:43:54 +03:00
x64
Faction Test 100.9.0.0
2022-12-05 19:55:31 +02:00
app.manifest
Unstable v0.15.17.0 (Hex is out of town edition)
2021-12-03 13:31:10 -03:00
freetype6.dll
38f1ddb...178a853: v0.8.9.1, removed content folder
2019-03-18 20:39:27 +02:00
GlobalSuppressions.cs
Faction Test v1.0.1.0
2023-02-16 15:01:28 +02:00
Icon.bmp
(2a4bd39c2) Merge branch 'dev' into human-ai
2019-05-16 05:33:13 +03:00
libfreetype6.dylib
Unstable v0.1300.0.1
2021-03-05 17:00:56 +02:00
libfreetype6.so
Unstable 0.1300.0.7
2021-04-07 15:24:22 +03:00
libopenal.1.dylib
(9ecea1c75) Flipped some hatches in tutorial outpost to update selection range
2019-05-20 20:34:24 +03:00
libopenal.so.1
c2e39cc...409d4d9
2019-03-18 22:50:18 +02:00
libSDL2-2.0.0.dylib
Unstable v0.1300.0.1
2021-03-05 17:00:56 +02:00
libSDL2-2.0.so.0
Faction Test 100.9.0.0
2022-12-05 19:55:31 +02:00
libwebm_mem_playback_x64.dylib
Unstable v0.1300.0.1
2021-03-05 17:00:56 +02:00
LinuxClient.csproj
v1.3.0.4
2024-04-16 18:00:23 +03:00
MacClient.csproj
v1.3.0.4
2024-04-16 18:00:23 +03:00
soft_oal_x64.dll
v0.12.0.2
2021-02-10 17:08:21 +02:00
webm_mem_playback_x64.dll
(61d00a474) v0.9.7.1
2020-03-04 13:04:10 +01:00
webm_mem_playback_x64.so
Unstable 0.1300.0.7
2021-04-07 15:24:22 +03:00
WindowsClient.csproj
v1.3.0.4
2024-04-16 18:00:23 +03:00