3294 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
grilledham	9cb89ea891	Merge pull request #970 from grilledham/crashsite/updates ... spawn market to neutral force	2019-07-27 18:31:26 +01:00
grilledham	3941937400	spawn market to neutral force	2019-07-27 12:00:18 +01:00
grilledham	e4c5569de0	Merge pull request #968 from grilledham/crashsite/updates ... Crashsite updates [Waiting for 0.17.59]	2019-07-25 16:29:34 +01:00
grilledham	bac91762a3	reverted small oil refinery changes	2019-07-25 16:21:56 +01:00
grilledham	5b6b46047e	increased advanced circuit output	2019-07-25 16:21:26 +01:00
grilledham	c7c6120f55	outpost balance	2019-07-21 18:37:03 +01:00
theorangeangle	5607e7a50b	Merge pull request #953 from theorangeangle/mapmodify-3 ... Mapmodify 3	2019-07-17 04:38:50 -04:00
SimonFlapse	b431628b86	Removed game.print statements	2019-07-07 20:54:37 +02:00
SimonFlapse	c3f09a9d3c	Fit_to_edge now accounts for display_scale	2019-07-07 20:51:25 +02:00
SimonFlapse	2b9ca4013a	Merge remote-tracking branch 'upstream/develop' into diggy_cutscene	2019-07-07 20:20:05 +02:00
grilledham	b1ae4fd622	Merge pull request #967 from grilledham/snake ... Snake	2019-07-04 16:57:08 +01:00
grilledham	20513fea25	require snake	2019-07-03 19:45:05 +01:00
grilledham	dd28df7502	update docs	2019-07-03 19:36:44 +01:00
grilledham	f8ceeed9bb	use n_th_tick instead of set_timeout	2019-07-03 19:33:04 +01:00
grilledham	dabadd8ac2	teleport player to board surface	2019-07-03 19:27:39 +01:00
grilledham	e33b77e1bb	fix travis errors	2019-07-03 16:52:26 +01:00
grilledham	c2917c24cf	error on missing surface	2019-07-03 15:54:19 +01:00
grilledham	ba05138427	fix typos	2019-07-03 15:54:06 +01:00
grilledham	9b46cebbb8	localisation	2019-07-03 15:50:19 +01:00
grilledham	8abffb30d3	updates	2019-07-03 15:45:34 +01:00
grilledham	3cfbecca17	snake	2019-07-03 12:35:38 +01:00
grilledham	dd0930ce21	extra queue functions	2019-07-03 12:35:34 +01:00
grilledham	0cce853f35	Merge pull request #965 from grilledham/apocalypse_fix ... apocalypse fix	2019-06-26 19:57:48 +01:00
grilledham	6f944fc3ec	apocalypse fix	2019-06-26 13:19:08 +01:00
grilledham	da4827ea98	Merge pull request #962 from grilledham/task+priority_queue_refactor ... Task+ PriorityQueue clean up + micro optimisations	2019-06-23 10:15:25 +01:00
grilledham	7a9c9f8170	improved priority queue docs	2019-06-23 10:07:17 +01:00
grilledham	73c1515c81	change divide to multiply	2019-06-22 22:53:58 +01:00
grilledham	3c5380dd32	made tick local	2019-06-22 22:42:27 +01:00
grilledham	b426de3ec1	task clean up	2019-06-22 22:36:13 +01:00
grilledham	e277b91657	priority_queue clean up	2019-06-22 22:36:04 +01:00
SimonFlapse	d07ea062fe	Merge remote-tracking branch 'origin/diggy_cutscene' into diggy_cutscene	2019-06-22 16:53:26 +02:00
SimonFlapse	40131895f0	Added ability to fit to edges based on the top left corner	2019-06-22 16:53:18 +02:00
Simon	890cdf12e7	Merge branch 'develop' into diggy_cutscene	2019-06-22 15:11:56 +02:00
grilledham	f767efe61b	Merge pull request #961 from grilledham/crash_site/burner_inserter ... crashsite: added burner inserter to spawn	2019-06-22 09:53:10 +01:00
grilledham	4bd81a89e0	set chest to be on player force	2019-06-22 09:45:09 +01:00
grilledham	869371cb2a	added burner inserter to spawn	2019-06-22 09:41:45 +01:00
grilledham	f0e8fd6d73	Merge pull request #960 from grilledham/bug/train_saviour ... Fix: Unknown entity name: player in train saviour	2019-06-22 09:13:51 +01:00
grilledham	e976c3d624	Merge pull request #959 from grilledham/crashsite/respawn_power_poles ... crashsite respawn power poles	2019-06-22 09:13:25 +01:00
grilledham	ae27399be2	'player' -> 'character'	2019-06-21 21:45:23 +01:00
grilledham	2ba2086618	respawn power poles	2019-06-21 21:29:35 +01:00
grilledham	2ae7933a74	Merge pull request #955 from grilledham/highlight_top_buttons ... Highlight top buttons	2019-06-21 20:29:11 +01:00
grilledham	85c639baf1	Merge pull request #958 from grilledham/tag_better_join_and_leave_messages ... Tag better join and leave messages	2019-06-21 20:22:24 +01:00
grilledham	0540e69c7b	localisation	2019-06-21 17:01:34 +01:00
grilledham	3e03560f7b	custom join / leave messages + created by + edited by	2019-06-21 16:11:14 +01:00
grilledham	9f08bf6f88	refactor -> close_main_frame	2019-06-21 10:56:37 +01:00
theorangeangle	c7f57d257e	fixed the shit i broke in the last commit, hopefully	2019-06-20 22:49:09 -05:00
theorangeangle	571b06eadb	Revert "renamed "factorio_logo2" to "factory_squared"; removed "factorio_logo" and its preview image; fixed info and disabled market module for christmas tree of terror." ... This reverts commit b8d994a7f6.	2019-06-20 22:43:12 -05:00
theorangeangle	c2cbcc4a0b	added map info and disabled landfill on DNA; added map preview and info for double beach	2019-06-20 22:35:51 -05:00
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