1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-08 00:39:30 +02:00
Commit Graph

610 Commits

Author SHA1 Message Date
MewMew
62efe899f7 tweaks 2019-08-13 10:33:14 +02:00
MewMew
c3cec34f77 new map 2019-08-12 14:34:16 +02:00
MewMew
345a518478 fixes 2019-08-09 20:19:22 +02:00
MewMew
e773be220b new map 2019-08-09 18:01:07 +02:00
MewMew
3d80043204 new function 2019-08-09 16:34:49 +02:00
MewMew
ecbeecef5f update 2019-08-06 23:54:07 +02:00
MewMew
8ad24de73b new things 2019-08-06 03:04:35 +02:00
MewMew
602d9bfe9c
Merge pull request #59 from xxalfa/master
Update tank_conquest.lua
2019-08-05 21:55:12 +02:00
xxalfa
a329aa75cb Update tank_conquest.lua 2019-08-05 20:02:47 +02:00
MewMew
aa2638743e new module 2019-08-01 22:16:37 +02:00
MewMew
ea9ce196a0 tweaks 2019-08-01 22:16:11 +02:00
xxalfa
233914ec5b Update tank_conquest.lua
Integration of loot boxes.
Improved map creation.
Added raw materials next to the base.
Player death message improved.
Created a new laser POI.
2019-07-30 00:04:02 +02:00
MewMew
ce40c97962
Merge pull request #58 from xxalfa/master
Update tank_conquest.lua
2019-07-29 15:39:46 +02:00
MewMew
be00c1ee45 Merge remote-tracking branch 'origin/master' 2019-07-29 15:25:19 +02:00
MewMew
cd70e33e72 manual biter spawning 2019-07-29 15:24:02 +02:00
Gerkiz
b6657c160a
Update control.lua 2019-07-28 12:21:57 +02:00
Gerkiz
b07eccf76b
color_data.lua
Syncs color via webpanel.
2019-07-28 12:21:15 +02:00
xxalfa
0bb1ff128f Update tank_conquest.lua 2019-07-28 04:01:46 +02:00
xxalfa
beddab7e51 Update tank_conquest.lua
Integration of a global chat.
2019-07-28 02:35:23 +02:00
xxalfa
242a3af86e Update tank_conquest.lua 2019-07-28 00:04:58 +02:00
xxalfa
e75f3be166 Merge branch 'master' of https://github.com/M3wM3w/ComfyFactorio 2019-07-27 23:26:19 +02:00
xxalfa
3b3fb316c2 Update tank_conquest.lua 2019-07-27 23:19:37 +02:00
xxalfa
4db5054e40 Update tank_conquest.lua 2019-07-27 16:22:34 +02:00
xxalfa
c40d59c443 Update tank_conquest.lua
Captured spots are now visible on the map.
Troubleshooting the GUI.
Integration of a Map Intro.
2019-07-27 15:39:28 +02:00
Gerkiz
290acd649b
update control
Since 0.17.55 ``local test = require 'test'`` broke, this fixes it.
2019-07-27 12:25:00 +02:00
MewMew
2d736f8f08
Merge pull request #57 from xxalfa/master
Update tank_conquest.lua
2019-07-26 21:48:25 +02:00
MewMew
f96463922f tweaks 2019-07-26 21:47:59 +02:00
xxalfa
917eadb4d3 Update tank_conquest.lua
Spots are now represented by tags on the map.
Raw materials and biter were activated.
A button to get to the lobby has been added.
Spots that have been taken over are now owned by your own force.
Overwriting the floor tiles has been fixed.
2019-07-26 21:42:56 +02:00
xxalfa
563458e7ee Update tank_conquest.lua 2019-07-25 20:19:03 +02:00
MewMew
22dfdb39e7
Merge pull request #56 from xxalfa/master
Show which force has won.
2019-07-25 16:52:53 +02:00
MewMew
94094ba3a0 better unit group locations 2019-07-25 16:50:34 +02:00
xxalfa
f359cb30cc Update tank_conquest.lua 2019-07-25 16:40:02 +02:00
xxalfa
f5e92ddec5 Update tank_conquest.lua 2019-07-25 16:37:36 +02:00
xxalfa
a9a085a477 Show which force has won.
Show which force has won.
Map expansion increased.
Double death message removed.
Display of corpses on the map overview switched off.
2019-07-25 16:08:14 +02:00
MewMew
38d0da570d
Merge pull request #55 from xxalfa/master
Patch for Spawn Stuck
2019-07-25 14:58:48 +02:00
xxalfa
e700b09143 Update tank_conquest.lua 2019-07-25 14:51:17 +02:00
xxalfa
0466278866 Update tank_conquest.lua 2019-07-25 14:47:54 +02:00
xxalfa
9ed5ebb462 Patch for Spawn Stuck 2019-07-25 14:45:53 +02:00
MewMew
fab715c405
Merge pull request #54 from xxalfa/master
Added Map Tank Conquest
2019-07-25 13:59:14 +02:00
xxalfa
eab22d5515 For the lobby creates a blank map and GUI adjustments. 2019-07-25 13:36:47 +02:00
MewMew
867623d120 wave cycling 2019-07-25 05:49:27 +02:00
MewMew
4f7f4e1558 unit group counts depending on threat share of teams 2019-07-25 02:43:59 +02:00
xxalfa
828b4018e6 Added Map Tank Conquest 2019-07-24 19:42:27 +02:00
MewMew
042a50acf3 terrain changes 2019-07-24 19:23:18 +02:00
MewMew
60f47333de terrain, feeding and biter things 2019-07-23 17:15:32 +02:00
MewMew
92a5e5f666 updates 2019-07-23 17:14:17 +02:00
MewMew
3c07a9f547 fix 2019-07-23 17:13:57 +02:00
MewMew
8c98589a19 new module 2019-07-19 17:26:10 +02:00
MewMew
2b0801e71f food message formatting 2019-07-18 19:56:11 +02:00
MewMew
580cdf618f further terrain tweaks 2019-07-18 15:58:37 +02:00