2393 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gerkiz	92688aea74	minor changes to planet prison and mtn fortress	2021-03-27 13:44:32 +01:00
Quadrum	36fa0f3b68	Fixing weird formatting	2021-03-26 17:53:46 +01:00
Quadrum	1a48cbdf60	Update junkyard to 1.1	2021-03-26 17:47:30 +01:00
Gerkiz	5a0d34fa5d	Merge pull request #14 from ComfyFactory/player_list_fix ... fixed minor human error	2021-03-26 00:15:29 +01:00
Gerkiz	b995b206de	fixed minor human error	2021-03-26 00:14:14 +01:00
Gerkiz	6675456486	Merge pull request #13 from ComfyFactory/comfy_panel_tabs_rework ... removed comfy_panel_tabs from _G and made it use tokens instead	2021-03-25 23:51:44 +01:00
Gerkiz	5b88f8fdfc	removed comfy_panel_tabs from _G and made it use tokens instead	2021-03-25 23:49:57 +01:00
hanakocz	d2b56a1c7f	Merge pull request #12 from ComfyFactory/luacheck_fix_chrono ... fix luacheck in chrono	2021-03-25 20:50:16 +01:00
hanakocz	c40f8c97ee	plsss	2021-03-25 20:45:04 +01:00
hanakocz	11449f0302	plss	2021-03-25 20:41:22 +01:00
hanakocz	b3423a9c83	pls	2021-03-25 20:37:35 +01:00
hanakocz	35ccbaf258	last luacheck fixes	2021-03-25 20:34:51 +01:00
hanakocz	9f8a7de980	more lua fixes	2021-03-25 03:49:03 +01:00
hanakocz	09bac50da6	fix luacheck in chrono	2021-03-25 03:39:07 +01:00
Gerkiz	001bfe9b6e	Merge pull request #11 from ComfyFactory/attempt_to_fix_luacheck_warnings ... Attempt to fix luacheck warnings	2021-03-24 20:54:35 +01:00
Gerkiz	52f3976337	luacheck fixes	2021-03-24 20:23:53 +01:00
Gerkiz	e2a33f9f30	luacheck more fixes	2021-03-24 20:14:55 +01:00
Gerkiz	b582b3cb9b	luacheck fixes	2021-03-24 19:18:46 +01:00
Gerkiz	3e297f96d1	Merge remote-tracking branch 'origin/develop' into attempt_to_fix_luacheck_warnings	2021-03-24 19:18:30 +01:00
Gerkiz	9d033903fb	more luachecks	2021-03-24 18:22:45 +01:00
Gerkiz	da7546565b	more luacheck fixes	2021-03-24 17:36:07 +01:00
hanakocz	65902c0e84	Merge pull request #8 from ComfyFactory/2021-03-24-chronotrain_update_1 ... Chronotrain updates, tiny balance changes	2021-03-24 17:28:59 +01:00
hanakocz	2c8a585c38	Chronotrain updates, tiny balance changes	2021-03-24 17:19:47 +01:00
Gerkiz	cd8f5105e2	first attempt to make luacheck happy	2021-03-24 16:46:00 +01:00
Gerkiz	a691e2defb	update CI to new luacheckfile	2021-03-24 16:22:23 +01:00
Gerkiz	584b424b1f	minor fix	2021-03-23 23:23:50 +01:00
Gerkiz	d8a397f95b	Merge pull request #7 from ComfyFactory/prison_planet_minor_fix ... Log if we're trying to write something that is not in global	2021-03-23 23:11:47 +01:00
Gerkiz	dedf2a6857	Log if we're trying to write something that is not in global	2021-03-23 23:11:16 +01:00
Gerkiz	5f78cf907b	Merge pull request #6 from ComfyFactory/planet_prison_fix_v5 ... Planet prison fix v5	2021-03-22 22:35:17 +01:00
Gerkiz	fdcb1425a5	update thirst module	2021-03-22 22:34:55 +01:00
Gerkiz	1dce46cbaa	planet prison fixes	2021-03-22 22:34:45 +01:00
Gerkiz	876c63fc30	minor change to planet prison	2021-03-22 13:07:30 +01:00
Gerkiz	a87db296a7	Merge pull request #5 from ComfyFactory/planet_prison_fix_v4 ... Planet prison fix v4	2021-03-22 12:58:15 +01:00
Gerkiz	b3e938ddf9	make functions local where we can	2021-03-22 12:57:58 +01:00
Gerkiz	9e08248edf	more tweaks	2021-03-22 12:46:02 +01:00
Gerkiz	04537e426a	various tweaks and fixes to prison planet	2021-03-22 12:40:46 +01:00
Gerkiz	3e0bbb2946	more changes	2021-03-22 11:33:54 +01:00
Gerkiz	27c0e9ed34	Merge pull request #4 from ComfyFactory/planet_prison_fix_v3 ... more changes to planet prison	2021-03-22 00:28:17 +01:00
Gerkiz	43beed887a	more changes to planet prison	2021-03-22 00:28:03 +01:00
Gerkiz	f1adda1f60	Merge pull request #3 from ComfyFactory/planet_prison_fix_v2 ... more changes to planet prison	2021-03-21 23:57:13 +01:00
Gerkiz	fe432ae000	more changes to planet prison	2021-03-21 23:56:56 +01:00
Gerkiz	77c4a13783	Merge pull request #2 from ComfyFactory/planet_prison_fix ... planet prison fix	2021-03-21 23:33:45 +01:00
Gerkiz	fa8c72fb46	planet prison fix ... removed over 60 global functions removed obsolete entities	2021-03-21 23:31:53 +01:00
Gerkiz	c069a2ae68	Merge pull request #1 from ComfyFactory/autostash_fix ... autostash - fix	2021-03-21 02:00:08 +01:00
Gerkiz	56a968c934	autostash - fix	2021-03-21 01:57:02 +01:00
Gerkiz	3bb771a455	run luacheck on pull requests	2021-03-19 22:06:39 +01:00
Gerkiz	5adeae5178	update readme	2021-03-19 21:16:27 +01:00
Gerkiz	919ce7bbe2	Add license	2021-03-19 21:14:32 +01:00
Gerkiz	f07c77d421	minor changes ... autostash now has priority send pings to map channels instead of announcements	2021-03-19 16:17:38 +01:00
Gerkiz	3e74bd8165	mtn fortress - minor adjustment	2021-03-17 16:39:56 +01:00