Commit Graph

93 Commits

Author SHA1 Message Date
EvilFactory
d60efb17cd Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop 2023-01-31 13:17:15 -03:00
Regalis11
cf9ecd35b3 Build 0.21.6.0 (1.0 pre-patch) 2023-01-31 18:08:26 +02:00
EvilFactory
90c3cef977 Merge remote-tracking branch 'upstream/dev' into develop 2022-12-09 17:33:44 -03:00
Markus Isberg
54712b5dc9 Build 0.20.4.0 2022-11-11 17:57:23 +02:00
EvilFactory
77c63541eb Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into unstable 2022-09-29 12:13:55 -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
Evil Factory
c5860d13d5 Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git 2022-07-14 12:25:44 -03:00
Regalis11
4a03ee5ab2 v0.18.15.0 2022-07-14 16:54:36 +03:00
Evil Factory
7a09711296 Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git 2022-06-15 13:26:49 -03:00
Markus Isberg
4f5a3bf8b9 Build 0.18.7.0 2022-06-08 21:52:38 +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
7547a9b78a Build 0.18.0.0 2022-05-13 00:55:52 +09:00
Evil Factory
099bd87167 Merge branch 'dev' of https://github.com/Regalis11/Barotrauma.git into unstable-tests 2022-04-19 12:03:29 -03:00
Markus Isberg
d9a05400e0 Build 0.17.11.0 2022-04-19 23:52:59 +09:00
Evil Factory
b7395bedea Refactor and fix #56 2022-04-15 19:08:27 -03:00
Oiltanker
3eba20ecb7 new hook call method + function to delegate conversion 2022-04-15 21:29:12 +03:00
Oiltanker
5d06df437e hook merge + hook wrappers 2022-04-15 21:28:22 +03:00
Oiltanker
1e6ac68e86 initial cs-lua merge work 2022-04-15 21:25:58 +03:00
Evil Factory
0cf4edbecf Merge branch 'dev' of https://github.com/Regalis11/Barotrauma.git into unstable-tests 2022-04-11 15:58:36 -03:00
Markus Isberg
72328c29cb Unstable 0.17.9.0 2022-04-12 03:39:02 +09:00
Evil Factory
b37fd8d9c9 Fixing stuff part 1 2022-04-08 16:08:59 -03:00
Evil Factory
ccf5600ad1 Merge branch 'dev' of https://github.com/Regalis11/Barotrauma.git into unstable-tests 2022-04-08 12:52:28 -03:00
Markus Isberg
c1b8e5a341 Unstable 0.17.4.0 2022-03-30 00:08:09 +09:00
Evil Factory
61b8c132eb fix signalReceived hook not working correctly 2022-03-24 13:33:01 -03:00
Markus Isberg
cefac171f5 Unstable 0.17.2.0 2022-03-18 04:20:02 +09:00
Markus Isberg
6d410cc1b7 Unstable 0.17.1.0 2022-03-17 01:25:04 +09:00
Evil Factory
acfec0986e Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git 2022-02-25 14:52:18 -03:00
Markus Isberg
3974067915 Unstable 0.17.0.0 2022-02-26 02:43:01 +09:00
Markus Isberg
a83f375681 Hotfix 0.16.7.0 2022-02-26 02:16:41 +09:00
Evil Factory
6340304ae4 Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git 2022-02-24 14:30:39 -03:00
Markus Isberg
102e089aa6 Unstable 0.16.6.1 2022-02-24 00:42:03 +09:00
Markus Isberg
2190fe08ef Unstable 0.16.3.0 2022-02-10 02:52:08 +09:00
Markus Isberg
6814a11520 Unstable 0.16.2.0 2022-02-02 00:55:02 +09:00
Markus Isberg
b259af5911 Unstable 0.16.1.0 2022-01-27 00:30:32 +09:00
Markus Isberg
7d6421a548 Unstable 0.16.0.0 2022-01-14 01:28:24 +09:00
Evil Factory
bb1631a21c Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git into Regalis11-master 2021-12-15 14:45:31 -03:00
Markus Isberg
7d43cb1e91 0.15.21.0 2021-12-16 01:05:43 +09:00
Juan Pablo Arce
617d9ede88 Unstable v0.15.17.0 (Hex is out of town edition) 2021-12-03 13:31:10 -03:00
Markus Isberg
80f39cd2a3 Unstable 0.15.15.0 (and the one before it I forgor) 2021-11-18 21:34:30 +09: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
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
16e90bea61 what the fuck 2021-10-27 13:47:14 -03:00
Joonas Rikkonen
234fb6bc06 Release v0.15.12.0 2021-10-27 18:50:57 +03:00