3219 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gerkiz	0191cf5e5d	scrap towny ffa fixes	2022-03-01 19:31:57 +01:00
Gerkiz	01dc8160b8	Merge pull request #225 from ComfyFactory/scrap_fixes ... scrap towny ffa fixes	2022-03-01 19:21:14 +01:00
Gerkiz	7209034d3e	Merge branch 'develop' into scrap_fixes	2022-03-01 19:20:17 +01:00
Gerkiz	5f9f1aba67	Merge pull request #224 from ComfyFactory/luacheck ... luacheck update	2022-03-01 19:19:17 +01:00
Gerkiz	dab8858fdf	luacheck update	2022-03-01 19:17:53 +01:00
Gerkiz	f065a745bb	more fixes	2022-03-01 19:16:44 +01:00
Gerkiz	0837a8d329	scrap towny ffa fixes ... Rebase from the running save	2022-03-01 18:55:02 +01:00
danielmartin0	2e0b514889	v1.0.3.9.4	2022-03-01 15:57:23 +00:00
Gerkiz	9ff78c729f	Merge pull request #221 from ComfyFactory/planetprison_fix ... planet_prison desync fix	2022-03-01 01:00:23 +01:00
Gerkiz	a5e1f15cc2	planet_prison desync fix	2022-03-01 00:58:53 +01:00
Gerkiz	1cb79bb50d	Merge pull request #220 from ComfyFactory/planet_prison ... Planet Prison fixes	2022-03-01 00:02:41 +01:00
Gerkiz	b4a6231a4a	planet prison - fixes	2022-03-01 00:01:09 +01:00
Gerkiz	1478bbbbff	planet prison - fixes	2022-02-28 23:47:00 +01:00
Gerkiz	5ffecd97b5	Merge pull request #219 from ComfyFactory/minor_fix ... Fixes some minor modules/maps	2022-02-28 22:18:37 +01:00
Gerkiz	ec1f7eabc4	fish defender - bouncy shell minor issue fix	2022-02-28 22:16:33 +01:00
Gerkiz	47da1705f8	fish defender - minor issue fix	2022-02-28 22:16:23 +01:00
Gerkiz	8cae376904	wave defense - minor issue fix	2022-02-28 22:16:16 +01:00
danielmartin0	6b49234f4c	hotfix	2022-02-28 20:40:29 +00:00
danielmartin0	3a89db4a0a	v1.0.3.9.2	2022-02-28 20:35:45 +00:00
danielmartin0	4ef9d1b61a	v1.0.3.9.1	2022-02-28 16:36:46 +00:00
Gerkiz	8194dccf56	Merge pull request #218 from ComfyFactory/mtn_v3 ... mtn v3 - fix weird bug	2022-02-27 23:18:23 +01:00
Gerkiz	465ca81fa4	make luacheck happy	2022-02-27 23:13:32 +01:00
Gerkiz	5c631e1b7f	mtn v3 - fix weird bug	2022-02-27 23:11:59 +01:00
danielmartin0	f4bdebe2f3	v1.0.3.8.3	2022-02-27 18:47:53 +00:00
danielmartin0	27ba3e5dff	v1.0.3.8.2	2022-02-27 16:42:25 +00:00
danielmartin0	57713f55aa	v1.0.3.7	2022-02-26 23:33:19 +00:00
danielmartin0	20de9a40e0	v1.0.3.6	2022-02-26 18:25:48 +00:00
danielmartin0	1f74257cf1	v1.0.3.5	2022-02-26 13:55:36 +00:00
Eric Anderson	864a60ea6b	BUGFIX: need to teleport character to dungeon floor before creating character, otherwise creation fails	2022-02-25 21:47:30 -08:00
Eric Anderson	e87adce867	Handle the case where player is dead	2022-02-25 21:46:23 -08:00
Eric Anderson	b6ac26fb03	enable dungeons autostash, enable everyone to clear corpses	2022-02-25 19:42:24 -08:00
Eric Anderson	d0736d4fb5	Add hook to enable autostash into the dungeons linked chests	2022-02-25 19:41:20 -08:00
Eric Anderson	aa23e76a33	Add flag to always allow clearing corpses	2022-02-25 19:40:36 -08:00
Eric Anderson	0a4cedeb01	relock research that is incorrectly enabled	2022-02-25 19:39:43 -08:00
danielmartin0	512481c758	v1.0.3.2	2022-02-25 00:15:32 +00:00
danielmartin0	80de04709c	v1.0.3.1	2022-02-25 00:01:28 +00:00
danielmartin0	c59e80161a	Merge remote-tracking branch 'upstream/develop' into develop	2022-02-24 19:41:03 +00:00
danielmartin0	7ef06c265f	1.0.3.0	2022-02-24 19:39:03 +00:00
Eric Anderson	86b9d7ac54	tweak room generation to increase chance of creating room	2022-02-24 02:19:37 -08:00
Eric Anderson	fe2943bf2f	reduce mindist for hard rooms, 200 was too far out. move tech multiplier into research module	2022-02-24 02:17:38 -08:00
Eric Anderson	35308dc65a	maybe fix bool/int error in log with parens, if not, will get better line number next time	2022-02-24 02:16:48 -08:00
Eric Anderson	b84e59bf80	tweak recipe unlock pattern to be more controllable. Change research scaling to start hard and scale down as research is found on floors	2022-02-24 02:15:39 -08:00
Eric Anderson	bc5729313e	add lots of missing locals, fix print to use proper quoting	2022-02-24 02:14:35 -08:00
Eric Anderson	9ae73f34da	enable melee mode, move doom rooms under the enable_hard_rooms if test	2022-02-23 03:52:27 -08:00
Eric Anderson	64b0a33073	Add support for a button to put character in melee mode so that guns/ammo will not go into weapon/ammo slots	2022-02-23 03:51:51 -08:00
Eric Anderson	2c0cd0ce94	fix nil dereference	2022-02-23 03:50:42 -08:00
Eric Anderson	3f6ae6210a	Enable autostash and corpse clearing lower buttons	2022-02-22 20:19:24 -08:00
Gerkiz	1e6d41d1ae	Merge pull request #213 from PlexPt/develop ... Update Chinese translation and Migrate some hardcoded code.	2022-02-22 22:16:37 +01:00
Gerkiz	1263d405ca	Merge branch 'develop' into develop	2022-02-22 22:14:06 +01:00
Gerkiz	89d26acd95	Merge pull request #217 from ComfyFactory/mtn_v3 ... Mtn v3 - Fixes that offline players had their vehicles removed	2022-02-22 22:07:46 +01:00