Commit Graph

10 Commits

Author SHA1 Message Date
Evil Factory bae2390eb1 Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git into Regalis11-master 2021-10-27 14:41:47 -03:00
Evil Factory 8ef6ec90ca Revert "what the fuck"
This reverts commit 16e90bea61.

Revert "fix merge conflicts, warning: still broken"

This reverts commit 1f0f411d4f.
2021-10-27 13:59:19 -03:00
Evil Factory 1f0f411d4f fix merge conflicts, warning: still broken 2021-10-27 13:35:10 -03:00
Joonas Rikkonen 234fb6bc06 Release v0.15.12.0 2021-10-27 18:50:57 +03:00
jimmyl 67dd27f4fe made changes as suggested by evilfactory 2021-08-29 20:40:07 +02:00
jimmyl 63ef6c82cb characterdeath with killer and killing affliction
why this wasnt already a feature i do not know
2021-08-29 20:03:37 +02:00
Evil Factory 933b6dcb8f fix killedbytraitor and message icon 2021-08-06 19:26:16 -03:00
Juan Pablo Arce 0002ad2c50 v0.10.5.1 2020-09-22 11:31:56 -03:00
Joonas Rikkonen ac37a3b0e4 (f0d812055) v0.9.9.0 2020-04-23 19:19:37 +03:00
Regalis 3c09ebe02f (61d00a474) v0.9.7.1 2020-03-04 13:04:10 +01:00