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

884 Commits

Author SHA1 Message Date
Gerkiz
eb299b4421 new module system and removal from _G 2019-10-28 17:38:36 +01:00
MewMew
9db9d71c33 display of threat / minute 2019-10-28 13:29:15 +01:00
MewMew
a569571a5a soft reset fix for not refreshing player modifiers 2019-10-28 11:15:39 +01:00
MewMew
3f066aa6a1 Merge remote-tracking branch 'origin/master' 2019-10-28 09:53:12 +01:00
MewMew
8b858cee14 no friendly fire xp gain 2019-10-28 09:52:58 +01:00
Gerkiz
f8dd07cf62
Merge pull request #77 from Gerkiz/commands
give all the items from item_prototypes
2019-10-28 09:48:39 +01:00
Gerkiz
045bf8072c give all the items from item_prototypes 2019-10-28 09:44:49 +01:00
MewMew
d6e7d317e5 xp gain from mines 2019-10-28 09:20:54 +01:00
MewMew
784abab59c RPG melee compatibility with unit health boosts 2019-10-28 09:04:30 +01:00
MewMew
3ad3336600 removal of unused things 2019-10-28 08:03:17 +01:00
Gerkiz
50712ec452
Merge pull request #76 from Gerkiz/commands
commands fix
2019-10-27 23:43:59 +01:00
Gerkiz
64d70bc532 commands fix 2019-10-27 23:42:50 +01:00
Gerkiz
dac4719269
Merge pull request #75 from Gerkiz/commands
added commands
2019-10-27 23:23:29 +01:00
Gerkiz
6068224756 added commands 2019-10-27 23:22:47 +01:00
MewMew
6202a13fb0 tweaks and fixes 2019-10-27 19:26:55 +01:00
MewMew
b453cd3301 walls to player force 2019-10-26 15:36:13 +02:00
MewMew
f0ca6ef6ff tweaks 2019-10-26 13:56:02 +02:00
Gerkiz
da7974ca5d
Merge pull request #72 from Gerkiz/development
Minor changes
2019-10-26 13:12:18 +02:00
Gerkiz
581273dc46 Minor changes
Task is no longer global
global.lua now returns token.
2019-10-26 13:10:56 +02:00
MewMew
c8eb0e9062 map intro to panel 2019-10-26 12:06:58 +02:00
MewMew
35de8bdbfb Merge remote-tracking branch 'origin/master' 2019-10-26 11:49:36 +02:00
MewMew
32e6d824dc quarters map update 2019-10-26 11:47:46 +02:00
Gerkiz
7ea87c9fb0
Merge pull request #71 from Gerkiz/development
update debug func
2019-10-26 00:06:34 +02:00
Gerkiz
d83bcd3186 update debug func 2019-10-26 00:05:52 +02:00
MewMew
a8aca84012 terrain update 2019-10-25 11:37:56 +02:00
MewMew
8687ef48c5 added vehicles and robots as kill causes 2019-10-25 09:08:39 +02:00
MewMew
723cb7a87e tooltip update 2019-10-25 08:31:06 +02:00
MewMew
2a0de70c78 Merge remote-tracking branch 'origin/master' 2019-10-25 08:11:46 +02:00
MewMew
db6a2b4c17 updates 2019-10-25 08:09:39 +02:00
Gerkiz
2cffe031a7
Merge pull request #70 from Gerkiz/development
updated autostash
2019-10-24 23:02:30 +02:00
Gerkiz
4ae1838bea updated autostash
left.click = whole inventory
right.click = ores only
2019-10-24 23:00:14 +02:00
MewMew
d65725a10c fixes 2019-10-24 08:01:39 +02:00
MewMew
0c5561f599 gui tooltip 2019-10-23 21:39:35 +02:00
MewMew
aba388c40f new module 2019-10-23 21:17:15 +02:00
MewMew
1ee43e9d7d fixes and tweaks 2019-10-23 20:57:10 +02:00
MewMew
e792c709ff tweaks 2019-10-23 06:01:19 +02:00
MewMew
e7d18d09d6 fix 2019-10-22 10:18:28 +02:00
MewMew
8de20e2bd5 eating below max health fix 2019-10-22 08:37:06 +02:00
MewMew
39709712e6 tweaks 2019-10-22 08:29:30 +02:00
MewMew
dd0f5dd8a1 close button tab 2019-10-22 08:27:00 +02:00
MewMew
3a0097ed45 clean up 2019-10-22 05:28:45 +02:00
MewMew
cde475739a terrain things 2019-10-21 07:16:03 +02:00
Gerkiz
91e5ec5284
Merge pull request #69 from Gerkiz/development
added poll to comfy_panel
2019-10-20 18:54:34 +02:00
Gerkiz
24ad7d0d26 moved poll after score 2019-10-20 18:51:48 +02:00
Gerkiz
e128bbd9ba added poll to comfy_panel 2019-10-20 18:48:44 +02:00
MewMew
ba7c76b6b9 hotfix for player list 2019-10-20 14:49:26 +02:00
MewMew
f02425c2a5 map info integration into new panel 2019-10-20 14:25:22 +02:00
MewMew
b4d15b3f1d gui updates 2019-10-20 12:52:19 +02:00
MewMew
e076d3e5f1 Comfypanel WIP 2019-10-20 11:48:14 +02:00
MewMew
bfbbd0ab10 vanilla with wave defense map 2019-10-20 06:07:07 +02:00