32 Commits

Author SHA1 Message Date
NotAlwaysTrue
59bc21973a OBT/1.2.0(Spring Update)
Sync with Upstream
2026-04-25 13:25:41 +08:00
eero
eb8c59efb5 Add .vscode/settings.json to .gitignore
Exclude VS Code workspace settings from version control to prevent local configuration from being committed.
2025-12-22 00:02:02 +08:00
EvilFactory
103871a4e9 Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop 2025-04-10 10:37:09 -03:00
Markus Isberg
02e54090e8 Updated .gitignore 2025-04-07 17:14:07 +03:00
Markus Isberg
c53cac841a New .gitignore additions 2025-03-19 16:08:50 +02:00
EvilFactory
eabbf92c16 Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop 2024-03-28 15:14:18 -03:00
Joonas Rikkonen
0ab5180b7d Update .gitignore (so the Debugging folder doesn't get ignored) 2024-03-28 20:12:53 +02:00
peelz
1bb7843811 Move docs to luacs-docs/{lua,cs,landing-page}
luacs-docs/cs also has a proper http server for testing locally
2022-08-10 05:36:16 -04:00
peelz
5d11c28db6 Clean up lua docs scripts
- ldoc is now a git submodule
- ldoc can be installed using scripts/install.{sh,ps1}
- lua docs can be build using scripts/build.{sh,ps1}
- all lua docs-related files now reside inside of the docs folder
2022-08-10 05:33:26 -04:00
Oiltanker
f5b2268150 doxygen cs documentation 2022-05-06 22:35:47 +03:00
Evil Factory
aaf049697e Merge branch 'Regalis11:master' into master 2021-12-02 12:32:44 -03:00
Juan Pablo Arce
cdfd975174 Ignore GameAnalyticsKeys.cs regardless of the directory it's in 2021-12-01 14:17:53 -03:00
Evil Factory
6f510137d9 Merge branch 'Regalis11:master' into master 2021-11-11 13:08:55 -03:00
Joonas Rikkonen
10e5fd5f3e Added GA key file to gitignore 2021-11-11 17:45:21 +02:00
Evil Factory
2048389896 Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git into Regalis11-master 2021-11-02 11:31:46 -03:00
Joonas Rikkonen
3a35dbfe6c Release v0.15.13.0 2021-11-02 13:19:59 +02:00
Evil Factory
656af7df2f new documentation and some fixes in code 2021-09-12 15:58:59 -03:00
Joonas Rikkonen
c27e2ea5ab v0.14.6.0 2021-06-17 17:58:09 +03:00
Juan Pablo Arce
ebe1ce1427 Unstable v0.10.600.0 2020-10-01 12:19:24 -03:00
Joonas Rikkonen
eeac247a8e (6eeea9b7c) v0.9.10.0.0 2020-06-04 16:41:07 +03:00
Regalis
3c09ebe02f (61d00a474) v0.9.7.1 2020-03-04 13:04:10 +01:00
Joonas Rikkonen
0f63da27b2 (bf212a41f) v0.9.2.0 pre-release test version 2019-07-27 21:06:07 +03:00
Joonas Rikkonen
97f31d0c94 5202af9...3ea33fb 2019-03-18 22:24:07 +02:00
Joonas Rikkonen
6c0679c297 38f1ddb...178a853: v0.8.9.1, removed content folder 2019-03-18 20:39:27 +02:00
juanjp600
2d55d41320 Fixed railgun HUD crash when the first linked item doesn't have an ItemContainer 2017-12-01 09:53:07 -03:00
juanjp600
4d225c65f2 Updated to MonoGame 3.6 + Directory refactor
- Barotrauma's projects are in the Barotrauma directory
- All libraries are in the Libraries directory
- MonoGame is now managed by NuGet, rather than referenced from the installed files (TODO: consider using PCL for easier cross-platform development?)
- NuGet libraries are not included in the repo, as getting the latest versions automatically should be preferred
- Removed Content/effects.mgfx as it didn't seem to be used anywhere
- Removed some references to Subsurface directory
- Renamed Launcher2 to Launcher
2017-06-27 09:52:57 -03:00
Regalis
cd3ecd36e8 Merge branch 'multisub'
Conflicts:
	.gitignore
	Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
	Subsurface/Source/Items/Components/Holdable/RepairTool.cs
	Subsurface_Solution.v12.suo
2016-07-04 17:42:31 +03:00
Regalis
73ff859f33 Added .suo files to gitignore 2016-06-29 17:29:04 +03:00
Regalis
dc7956274c - camera follows the closest sub
- WIP "respawn shuttle"
- submarine size affects its mass
- electricity fixes
2016-06-18 14:46:40 +03:00
Sebastian Broberg
467a99f79d Fixed hatch issue with shadows
Added per segment visibility/collision
2016-03-03 20:18:21 +01:00
Regalis11
95c0d41023 .gitignore update 2015-05-30 15:25:43 +03:00
Regalis
562164af36 improved harpoon gun, misc ui stuff & bugfixes 2015-05-29 16:29:32 +03:00