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

1523 Commits

Author SHA1 Message Date
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
5b8c1a2fee various tweaks 2021-05-12 20:52:29 +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
65bdc58d07 small fix 2021-05-09 19:26:14 +02:00
MewMew
ae256c42c9 custom teleporter 2021-05-09 19:09:48 +02:00
Gerkiz
45638522a7 mountain fortress and admin panel fixes 2021-05-09 17:11:18 +02:00
MewMew
33935dd3dd New Map 2021-05-09 15:47:39 +02:00
Gerkiz
6621d854e2 new map - pigeotto 2021-05-08 15:12:33 +02:00
Gerkiz
617d99eac1 Mtn - remove lights inside icw 2021-05-08 11:34:13 +02:00
Gerkiz
1644b024cf Fix gui config when clicking poll and remove unused functions 2021-05-08 02:03:38 +02:00
Gerkiz
6d9aa6645a Fix Territorial Control 2021-05-07 01:46:27 +02:00
Gerkiz
a94fcc98af Removal of global variables and removed laggy functions 2021-05-07 01:36:10 +02:00
Gerkiz
beaca0fc82 minor changes to cave choppy 2021-05-04 19:51:11 +02:00
Gerkiz
2065118aca mountain fortress and rpg updates 2021-05-04 19:51:02 +02:00
Gerkiz
eea184ba1e Mtn Fortress - Make ICW interior more pretty 2021-05-04 18:55:32 +02:00
Gerkiz
99abacb36e push latest minesweeper 2021-05-01 21:22:10 +02:00
Gerkiz
f634ecd69a mtn fortress -fix science bug 2021-04-30 09:11:03 +02:00
Gerkiz
6eb2547e49 make luacheck happy 2021-04-20 15:45:12 +02:00
MewMew
8825d3fe02 NEW MAP 2021-04-19 21:09:00 +02:00
hanakocz
328e292be5 fix for gui crash + poison hidden upgrade spam 2021-04-14 18:31:38 +02:00
Gerkiz
eef1c3f57a planet prison fixes 2021-04-04 13:50:24 +02:00
Gerkiz
80736a24d5 mtn fortress fixes 2021-04-04 13:50:17 +02:00
Gerkiz
164a911f42 make luacheck happy 2021-04-01 22:10:19 +02:00
Gerkiz
fbda17b3aa removed unused functions and fixed so water is not generated near spawn 2021-04-01 22:07:46 +02:00
Gerkiz
cfed977076 planet prison fixes 2021-04-01 22:06:44 +02:00
Gerkiz
61462ddd80 planet_prison fixes 2021-03-30 16:11:39 +02:00
Gerkiz
bbb5b4f5e2 biter_battle_v2 - added some options to config 2021-03-30 16:10:10 +02:00
Gerkiz
9f0c17eac5
Merge branch 'develop' into planet_prison_fixes 2021-03-28 17:00:12 +02:00
Gerkiz
022a8a31ef more minor changes to planet prison 2021-03-28 16:59:14 +02:00
Gerkiz
3475bc8373 planet prison fixes 2021-03-28 16:58:54 +02:00
Gerkiz
eba5098af9
Merge branch 'develop' into junkyard-fix 2021-03-27 14:52:52 +01:00
Gerkiz
7af801b21d remove unused local 2021-03-27 14:49:13 +01:00
Gerkiz
3e0e4841a1 planet_prison minor adjustments 2021-03-27 14:47:47 +01:00
Gerkiz
92688aea74 minor changes to planet prison and mtn fortress 2021-03-27 13:44:32 +01:00
Quadrum
36fa0f3b68 Fixing weird formatting 2021-03-26 17:53:46 +01:00
Quadrum
1a48cbdf60 Update junkyard to 1.1 2021-03-26 17:47:30 +01:00
Gerkiz
5b88f8fdfc removed comfy_panel_tabs from _G and made it use tokens instead 2021-03-25 23:49:57 +01:00
hanakocz
c40f8c97ee plsss 2021-03-25 20:45:04 +01:00
hanakocz
11449f0302 plss 2021-03-25 20:41:22 +01:00
hanakocz
b3423a9c83 pls 2021-03-25 20:37:35 +01:00
hanakocz
35ccbaf258 last luacheck fixes 2021-03-25 20:34:51 +01:00
hanakocz
9f8a7de980 more lua fixes 2021-03-25 03:49:03 +01:00
hanakocz
09bac50da6 fix luacheck in chrono 2021-03-25 03:39:07 +01:00
Gerkiz
52f3976337 luacheck fixes 2021-03-24 20:23:53 +01:00
Gerkiz
e2a33f9f30 luacheck more fixes 2021-03-24 20:14:55 +01:00
Gerkiz
b582b3cb9b luacheck fixes 2021-03-24 19:18:46 +01:00
Gerkiz
3e297f96d1 Merge remote-tracking branch 'origin/develop' into attempt_to_fix_luacheck_warnings 2021-03-24 19:18:30 +01:00
Gerkiz
9d033903fb more luachecks 2021-03-24 18:22:45 +01:00
hanakocz
2c8a585c38 Chronotrain updates, tiny balance changes 2021-03-24 17:19:47 +01:00
Gerkiz
cd8f5105e2 first attempt to make luacheck happy 2021-03-24 16:46:00 +01:00
Gerkiz
dedf2a6857 Log if we're trying to write something that is not in global 2021-03-23 23:11:16 +01:00
Gerkiz
1dce46cbaa planet prison fixes 2021-03-22 22:34:45 +01:00
Gerkiz
876c63fc30 minor change to planet prison 2021-03-22 13:07:30 +01:00
Gerkiz
b3e938ddf9 make functions local where we can 2021-03-22 12:57:58 +01:00
Gerkiz
9e08248edf more tweaks 2021-03-22 12:46:02 +01:00
Gerkiz
04537e426a various tweaks and fixes to prison planet 2021-03-22 12:40:46 +01:00
Gerkiz
3e0bbb2946 more changes 2021-03-22 11:33:54 +01:00
Gerkiz
43beed887a more changes to planet prison 2021-03-22 00:28:03 +01:00
Gerkiz
fe432ae000 more changes to planet prison 2021-03-21 23:56:56 +01:00
Gerkiz
fa8c72fb46 planet prison fix
removed over 60 global functions
removed obsolete entities
2021-03-21 23:31:53 +01:00
Gerkiz
f07c77d421 minor changes
autostash now has priority
send pings to map channels instead of announcements
2021-03-19 16:17:38 +01:00
Gerkiz
3e74bd8165 mtn fortress - minor adjustment 2021-03-17 16:39:56 +01:00
Gerkiz
5cddfdbc59 added ping role support
allows a given role to be pinged by the webpanel
2021-03-17 16:39:03 +01:00
Gerkiz
6e441730d4 mtn fortress - various fixes 2021-03-14 22:49:18 +01:00
Gerkiz
6bc884d12c mtn fortress - fix inf health 2021-03-14 19:47:35 +01:00
Gerkiz
141acc5daa Update to mtn and module
Fixed some functions that were hogging UPS.
2021-03-14 01:02:07 +01:00
Gerkiz
25050bbefe minor tweaks 2021-03-11 21:53:12 +01:00
hanakocz
8d00522194 more fixes 2021-03-09 04:53:24 +01:00
hanakocz
a1b4d675a8 fix 2021-03-09 03:26:36 +01:00
hanakocz
aefd0c095f actually use the new booster 2021-03-09 03:11:14 +01:00
hanakocz
da93894188 dungeons fixes (should work on 1.1+ now) + glob table 2021-03-09 02:58:52 +01:00
Gerkiz
7483ae473c mountain fortress v3 - minor changes 2021-03-03 20:42:44 +01:00
Gerkiz
697e92ef0b fish defender v2 - minor changes 2021-03-03 20:42:16 +01:00
Gerkiz
302e5e1528 fish defender - fix weird time bug 2021-03-02 19:53:42 +01:00
Gerkiz
43e145a94a mtn fortress - more changes 2021-03-01 22:12:36 +01:00
Gerkiz
b7ccdf5a1d mtn fortress - minor changes 2021-03-01 22:04:55 +01:00
Gerkiz
8ada2bbeb9 minor fixes
fixed bug in mtn fortress
enabled soft-resets for fish defender
auto center difficulty gui
2021-02-28 20:55:06 +01:00
hanakocz
718168b9b7 soft reset being timescheduled and globaltabled 2021-02-27 22:40:15 +01:00
Gerkiz
a01e0435f3 rpg and mtn v3 changes 2021-02-25 23:59:33 +01:00
Gerkiz
96638298e3
Merge pull request #231 from hanakocz/master
AI tweak and fixes - chrono
2021-02-25 21:41:17 +01:00
Gerkiz
15a8fdb7f8 minor changes 2021-02-18 22:44:32 +01:00
Gerkiz
e793d827fa mtn fortress - is now compatible with Krastorio 2 2021-02-15 22:34:24 +01:00
Gerkiz
84dead05f1 various tweaks and fixes 2021-02-13 13:04:22 +01:00
hanakocz
dede244279
Merge pull request #50 from M3wM3w/master
update from main
2021-02-13 07:39:55 +01:00
hanakocz
2b4104150c AI tweak and fixes 2021-02-13 07:34:31 +01:00
Gerkiz
307bbe5260 fix weird crash-to-desktop bug 2021-02-12 21:02:57 +01:00
Gerkiz
fba31809c2 minor fixes
removed unused function in poll
fixed rpg exp gui not updating
fixed rpg boss biters not giving xp
fixed spam_protection activated in events it shouldn't
2021-02-12 00:48:56 +01:00
Gerkiz
8f62d1ef9d minor fixes 2021-02-11 23:19:04 +01:00
Gerkiz
48a62d40c3 mtn fortress and wave defense - fixes 2021-02-10 22:08:07 +01:00
Gerkiz
739b99c050 minor tweaks 2021-02-10 21:45:55 +01:00
Gerkiz
ffc737a1f9 mtn fortress - fixes and tweaks 2021-02-10 21:21:19 +01:00
MewMew
4f79a260e8
Merge pull request #227 from itamzxm/master
Add montian defense map
2021-02-10 09:08:30 +01:00
MewMew
a80fa1c9af
Merge pull request #228 from klugemonkey/master
Initial Commit for Scrap Towny FFA Map
2021-02-10 09:06:38 +01:00
itamzxm
899054fd0a
Update main.lua 2021-02-09 18:55:57 +08:00
klugemonkey
29b3a89b33 Fixed issue with invalid force for limited radar
Fixed issue with determining if market is placeable
Allow entities to be placed within the initial town square
Fixed info to remove reference to small plane
Fixed issue with no messages when can't place item due to building restrictions
Fixed issue with inability to place new towns near enemy spawners or turrets
Fixed issue with market listings breaking when special features disabled due to deprecation of computer item
Fixed issue with mining sound missing for big-crash-site-# entities (in mod)
Default to showing entity info for players (alt-info on chests)
2021-02-07 23:01:20 -08:00
itamzxm
db9b176383
Add files via upload 2021-02-08 13:58:24 +08:00
hanakocz
588b87658c
Merge pull request #49 from M3wM3w/master
update from main
2021-02-07 12:56:04 +01:00
hanakocz
2b1e5bb532 Chronotrain update to 1.1 2021-02-07 12:54:25 +01:00
klugemonkey
c3354a4cb9 Initial Commit for Scrap Towny FFA Map 2021-02-06 12:42:10 -08:00