Commit Graph

4623 Commits

Author SHA1 Message Date
Evil Factory
46166f124a add firesource 2021-11-13 12:16:08 -03:00
Evil Factory
f723e29277 prettier error messages 2021-11-12 13:50:25 -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
f9302b36b5 forgot to include compatibility Lua lib in 6cda213 2021-11-11 12:23:32 -03:00
Evil Factory
02d0c14d00 fix localhost not working for direct connection 2021-11-11 12:12:34 -03:00
Evil Factory
50618c252d Merge pull request #26 from zhu-rengong/master
modified way to patch, can realize params map for compatibility, and try to hook Item in lua.
2021-11-11 11:18:53 -03:00
zhurengong
d1188a1ea5 do a hook call inside callback param of HookMethod, and wrapped __params 2021-11-11 22:13:35 +08:00
zhurengong
9635db22fc Merge remote-tracking branch 'public/master' 2021-11-10 21:12:31 +08:00
zhurengong
6b1aca8efa modified way to patch, can realize params map for compatibility, and try to hook Item in lua. 2021-11-10 21:07:19 +08:00
Evil Factory
6cda213441 move LuaPlayer and CreateVector to a separate compatibility lua file 2021-11-09 17:58:48 -03:00
Evil Factory
5c6450c6a2 provide instance in Hook Method 2021-11-08 22:27:27 -03:00
Evil Factory
192c103597 fix compile error 2021-11-08 20:04:18 -03:00
Evil Factory
89942fb8f5 added -ip so you are able to specify which ip to bind the server 2021-11-08 19:57:13 -03:00
Evil Factory
50427390f2 calling lua function inside an async function causes lots of issues (probably caused by the fact that it runs on a separate thread?), solved by creating a queue of functions to be called on the main thread 2021-11-08 14:29:07 -03:00
Evil Factory
07b6bcc32b Merge pull request #25 from zhu-rengong/improve
move the registration of generic types to the lua side in a simple way
2021-11-08 13:52:08 -03:00
zhurengong
83d1c29917 move the registration of generic types to the lua side in a simple way 2021-11-09 00:16:48 +08:00
Evil Factory
9d45eb7402 fix http requests somehow causing weird errors when an exception happened inside it, for some reason i used registertype instead of createstatic, fix that, and added override disconnect character time 2021-11-08 12:12:35 -03:00
Evil Factory
72fff4ab73 replace harmony with a custom one that includes __params, some fixes in the lua setup and hook method is now actually useful 2021-11-05 20:40:50 -03:00
Evil Factory
a8a0c96d57 move most of the registration code to Lua, include harmony, add useful perf methods to Time and a more useful(but still useless) error handling in the hook call 2021-11-04 11:30:36 -03: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
a49decc2ed Merge remote-tracking branch 'origin/dev'
# Conflicts:
#	Barotrauma/BarotraumaShared/SharedSource/Characters/AI/HumanAIController.cs
2021-11-02 13:20:18 +02:00
Joonas Rikkonen
3a35dbfe6c Release v0.15.13.0 2021-11-02 13:19:59 +02:00
Markus Isberg
935fc112bc Unstable 0.15.13.0 2021-11-01 23:58:29 +09:00
Evil Factory
f4d6c686fe forgot to remove the member of the descriptor in case it already existed 2021-10-31 12:32:16 -03:00
Evil Factory
77bd8c3720 makes NetLobbyScreen.subs accessible by Lua and clean a bit the types 2021-10-31 11:52:20 -03:00
Markus Isberg
a43b540d4b Unstable 0.15.13.0 2021-10-29 21:57:18 +09:00
Evil Factory
5712589ef3 add new talents 2021-10-28 18:55:18 -03:00
Evil Factory
07f7aba4f2 Merge pull request #22 from Regalis11/master
this is weird
2021-10-27 14:42:42 -03:00
Evil Factory
5d0dc39ee3 Merge branch 'Regalis11-master' 2021-10-27 14:42:06 -03: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
Evil Factory
1f0f411d4f fix merge conflicts, warning: still broken 2021-10-27 13:35:10 -03:00
Joonas Rikkonen
a52a23f8c2 Merge remote-tracking branch 'origin/dev' 2021-10-27 18:57:12 +03:00
Joonas Rikkonen
4b5b6c5ee6 Updated libraries 2021-10-27 18:57:04 +03:00
Joonas Rikkonen
234fb6bc06 Release v0.15.12.0 2021-10-27 18:50:57 +03:00
Markus Isberg
1718dbc1c1 Unstable 0.15.12.0 2021-10-27 22:07:32 +09:00
Markus Isberg
6b84ff65e3 Unstable 0.15.11.0 + the last 2 unstables I missed 2021-10-27 03:22:53 +09:00
Evil Factory
9d80de3ecf fix problem with wifi link to chat 2021-10-25 11:49:22 -03:00
Evil Factory
9c07262480 added new hooks to docs 2021-10-16 18:07:16 -03:00
Evil Factory
3a7355ed21 add many item and inventory related hooks 2021-10-16 17:58:24 -03:00
Markus Isberg
fc2f7b76da Unstable 0.1500.8.0 2021-10-16 10:32:38 +09:00
Evil Factory
fad7d2d001 dropdown thing 2021-10-14 10:17:28 -03:00
Markus Isberg
de917c5d74 Unstable 0.1500.7.0 (No edition) 2021-10-14 00:42:06 +09:00
Evil Factory
8ba8b7c0c6 traitor hooks 2021-10-11 12:36:22 -03:00
Evil Factory
65f956741f i should probably use reflection to automatically register all components 2021-10-09 10:45:50 -03:00
Markus Isberg
c8943ef9c4 Unstable 0.1500.6.0 (1984 edition) 2021-10-09 00:22:02 +09:00
Evil Factory
0000605186 for some reason you can move files but not delete, so i might aswell send them directly into the trash bin 🚊 2021-10-08 11:29:15 -03:00
Evil Factory
8500525722 client side lua install command thing 2021-10-08 10:44:24 -03:00