3261 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
grilledham	004bb0500f	Merge pull request #983 from curiosity-a/develop ... Fix stress corruption caused by water #552	2019-09-17 18:36:20 +01:00
curiosity	03dba62d30	Refactoring	2019-09-15 12:00:23 +03:00
curiosity	9dd4f8a3bb	Refactoring	2019-09-15 11:47:18 +03:00
curiosity	f3ebccce0b	Fix stress corruption caused by water #552	2019-09-14 19:40:43 +03:00
grilledham	ef89b1fb8c	Merge pull request #978 from grilledham/diggy-fix_require ... Fix require for Popup.player	2019-09-08 13:34:31 +01:00
grilledham	def7d53da2	fix require for Popup.player	2019-09-08 13:18:50 +01:00
theorangeangle	fc1d1af9d8	Merge pull request #947 from SimonFlapse/diggy_cutscene ... Cutscene Controller	2019-08-31 20:52:28 -05:00
grilledham	7d56edd582	Merge pull request #974 from grilledham/crashsite/updates ... reduce number of trees correctly	2019-08-03 14:34:47 +01:00
grilledham	3e28c29a70	reduce number of trees correctly	2019-08-03 14:26:34 +01:00
grilledham	55fca6d183	Merge pull request #973 from grilledham/crashsite/updates ... Crashsite/updates	2019-08-03 13:23:37 +01:00
grilledham	afa2019faa	less trees	2019-08-03 12:16:19 +01:00
grilledham	c2a663dbb7	remove missing items	2019-08-03 12:11:25 +01:00
grilledham	26447fb6c9	Merge pull request #972 from grilledham/crashsite/oil_change ... 0.17.60 oil changes	2019-07-30 17:37:39 +01:00
grilledham	0eb844b17f	0.17.60 oil changes	2019-07-30 17:30:47 +01:00
grilledham	fbc5600d5a	Merge pull request #971 from grilledham/crashsite/desert ... Crashsite/desert	2019-07-28 19:33:58 +01:00
grilledham	54ff569235	desert preset	2019-07-28 11:44:21 +01:00
grilledham	119ce340bb	refactor to allow multiple crashsite presets	2019-07-28 11:44:13 +01:00
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