1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-06 00:23:49 +02:00
Commit Graph

393 Commits

Author SHA1 Message Date
danielmartin0
ce80f3e108 update for luacheck 2022-03-19 21:20:55 +00:00
danielmartin0
282f28567a fix 2022-03-19 00:10:16 +00:00
danielmartin0
e87ab12db6 v1.1.1.5.1, preparing for PR 2022-03-19 00:09:30 +00:00
danielmartin0
a8d823e46d debug off 2022-03-11 22:54:19 +00:00
danielmartin0
ee370c9bb3 v1.1.0.0 2022-03-11 22:53:36 +00:00
danielmartin0
960b234807
Merge branch 'ComfyFactory:develop' into develop 2022-03-07 22:13:21 +00:00
danielmartin0
2386fdc426 fix 2022-03-06 01:05:42 +00:00
danielmartin0
561672881c v1.0.4.3 2022-03-06 01:05:26 +00:00
Gerkiz
e8deb4ae08 minor fix 2022-03-06 00:35:33 +01:00
Gerkiz
1c205b8580 disable map 2022-03-06 00:35:07 +01:00
Gerkiz
a19b5e8132 enable module in control 2022-03-06 00:34:28 +01:00
Gerkiz
7fc0be44c7 disable inserter_drops_pickup since it's causing desyncs 2022-03-05 17:50:02 +01:00
danielmartin0
798aac043e debug off 2022-03-01 22:00:26 +00:00
danielmartin0
cf6cc52c4d v1.0.3.9.6 2022-03-01 21:59:48 +00:00
danielmartin0
80de04709c v1.0.3.1 2022-02-25 00:01:28 +00:00
danielmartin0
c59e80161a Merge remote-tracking branch 'upstream/develop' into develop 2022-02-24 19:41:03 +00:00
danielmartin0
7ef06c265f 1.0.3.0 2022-02-24 19:39:03 +00:00
Gerkiz
bd906f8e7f Add the ability to connect to other servers via ingame 2022-01-18 00:07:25 +01:00
hanakocz
dfa4b2598b New module - automatically fill placed turrets with ammo 2021-12-25 23:54:27 +01:00
Gerkiz
966dcf220a Move files in main folder to utils 2021-12-05 22:15:49 +01:00
Jacob
a2bac17e91 new module inserter_drops_pickup
Small QoL addition to pick up an item an inserter put down on the ground. If the inventory is full after mining the item, the inserter is left behind as an item-on-ground (versus not mined at all when the inventory is full)
2021-11-08 21:58:32 -05:00
danielmartin0
29473d4ed9 v1.0.1.6 2021-10-13 14:56:49 +01:00
Gerkiz
f3cbba181e Add supporter information to the playerlist 2021-10-09 13:45:19 +02:00
Gerkiz
7ce9894a15 two new modules and changes to scenario 2021-07-12 16:15:55 +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
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
6d9aa6645a Fix Territorial Control 2021-05-07 01:46:27 +02:00
Gerkiz
6c4f9e5af7 rename cave choppy 2021-05-04 19:52:58 +02:00
MewMew
8825d3fe02 NEW MAP 2021-04-19 21:09:00 +02:00
Gerkiz
f76af8c582 debug and desync fixes 2021-04-04 13:51:27 +02:00
Gerkiz
fa8c72fb46 planet prison fix
removed over 60 global functions
removed obsolete entities
2021-03-21 23:31:53 +01:00
MewMew
4f79a260e8
Merge pull request #227 from itamzxm/master
Add montian defense map
2021-02-10 09:08:30 +01:00
klugemonkey
c3354a4cb9 Initial Commit for Scrap Towny FFA Map 2021-02-06 12:42:10 -08:00
itamzxm
a15f7ccdb4
Update control.lua 2021-02-06 11:20:39 +08:00
hanakocz
a99210219e Towny fixes (use scrap layout 2 for new scrap) + difficulty vote locale 2021-01-25 02:26:09 +01:00
hanakocz
acb91e4dfd Quarters map Fixes 2021-01-25 01:37:17 +01:00
Gerkiz
53aa78896e profiler - now usable when game is ongoing
for now, only usable by me and mew or if _DEBUG is enabled by everyone.
2020-12-29 00:08:53 +01:00
MewMew
2403df846e a terrain layout 2020-12-21 07:37:19 +01:00
Gerkiz
d12d7a7770 minor fixes 2020-10-24 16:07:37 +02:00
Gerkiz
bef4bfea55 tweaks and fixes 2020-10-24 14:46:14 +02:00
Gerkiz
729c252a02 added UPS measurement
this is done in the wrapper
2020-10-21 13:34:59 +02:00
MewMew
96d554b0af new module 2020-10-19 18:26:24 +02:00
Gerkiz
853bfa1659 minor adjustments
added support for when mods try to call freeplay
fixes for mountain fortress
added more info to wave_defense module
2020-10-18 12:45:18 +02:00
Gerkiz
2bf649a215 removed not needed locals 2020-10-10 20:37:28 +02:00
MewMew
d51348fe1a wip map 2020-10-10 15:30:30 +02:00
MewMew
3bac26ed87 cleanup, fixes and brief map descriptions 2020-09-13 13:01:16 +02:00
MewMew
f0adbf7b02 fixes and updates 2020-09-13 10:06:15 +02:00
MewMew
099397af0b new module 2020-09-09 22:24:49 +02:00
Gerkiz
f6642c03f1 tweaks to choppy_dx 2020-08-15 00:45:06 +02:00
Gerkiz
cc90180237 minor changes 2020-08-14 22:41:45 +02:00
Gerkiz
e38baa3085 new modules and refactor 2020-08-14 22:07:54 +02:00
Gerkiz
3613c37c1c changes to mtn and wave_defense 2020-08-09 20:22:33 +02:00
MewMew
33c6b82f40 update for cave expanse 2020-08-09 20:04:14 +02:00
hanakocz
6716201d71 MultiDungeons 2020-07-29 21:28:48 +02:00
hanakocz
49f434c089 nuclear landmines module 2020-07-25 20:54:54 +02:00
Gerkiz
979a9b5d9b minor fix 2020-07-25 19:05:02 +02:00
Gerkiz
0e8e6f4a02 refactor 2020-07-25 17:22:04 +02:00
MewMew
6b94bf1737 new map 2020-07-21 17:42:38 +02:00
Gerkiz
2840367b0a minor changes 2020-07-21 14:41:39 +02:00
hanakocz
42c93a6825 new module - charging station (accumulators -> armor) 2020-07-21 04:56:09 +02:00
Gerkiz
1f017f687a refactor and new map 2020-07-14 21:50:56 +02:00
Gerkiz
22a40f19fa fish_defender_v2 2020-07-12 20:54:44 +02:00
Gerkiz
e43cb5b7f2 refactor and move on_init to antigrief 2020-07-11 20:57:54 +02:00
Gerkiz
50d30c0890 Compare base version
Will be removed when 1.0 is released.
2020-07-07 17:06:10 +02:00
Gerkiz
29561ec862 fixed minor issues with 0.17 and 0.18 2020-07-07 16:31:01 +02:00
Gerkiz
c1329d2694 refactor jail module 2020-06-28 14:40:39 +02:00
Gerkiz
b72a345368 make debug usable always 2020-06-24 12:40:18 +02:00
Gerkiz
605d862efe fix jail command 2020-06-21 10:49:34 +02:00
Gerkiz
fef0ade56c early grief prevention 2020-06-16 22:39:49 +02:00
Gerkiz
392bb9b342 on_tick_schedule removed and refactored 2020-06-13 10:45:04 +02:00
Gerkiz
57c81f024b fixes 2020-06-07 13:33:24 +02:00
Gerkiz
b66c0d17f2 added mf_v3 to control.lua 2020-05-20 09:13:52 +02:00
Gerkiz
51ca1fa818 new module
show inventory, usage /inventory playername
2020-05-14 15:29:33 +02:00
Gerkiz
0ee4d245cd scrapyard becomes lumberjack! 2020-05-10 02:42:10 +02:00
MewMew
c65da553da tweaks 2020-04-27 18:23:35 +02:00
hanakocz
8995a1e248 modules fix and some final changes 2020-04-18 21:28:19 +02:00
hanakocz
a41bac3071 chrono gui 2020-04-12 22:39:36 +02:00
hanakocz
2970d50e51
Update control.lua 2020-04-08 20:41:26 +02:00
hanakocz
e468adedc5 fucking confilcts 2020-04-08 20:38:18 +02:00
hanakocz
861ad308b4
Delete control.lua 2020-04-08 20:29:54 +02:00
hanakocz
d9c5468f1e update 2020-04-08 20:28:02 +02:00
hanakocz
127547efb7
Delete control.lua 2020-04-08 20:14:43 +02:00
hanakocz
b0e3726651 tiny update to science in hedge maze 2020-04-01 05:24:22 +02:00
hanakocz
df51cb3c53 conflict fix? 2020-03-20 19:46:55 +01:00
hanakocz
9dd516ef1c update, fixes 2020-03-20 19:40:14 +01:00
hanakocz
8e3c8cc1ea mini fixes + new admin tab 2020-03-17 21:36:00 +01:00
hanakocz
99dc57582d
Update control.lua 2020-02-24 06:42:11 +01:00
hanakocz
ff5c79cfc6
Merge pull request #3 from M3wM3w/master
update from main
2020-02-24 06:39:29 +01:00
manolck
49c6233410
Update control.lua 2020-02-22 17:57:15 +01:00
MewMew
40ab42e023 new map 2020-02-15 15:56:24 +01:00
hanakocz
1b1404bbf4
Update control.lua 2020-02-14 21:12:13 +01:00
MewMew
c0b02ed725 gui + thingies 2020-02-03 10:33:27 +01:00
MewMew
b5893c9b85 things 2020-01-19 10:31:16 +01:00
cogito123
019f933fde maps/planet_prison: add scenario
This scenario must be ran with all comfy gui shutdown.
2020-01-04 21:54:17 +01:00
MewMew
6a3f72052b updates
biter battles - evasion replaced with health boost
mountain map - collapse disabled by default
2020-01-01 18:25:14 +01:00
MewMew
99c7cb89c6 fix for blue beach map 2020-01-01 14:05:49 +01:00
MewMew
d17048c908 terrain layout addition 2019-12-30 17:55:11 +01:00
MewMew
e3e476a06a update
no biter attacks for new towns at high evo
clear spawn of biters for outlanders
clear units that are out of the current evolution range
prevent outlanders from building close to towns centers
2019-12-28 14:56:04 +01:00
MewMew
f8bcc22d9e updates 2019-12-19 18:26:02 +01:00