1050 Commits

Author	SHA1	Message	Date
Matthew Heguy	3af411faa5	Switch to functions in table, adjust map_loader accordingly	2019-02-20 16:38:34 -05:00
Matthew	6984bfaf87	Merge pull request #724 from SimonFlapse/stash_prehistoric ... Added groundhogs, updated dino_island	2019-02-20 09:32:00 -05:00
Matthew Heguy	de36eb81ac	Restore uranium	2019-02-20 03:25:18 -05:00
Matthew Heguy	cb69555169	ipairs -> pairs and cleanup if/else for groundhogs	2019-02-20 03:17:09 -05:00
Matthew	0f9ad4b93f	Merge pull request #773 from theorangeangle/oldsci ... Toxic_science_jungle.lua	2019-02-20 02:43:31 -05:00
Matthew Heguy	c0461ccf62	Final cleanup	2019-02-20 02:40:58 -05:00
SimonFlapse	fafbe1dd31	Fixed linting error ... Caused by merge conflict	2019-02-20 08:26:06 +01:00
theorangeangle	6ac34ea1a5	flamethrower fix	2019-02-19 20:08:05 -06:00
theorangeangle	8fef499864	Added local config changes	2019-02-19 19:49:31 -06:00
SimonFlapse	d1355fb1ad	Merge branch 'stash_prehistoric' of https://github.com/SimonFlapse/RedMew into stash_prehistoric	2019-02-19 20:35:06 +01:00
Matthew	74e724ab52	Merge pull request #774 from SimonFlapse/Diggy-fix-buffs ... Tweaking level up formula for late late game	2019-02-19 14:24:27 -05:00
Matthew	16fe4a7345	Merge pull request #742 from plague006/apply_lifecycle ... Apply lifecycle	2019-02-19 14:13:28 -05:00
plague006	3d8aecf4ae	Add config options	2019-02-19 14:04:34 -05:00
plague006	c6bcb2f2c6	Clean up linting, use entity_placement_restriction	2019-02-19 14:04:34 -05:00
SimonFlapse	b16acecc46	Added groundhogs, updated dino_island	2019-02-19 14:04:34 -05:00
Matthew	5f283c90d8	Merge pull request #723 from plague006/entity_restriction ... Add generic entity restriction module	2019-02-19 14:02:32 -05:00
grilledham	4696157555	return true for zero area bounding_box entities (bots)	2019-02-19 17:43:53 +00:00
SimonFlapse	34fd76592c	Tweaking level up formula for late late game ... Tweaking xp gained from infinite research to add 60% towards current level up progress. Added max level for boosts	2019-02-19 17:24:21 +01:00
SimonFlapse	c72f8fe8ba	Revert "Tweaking level up formula for late late game" ... This reverts commit c00f786241da8fc477505d9c5684c1a46ccb1372.	2019-02-19 17:09:12 +01:00
SimonFlapse	c00f786241	Tweaking level up formula for late late game ... Tweaking xp gained from infinite research to add 60% towards current level up progress. Added max level for boosts	2019-02-19 17:02:07 +01:00
SimonFlapse	b5d14f08d9	Added toggle for groundhogs	2019-02-19 14:49:51 +01:00
theorangeangle	779986d458	added back in line 256	2019-02-19 00:41:45 -06:00
theorangeangle	5f593fe275	removed market duplicate (again)	2019-02-19 00:15:31 -06:00
theorangeangle	83cde6bba0	fixed steel axe config	2019-02-19 00:13:50 -06:00
plague006	17a356aa1e	USe recipe_locker, remove duplicate line for create_standard_market	2019-02-19 00:51:34 -05:00
theorangeangle	72f1cb12fb	fixed player_force reference	2019-02-18 23:36:29 -06:00
theorangeangle	2004c431ac	removed useless lines of code, damn you travis	2019-02-18 22:22:34 -06:00
theorangeangle	e7143988a9	info about what to do in config.lua	2019-02-18 21:58:11 -06:00
theorangeangle	0ac5f831e3	rename	2019-02-18 21:55:22 -06:00
theorangeangle	37e19eea73	fixed mining speed and my API goof	2019-02-18 19:07:09 -06:00
theorangeangle	d6495dcc47	added mapgen settings	2019-02-18 16:04:55 -06:00
theorangeangle	211e751854	removed flamethrowers from market	2019-02-18 15:45:29 -06:00
SimonFlapse	9f1594906c	Fixed players being stuck on teleport	2019-02-18 22:36:54 +01:00
theorangeangle	fd826826d7	fixed market items	2019-02-18 15:06:16 -06:00
theorangeangle	afb07c0e11	it works but the market stuff still needs a fix	2019-02-18 12:36:45 -06:00
SimonFlapse	667a1c45e7	Fixed linting error	2019-02-18 14:32:01 +01:00
SimonFlapse	210eb45b39	Restricted build capabilities on other teams land	2019-02-18 14:12:14 +01:00
SimonFlapse	033101c0b0	Minor tweaking of ores	2019-02-18 12:35:58 +01:00
SimonFlapse	c5db1d984e	Fixed linting errors	2019-02-18 12:13:14 +01:00
SimonFlapse	d00a2c685a	Increased resources for quadrant 2 ... As per suggestion in #714	2019-02-18 11:23:51 +01:00
SimonFlapse	7cc4048627	Added chat information	2019-02-18 10:38:44 +01:00
SimonFlapse	c43dfa526c	Updating map info ... Preparation for test	2019-02-18 10:30:06 +01:00
SimonFlapse	dadd394901	Added oil for quadrant 3	2019-02-18 09:59:36 +01:00
SimonFlapse	81cdc736b3	Fixed new line at EoL	2019-02-18 09:38:41 +01:00
SimonFlapse	1c762eb502	Removed debugging logs ... Forgot to remove writing to log	2019-02-18 09:36:43 +01:00
SimonFlapse	6238dbe09f	Fixed multiplayer research	2019-02-18 09:33:05 +01:00
plague006	8ccfe43cef	Make lifecycle more readable.	2019-02-18 01:43:59 -05:00
plague006	00991ba5c4	Remove standard market from 1000x	2019-02-18 01:17:14 -05:00
Matthew	06915dd5bb	Merge pull request #744 from plague006/1000x ... Add 1000x	2019-02-18 00:50:08 -05:00
SimonFlapse	6d0df6a0fa	Technology and research restrictions added	2019-02-17 23:10:41 +01:00