Commit Graph

54 Commits

Author SHA1 Message Date
Evil Factory f52617deab The great event move 2026-02-20 18:45:41 -03:00
EvilFactory 103871a4e9 Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop 2025-04-10 10:37:09 -03:00
Markus Isberg a4a3427e4e Unstable 1.8.4.0 2025-03-12 12:56:27 +00:00
EvilFactory 6da26ffa93 Merge remote-tracking branch 'upstream/master' into develop 2024-12-11 10:44:53 -03:00
Regalis11 f6349b2175 v1.7.7.0 (Winter Update 2024) 2024-12-11 13:26:13 +02:00
EvilFactory e163f7ed73 Merge remote-tracking branch 'upstream/master' into develop 2024-06-18 12:19:13 -03:00
Regalis11 230d1b6e78 v1.5.7.0 (Summer Update) 2024-06-18 16:50:02 +03:00
EvilFactory 9838cc59ee Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop 2023-10-19 12:18:30 -03:00
Markus Isberg cf8f0de659 Unstable 1.1.14.0 2023-10-02 16:43:54 +03:00
EvilFactory a318e2a0c4 Fixed compile error 2023-06-15 12:32:26 -03:00
EvilFactory 15daa64f66 Merge https://github.com/Regalis11/Barotrauma into develop 2023-06-15 12:13:50 -03:00
itchyOwl 83de72e3d2 v1.0.20.1 (summer patch) 2023-06-15 16:46:54 +03:00
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
Evil Factory 7a09711296 Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git 2022-06-15 13:26:49 -03:00
Markus Isberg 7547a9b78a Build 0.18.0.0 2022-05-13 00:55:52 +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 ccf5600ad1 Merge branch 'dev' of https://github.com/Regalis11/Barotrauma.git into unstable-tests 2022-04-08 12:52:28 -03:00
Markus Isberg 3974067915 Unstable 0.17.0.0 2022-02-26 02:43:01 +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 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
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 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
Evil Factory 9d80de3ecf fix problem with wifi link to chat 2021-10-25 11:49:22 -03:00
Evil Factory e4b3743bdb fix wifi components not working correctly 2021-09-28 17:26:53 -03:00
Evil Factory b07e5d9b0b refactor hooks with new LuaResult 2021-09-21 17:11:49 -03:00
Evil Factory e24797dd05 refactor: no more dynvalues or userdatas 2021-08-29 00:16:33 -03:00
Evil Factory 83360b3b7e revert wificomponent 2021-08-25 13:31:16 -03:00
Evil Factory 5ffe372908 test 2021-08-25 13:17:10 -03:00
Evil Factory a2cb256aa6 plenty of new things 2021-08-15 17:17:49 -03:00
Markus Isberg 47707c824a Unstable 0.1400.7.0 (Coronavirus edition) 2021-07-23 21:01:17 +03:00
Evil Factory 52648d1a0e Update WifiComponent.cs 2021-06-28 22:40:21 -03:00
Evil Factory 823af95742 Update WifiComponent.cs 2021-06-17 12:33:58 -03:00
Markus Isberg 92f0264af2 Unstable 0.1400.0.0 2021-05-11 15:47:47 +03:00
Evil Factory 9dd746b92b wifi fix 2021-04-30 11:28:34 -03:00
Evil Factory 250163e1f5 wifi wiring 2021-04-26 23:46:58 -03:00
Markus Isberg 96b2184811 Unstable 0.1300.0.5 2021-04-01 16:09:18 +03:00
Markus Isberg 874616027b Unstable v0.1300.0.2 2021-03-12 15:57:04 +02:00
Joonas Rikkonen 24cbef485a Unstable v0.1300.0.0 (February 19th 2021) 2021-02-25 13:44:23 +02:00
Juan Pablo Arce 0002ad2c50 v0.10.5.1 2020-09-22 11:31:56 -03:00
Joonas Rikkonen 4978af3d60 (965c31410) v0.10.4.0 2020-07-30 13:00:09 +03:00