3228 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
grilledham	023a2e6de8	Merge pull request #956 from grilledham/turret_active_delay_desync_fix ... fix desync with active turret delay	2019-06-20 17:52:48 +01:00
grilledham	36b4f81606	fix desync	2019-06-20 17:43:51 +01:00
grilledham	1cbf3896d5	Merge pull request #954 from grilledham/bug/blueprint_flip_priority_splitters ... blueprint helper updates	2019-06-20 12:42:55 +01:00
grilledham	fa2a62337a	highlight top buttons	2019-06-20 12:39:18 +01:00
grilledham	10711149b8	more blueprint helper localisation	2019-06-20 11:29:00 +01:00
grilledham	5ef00fe40f	blueprint helper updates	2019-06-20 11:25:24 +01:00
theorangeangle	a93ec511b9	added map descriptions for diagonal ribbon, bacon islands, and antfarm; fixed stone and coal generation in ribbon	2019-06-19 21:20:43 -05:00
theorangeangle	4481e86940	Merge pull request #915 from RCTheBlueWolf/develop ... set day/night to bright and added preview image for the beach map.	2019-06-19 20:31:51 -05:00
theorangeangle	53281692dc	renamed crosses3 to x-cross	2019-06-19 20:23:24 -05:00
theorangeangle	7451e2ae8c	removed the crosses default map.	2019-06-19 20:20:34 -05:00
grilledham	56c6163bb0	Merge pull request #952 from grilledham/turret_active_delay ... Turret active delay + turret autofill	2019-06-19 20:59:18 +01:00
grilledham	ae3f84667b	reduce turret activation delay with tech	2019-06-19 20:48:05 +01:00
grilledham	d2e9b6f7bd	moved locales into common	2019-06-19 18:41:32 +01:00
grilledham	059ee77963	fix travis issues	2019-06-19 18:37:35 +01:00
grilledham	67961322c1	don't shadow variable	2019-06-19 18:20:04 +01:00
grilledham	e579783899	kill inactive turrets with 0 health	2019-06-19 18:01:22 +01:00
grilledham	b723ccf36a	refund not inserted items	2019-06-19 17:58:47 +01:00
grilledham	cd2c5ca96a	capitalise strings	2019-06-19 17:58:20 +01:00
grilledham	b768b87546	autofill	2019-06-19 17:36:18 +01:00
grilledham	183a31293f	added integer + postive_integer to settings types	2019-06-19 17:33:43 +01:00
grilledham	c7f63dcc4f	turret active delay	2019-06-19 14:28:40 +01:00
grilledham	ff25cffa80	Merge pull request #951 from grilledham/debugger/filter_events ... filter events	2019-06-19 10:50:54 +01:00
theorangeangle	b8d994a7f6	renamed "factorio_logo2" to "factory_squared"; removed "factorio_logo" and its preview image; fixed info and disabled market module for christmas tree of terror.	2019-06-18 17:28:31 -05:00
grilledham	a0a9ed4705	filter events	2019-06-18 21:35:25 +01:00
grilledham	9b7cee9c93	Merge pull request #949 from grilledham/corpse_remover_fix ... Some tweaks to the biter corpse remover.	2019-06-18 13:47:21 +01:00
grilledham	bf5c4ffdd4	use next to check if table is empty + fast_remove -> remove	2019-06-18 12:17:24 +01:00
grilledham	29e6954658	Merge pull request #943 from Starholme/Feature#608CorpseCleanup ... First shot at #608 Corpse Cleanup	2019-06-14 18:56:25 +01:00
grilledham	d1ba1660df	rename biter_corpse_util -> biter_corpse_remover	2019-06-13 22:28:14 +01:00
grilledham	4607706149	grill's refactoring	2019-06-13 22:25:42 +01:00
Russel Delainey	d69e7e9219	Use event tick instead of game.tick	2019-06-12 11:24:00 -06:00
theorangeangle	0e67d6ca99	Update beach.lua	2019-06-10 14:37:13 -05:00
Russel Delainey	f5ca64d671	Make travis happy? Please travis?	2019-06-10 12:47:43 -06:00
Lynn	76977dd9f7	Merge pull request #948 from linaori/retailer-translations ... Added retailer translations	2019-06-10 19:12:04 +02:00
Russel Delainey	bf9e0afffd	Merge branch 'Feature#608CorpseCleanupTable' into Feature#608CorpseCleanup	2019-06-09 22:37:28 -06:00
Russel Delainey	0aa715fcce	Update config name to better match purpose	2019-06-09 22:36:53 -06:00
Russel Delainey	1573217813	Rewrite to avoid surface lookups	2019-06-09 22:34:13 -06:00
Lynn	aa4f98c22b	Added retailer translations	2019-06-09 15:04:40 +02:00
Lynn	a26597269d	Merge pull request #945 from grilledham/player_list_tooltip_fix ... Player list tooltip fix	2019-06-09 11:22:22 +02:00
grilledham	f7918088ab	tooltip fix	2019-06-07 10:27:10 +01:00
grilledham	68c9f0ccf2	restored get_all_death_causes_by_player	2019-06-07 10:25:24 +01:00
grilledham	a86df3917b	added LocaleBuilder.new()	2019-06-07 10:25:08 +01:00
grilledham	712e9b2145	Merge pull request #944 from grilledham/locale_builder ... updates to locale_builder	2019-06-05 10:36:04 +01:00
Russel Delainey	4538af4152	Invert condition	2019-06-04 15:30:14 -06:00
Russel Delainey	c501c9ca85	Don't run cleanup on every death.	2019-06-04 15:28:08 -06:00
Russel Delainey	c07b5a39e0	Extracted filter to local	2019-06-04 14:50:09 -06:00
Russel Delainey	70fc151a3a	Extract corpse list length into local var	2019-06-04 14:41:19 -06:00
Russel Delainey	0e725ad9e1	Check the force is an enemy, and the type that died is unit	2019-06-04 14:40:33 -06:00
Russel Delainey	77d3a581f3	Implement as guards to reduce nesting	2019-06-04 14:25:34 -06:00
Russel Delainey	8b79bc8024	Clean up testing code.	2019-06-04 13:24:46 -06:00
Russel Delainey	3a56ee1e5c	First shot at #608	2019-06-04 13:07:43 -06:00