1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-10 00:43:27 +02:00
Commit Graph

2356 Commits

Author SHA1 Message Date
Gerkiz
497fc5f224
Merge pull request #62 from ComfyFactory/new_module
new module - game pause
2021-05-19 19:52:34 +02:00
Gerkiz
d3d85ad720 don't do anything if we're debugging 2021-05-19 19:51:38 +02:00
Gerkiz
4ee808e6f3 new module - game pause
this module pauses the game whenever the last player leaves the game, ensuring that rcon does not progress the map.
2021-05-19 19:49:57 +02:00
Gerkiz
fad556abb6
Merge pull request #61 from ComfyFactory/fish-defender-v2
fish defender v2
2021-05-18 23:29:23 +02:00
Gerkiz
54a777deb3 fish defender v2
fix that players could build entities beyond the lightning wall
2021-05-18 23:26:53 +02:00
Gerkiz
1639ac1dc7
Merge pull request #60 from ComfyFactory/session_data_fix
fix broken session time
2021-05-18 21:14:14 +02:00
Gerkiz
376c101484 fix local variable shadowing 2021-05-18 21:13:08 +02:00
Gerkiz
89223f5dbd fix broken session time 2021-05-18 21:11:28 +02:00
Gerkiz
2d7f6ddacf
Merge pull request #59 from ComfyFactory/mtn_v3_fixes
desync fix to mtn fortress
2021-05-18 00:21:24 +02:00
Gerkiz
df75d37a4a desync fix to mtn fortress 2021-05-18 00:20:15 +02:00
Gerkiz
6785aaa9ec
Merge pull request #58 from ComfyFactory/mtn_v3_changes
mor changes to mtn fortress
2021-05-16 14:58:12 +02:00
Gerkiz
fd58a2b4fc mor changes to mtn fortress 2021-05-16 14:57:42 +02:00
Gerkiz
11084fba25
Merge pull request #57 from ComfyFactory/changes_to_mtn
more changes to mtn fortress
2021-05-16 14:44:46 +02:00
Gerkiz
67d53c5b40
Merge branch 'develop' into changes_to_mtn 2021-05-16 14:43:41 +02:00
Gerkiz
de4ff3b2e1 more changes to mtn fortress 2021-05-16 14:42:15 +02:00
Gerkiz
feb402ea02
Merge pull request #56 from ComfyFactory/changes_to_mtn
minor changes to mtn fortress
2021-05-16 13:54:19 +02:00
Gerkiz
049f1162af minor changes to mtn fortress 2021-05-16 13:48:50 +02:00
Gerkiz
c9bff24fad
Merge pull request #55 from ComfyFactory/conditionals_removals
removal of conditionals and fixes
2021-05-15 16:03:21 +02:00
Gerkiz
01762f6f81 removal of conditionals and fixes 2021-05-15 16:01:07 +02:00
MewMew
ba9124291c
Merge pull request #54 from ComfyFactory/journey
Remove offline players to shrink save file.
Delete chunks slowly during the world selection phase.
Randomize daytime of created worlds.
Artillery that sometimes shoots.
2021-05-13 11:28:41 +02:00
MewMew
1b36ee8388
Merge branch 'develop' into journey 2021-05-13 11:27:26 +02:00
MewMew
6dd88c505d Update
Remove offline players to shrink save file.
Delete chunks slowly during the world selection phase.
Randomize daytime of created worlds.
Artillery that sometimes shoots.
2021-05-13 11:25:27 +02:00
Gerkiz
37ebfb1e64
Merge pull request #53 from ComfyFactory/mtn_v3_and_inventory_fixes
various tweaks
2021-05-12 20:53:52 +02:00
Gerkiz
5b8c1a2fee various tweaks 2021-05-12 20:52:29 +02:00
MewMew
e0e7d039fc
Merge pull request #52 from ComfyFactory/journey
Journey
2021-05-11 19:41:45 +02:00
MewMew
463cea090d Update
Make entities in the ship indestructible.
Add msg after capsule drops completed.
Restrict capsule drop radius.
2021-05-11 19:30:07 +02:00
MewMew
8f6319b88e Merge branch 'develop' into journey 2021-05-09 19:46:13 +02:00
MewMew
700581325c
Merge pull request #51 from ComfyFactory/journey
small fix
2021-05-09 19:45:23 +02:00
MewMew
dcc85230df
Merge branch 'develop' into journey 2021-05-09 19:44:08 +02:00
MewMew
65bdc58d07 small fix 2021-05-09 19:26:14 +02:00
MewMew
87783eeed1
Merge pull request #50 from ComfyFactory/journey
Journey
2021-05-09 19:25:31 +02:00
MewMew
ae256c42c9 custom teleporter 2021-05-09 19:09:48 +02:00
MewMew
ad8a76047b Merge branch 'develop' into journey 2021-05-09 19:05:03 +02:00
Gerkiz
dc9899298d
Merge pull request #49 from ComfyFactory/various_fixes
mountain fortress and admin panel fixes
2021-05-09 17:12:29 +02:00
Gerkiz
45638522a7 mountain fortress and admin panel fixes 2021-05-09 17:11:18 +02:00
MewMew
0ccbe23c71
Merge pull request #47 from ComfyFactory/journey
New Map
2021-05-09 15:49:32 +02:00
MewMew
33935dd3dd New Map 2021-05-09 15:47:39 +02:00
Gerkiz
b59ac64d97
Merge pull request #46 from ComfyFactory/new_map
new map - pigeotto
2021-05-08 16:16:03 +02:00
Gerkiz
6621d854e2 new map - pigeotto 2021-05-08 15:12:33 +02:00
Gerkiz
a0cb458f3d
Merge pull request #45 from ComfyFactory/mtn_v3
Mtn - remove lights inside icw
2021-05-08 11:35:17 +02:00
Gerkiz
617d99eac1 Mtn - remove lights inside icw 2021-05-08 11:34:13 +02:00
Gerkiz
504d5ded97
Merge pull request #44 from ComfyFactory/poll_fix_and_removal_of_task_functions
Fix gui config when clicking poll and remove unused functions
2021-05-08 02:04:56 +02:00
Gerkiz
1644b024cf Fix gui config when clicking poll and remove unused functions 2021-05-08 02:03:38 +02:00
Gerkiz
a2463bbbfd
Merge pull request #43 from ComfyFactory/territorial_control
Fix Territorial Control
2021-05-07 01:47:30 +02:00
Gerkiz
6d9aa6645a Fix Territorial Control 2021-05-07 01:46:27 +02:00
Gerkiz
249246ddba
Merge pull request #42 from ComfyFactory/remove_ups_heavy_functions
Removal of global variables and removed laggy functions
2021-05-07 01:39:41 +02:00
Gerkiz
6add8a3db5 make luacheck happy 2021-05-07 01:38:45 +02:00
Gerkiz
a94fcc98af Removal of global variables and removed laggy functions 2021-05-07 01:36:10 +02:00
Gerkiz
a5c5f5d183
Merge pull request #41 from ComfyFactory/function_validation
Validate functions and log player messages.
2021-05-07 01:20:50 +02:00
Gerkiz
64e588128e Validate functions and log player messages. 2021-05-07 01:19:38 +02:00