633 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
MewMew	fea21bb776	updates	2019-08-26 02:00:00 +02:00
MewMew	d0244e4139	tweaks	2019-08-24 14:23:36 +02:00
MewMew	2955b4ab3d	fixes	2019-08-23 14:41:32 +02:00
MewMew	5023f45867	wip	2019-08-23 14:02:06 +02:00
MewMew	82ff91416d	fixes	2019-08-21 01:17:06 +02:00
MewMew	8bb71c4d49	Merge pull request #62 from xxalfa/master ... Update tank_conquest.lua	2019-08-20 22:34:37 +02:00
MewMew	c6a9e4009d	soft reset addition, fixes	2019-08-20 22:33:47 +02:00
xxalfa	f2651f54ca	Merge branch 'master' of https://github.com/M3wM3w/ComfyFactorio	2019-08-18 20:30:00 +02:00
xxalfa	83c6236b94	Update tank_conquest.lua	2019-08-18 20:26:43 +02:00
MewMew	639dc4c399	Merge remote-tracking branch 'origin/master'	2019-08-16 23:20:42 +02:00
MewMew	4e4df4d327	new module	2019-08-16 23:19:19 +02:00
Gerkiz	9973d3b39b	Merge pull request #61 from Gerkiz/dev01 ... Better session handling	2019-08-16 15:01:22 +02:00
Gerkiz	70f956a5e8	Spelling check	2019-08-16 14:53:32 +02:00
Gerkiz	fe2a628d5e	Better session handling	2019-08-16 14:44:06 +02:00
MewMew	3099805037	difficulty voting and fixes	2019-08-15 12:38:24 +02:00
MewMew	7c346e7070	updates	2019-08-14 21:16:56 +02:00
MewMew	4b8488ec1f	difficulty voting	2019-08-14 16:16:42 +02:00
Gerkiz	827727fb85	Fixes random on_gui_click issues	2019-08-14 15:19:18 +02:00
MewMew	ec3d80b7e9	update	2019-08-14 06:24:53 +02:00
MewMew	d928fed302	fix	2019-08-13 10:57:13 +02:00
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
xxalfa	029b8ebfa2	Update tank_conquest.lua	2019-08-07 22:51:47 +02:00
xxalfa	bbcfefe775	Update tank_conquest.lua ... Added items to the quickbar.	2019-08-07 06:04:33 +02:00
MewMew	ecbeecef5f	update	2019-08-06 23:54:07 +02:00
xxalfa	8ac65ee302	Update tank_conquest.lua ... Adjustments to the loot table. Integration of the lobby on the battlefield.	2019-08-06 23:37:42 +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