761 Commits

Author	SHA1	Message	Date
Gerkiz	bd3aaeb131	Vote - fix that players could vote when timer ended	2022-06-09 00:06:38 +02:00
Gerkiz	1e3f0ff811	fix bugs	2022-06-07 17:39:57 +02:00
Gerkiz	0d1773ef91	rpg - fix xp bug	2022-05-25 21:55:52 +02:00
Gerkiz	30a6264041	rpg - minor fix	2022-05-20 10:33:11 +02:00
hanakocz	50469c804b	bp requesting - player can disable the feature in config menu	2022-05-16 01:02:25 +02:00
hanakocz	49781aef5c	Merge branch 'develop' into blueprint_requesting	2022-05-15 01:03:22 +02:00
hanakocz	f121bbd8ca	module to set requests in logi chests to blueprint total costs	2022-05-15 00:55:36 +02:00
Gerkiz	c2d272e8bb	Collapse fix	2022-05-14 19:15:51 +02:00
Gerkiz	f0560c1d27	misc fixes	2022-05-12 22:22:03 +02:00
Gerkiz	e50243a20b	wave defense - fixes	2022-05-12 22:19:00 +02:00
Gerkiz	d7a502d8fb	Rpg spells - fix capsules	2022-05-08 10:51:48 +02:00
Gerkiz	304b3402fc	Merge branch 'develop' into master	2022-04-25 08:12:32 +02:00
Eric Anderson	7e55d2453e	Disable start_now in collapse rather than adding disable feature. ... It looks like this works to keep the collapse logic from running. It relies on the dungeons on_init function running after the collapse one.	2022-04-24 19:50:50 -07:00
Gerkiz	12cee19db9	remove test file	2022-04-23 18:25:24 +02:00
Gerkiz	984b73b365	fix minor gui issues	2022-04-23 18:22:00 +02:00
Gerkiz	8bc93d8d6c	rpg and autostash fixes	2022-04-23 17:10:15 +02:00
Eric Anderson	7cc268fab6	use type (red/blue chest) instead of position for identifying valid autostash targets for dungeons	2022-04-23 03:29:07 -07:00
Gerkiz	e33409e7a1	rpg - fix issues	2022-04-21 21:05:02 +02:00
Gerkiz	083c9f0d06	small fix	2022-04-18 18:48:23 +02:00
Gerkiz	b31379378c	minor fixes	2022-04-18 18:46:19 +02:00
Gerkiz	766003c8c7	make luacheck happy	2022-04-18 01:20:26 +02:00
Gerkiz	1ccbbb6c0e	minor change to diff gui	2022-04-18 01:18:58 +02:00
Gerkiz	a3cd26b88f	fix rpg	2022-04-18 01:18:25 +02:00
Gerkiz	378dfe373d	fix gui issues	2022-04-18 01:18:06 +02:00
Gerkiz	11a0f7f7ca	wave defense fixes	2022-04-18 01:17:16 +02:00
Gerkiz	9bf24f6659	fix minor issue with rpg	2022-04-11 21:13:33 +02:00
Gerkiz	8c50414566	rpg - add callbacks instead of messy function	2022-04-08 22:00:39 +02:00
Eric Anderson	938528798b	Update changelog module and tiered dungeon to handle move of comfy_panel to utils.gui	2022-04-07 21:50:05 -07:00
Eric Anderson	b8158f1f01	Merge remote-tracking branch 'gh/develop' into master	2022-04-07 21:05:59 -07:00
Eric Anderson	26f34ea8d5	Review fixes. ... * Clearing corpses remains trusted only. * Remove spurious debugging code.	2022-04-07 20:54:22 -07:00
Gerkiz	5a6539b6db	fix gui issue	2022-04-07 16:11:26 +02:00
Gerkiz	4ce2342629	rpg - revert inventory bonus	2022-04-07 16:10:40 +02:00
Gerkiz	29b865fe3b	rename one punch to aoe punch	2022-04-05 20:02:13 +02:00
Gerkiz	95f2e90e55	refactor more gui	2022-04-05 19:28:08 +02:00
Gerkiz	a51d361824	tweaks and changes	2022-04-05 12:00:13 +02:00
Eric Anderson	9abbd226da	Fix issues found by luacheck	2022-03-29 22:44:51 -07:00
Eric Anderson	79e9bdee7e	Merge https://github.com/eric-anderson/ComfyFactorio into master	2022-03-29 22:15:56 -07:00
Gerkiz	7cf25ff1c0	Fix minor gui issue	2022-03-29 22:24:58 +02:00
Gerkiz	e5611d8a3c	minor fix	2022-03-29 21:35:00 +02:00
Eric Anderson	e91d492a93	Fix sundry bugs in the changelog implementation	2022-03-15 00:01:32 -07:00
Eric Anderson	87a9c5de43	Add changelog module to the panel	2022-03-13 21:18:42 -07:00
Eric Anderson	73b5d03276	Add ability to entirely disable collapse. It is used by RPG and causes log spamming (12G log when noticed) because it can not collapse in tiered dungeon	2022-03-06 23:37:16 -08:00
Gerkiz	4edfd949d1	fix hunger games	2022-03-06 00:34:05 +01:00
Gerkiz	1a7d6f1c77	make luacheck happy	2022-03-01 19:33:13 +01:00
Gerkiz	0191cf5e5d	scrap towny ffa fixes	2022-03-01 19:31:57 +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
Gerkiz	8cae376904	wave defense - minor issue fix	2022-02-28 22:16:16 +01:00
Eric Anderson	e87adce867	Handle the case where player is dead	2022-02-25 21:46:23 -08:00
Eric Anderson	d0736d4fb5	Add hook to enable autostash into the dungeons linked chests	2022-02-25 19:41:20 -08:00