Joonas Rikkonen e3ca616fff (869ac975f) Merge branch 'master' into dev

2019-06-12 16:43:56 +03:00

..

Levels

(869ac975f) Merge branch 'master' into dev

2019-06-12 16:43:56 +03:00

Lights

(ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-16 17:12:09 +03:00

Map

(57c46943d) Quick fix watchman graphics (not quite right yet, but better). Re-enable the variant 2.

2019-05-20 21:00:11 +03:00

Explosion.cs

38f1ddb...178a853: v0.8.9.1, removed content folder

2019-03-18 20:39:27 +02:00

FireSource.cs

38f1ddb...178a853: v0.8.9.1, removed content folder

2019-03-18 20:39:27 +02:00

Gap.cs

(42d13c09f) Merge remote-tracking branch 'origin/tutorial-rework' into dev

2019-04-25 18:07:37 +03:00

Hull.cs

(af16ecdfa) Merge branch 'dev' into human-ai

2019-05-16 05:14:00 +03:00

ItemAssemblyPrefab.cs

(869ac975f) Merge branch 'master' into dev

2019-06-12 16:43:56 +03:00

LinkedSubmarine.cs

(38d8117f7) Added: More routing of TextManager.Get().Replace -> TextManager.GetWithVariable(s), missing workshop-related localization tags to englishvanilla

2019-06-04 15:38:12 +03:00

MapEntity.cs

(869ac975f) Merge branch 'master' into dev

2019-06-12 16:43:56 +03:00

MapEntityPrefab.cs

(1762f02b3) Merge branch 'dev' into human-ai

2019-05-16 05:08:22 +03:00

Structure.cs

(81d7f4c1c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-18 17:44:13 +03:00

StructurePrefab.cs

(1762f02b3) Merge branch 'dev' into human-ai

2019-05-16 05:08:22 +03:00

Submarine.cs

(0c86b4b28) Revert "Don't reset the los if there is no client (single player). Fixes los resetting between game sessions (less tedious debugging)."

2019-06-04 16:02:25 +03:00

SubmarineBody.cs

(1762f02b3) Merge branch 'dev' into human-ai

2019-05-16 05:08:22 +03:00

WayPoint.cs

(869ac975f) Merge branch 'master' into dev

2019-06-12 16:43:56 +03:00