3013 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gerkiz	7021324f6c	Merge pull request #251 from ComfyFactory/rpg ... fix minor issue with rpg	2022-04-11 21:14:53 +02:00
Gerkiz	9bf24f6659	fix minor issue with rpg	2022-04-11 21:13:33 +02:00
Gerkiz	0f8ca8b84b	Merge pull request #249 from danielmartin0/develop ... adapt to new Comfy Gui	2022-04-10 11:33:28 +02:00
Gerkiz	24d65cb06d	fix small whitespace	2022-04-10 11:32:32 +02:00
Gerkiz	2b90f23e4a	Merge branch 'develop' into develop	2022-04-10 11:28:27 +02:00
Gerkiz	d861528fa3	Merge pull request #250 from ComfyFactory/fixes ... Fixes	2022-04-10 11:24:36 +02:00
Gerkiz	568a94a88d	make luacheck happy	2022-04-10 11:23:27 +02:00
Gerkiz	548747d9df	Mtn v3 - fix radar scanning	2022-04-10 11:21:52 +02:00
Gerkiz	7438b07cce	Test another welcome message when a player joins the game	2022-04-10 11:21:43 +02:00
danielmartin0	4203f740f2	adapt to new Comfy Gui	2022-04-08 23:44:41 +01:00
Gerkiz	9e13b99fd0	Merge pull request #248 from ComfyFactory/pirates_panel_fix ... Fix minor panel issue	2022-04-08 22:49:37 +02:00
Gerkiz	c6caeed025	Pirates - fix a minor issue that was missed in the PR	2022-04-08 22:47:56 +02:00
Gerkiz	f15fa41c97	Merge pull request #247 from ComfyFactory/changes ... Small changes	2022-04-08 22:40:46 +02:00
Gerkiz	7f8ad0b184	small tweak	2022-04-08 22:39:15 +02:00
Gerkiz	d9ec7d40cf	mtn v3 - fix for rpg	2022-04-08 22:00:49 +02:00
Gerkiz	8c50414566	rpg - add callbacks instead of messy function	2022-04-08 22:00:39 +02:00
Gerkiz	3b02582750	Merge pull request #246 from ComfyFactory/panel_update ... Add Pirate ship to the panel	2022-04-08 17:00:50 +02:00
Gerkiz	3aff9a5ce7	minor fix	2022-04-08 16:59:30 +02:00
Gerkiz	1e378bf3cd	Add Pirate ship to the panel	2022-04-08 16:56:40 +02:00
Gerkiz	0d8c05f760	Merge pull request #244 from danielmartin0/develop ... Merge in Pirate Ship now that the main branch has deflate	2022-04-08 16:54:45 +02:00
Gerkiz	4e8231f05d	Merge branch 'develop' into develop	2022-04-08 16:51:52 +02:00
danielmartin0	185e6b4dde	gitignore fix 7	2022-04-08 15:47:07 +01:00
danielmartin0	a4a51dda4f	gitignore fix 6	2022-04-08 15:46:15 +01:00
danielmartin0	52d1000731	gitignore fix 5	2022-04-08 15:25:19 +01:00
danielmartin0	f87b5cc335	gitignore fix 3	2022-04-08 15:13:51 +01:00
danielmartin0	46f17c735a	gitignore fix 2	2022-04-08 15:13:28 +01:00
Gerkiz	28fba9ac7e	Merge pull request #245 from ComfyFactory/mtn_v3 ... fix collapse and shuffle the zones more	2022-04-08 16:12:34 +02:00
danielmartin0	8ac2acb2dd	gitignore fix 1	2022-04-08 15:11:06 +01:00
Gerkiz	68404927ac	fix collapse and shuffle the zones more	2022-04-08 16:11:06 +02:00
danielmartin0	52ccfecb2d	whitespace	2022-04-08 14:55:53 +01:00
danielmartin0	12473c7f6d	re-enable some utils.gui that should be enabled on main branch	2022-04-08 14:54:22 +01:00
danielmartin0	9e4211605a	prepare for PR	2022-04-08 14:49:53 +01:00
danielmartin0	e598976ede	Merge remote-tracking branch 'upstream/develop' into develop	2022-04-08 14:46:11 +01:00
Gerkiz	bdd16d9a2f	minor change	2022-04-08 00:35:03 +02:00
Gerkiz	e7658d12a1	small change	2022-04-08 00:34:10 +02:00
Gerkiz	6e98f1c1bc	final fix	2022-04-08 00:11:10 +02:00
Gerkiz	2880571e6a	minor change	2022-04-08 00:08:40 +02:00
Gerkiz	8177457a5b	fix	2022-04-08 00:04:29 +02:00
Gerkiz	059eafcb11	Merge pull request #243 from ComfyFactory/ws ... template fix	2022-04-07 23:29:03 +02:00
Gerkiz	d274165af5	template fix	2022-04-07 23:27:31 +02:00
Gerkiz	abd7323af8	Merge pull request #242 from ComfyFactory/webhook ... test webhook event	2022-04-07 22:02:43 +02:00
Gerkiz	a5a0dafb2c	test webhook event	2022-04-07 22:00:46 +02:00
Gerkiz	5c0723d8a5	Merge pull request #241 from ComfyFactory/changes ... Changes	2022-04-07 16:19:02 +02:00
Gerkiz	5bbd704438	Added new function to iterate over all connected players	2022-04-07 16:12:47 +02:00
Gerkiz	c048002b7d	gui label fixes	2022-04-07 16:12:34 +02:00
Gerkiz	095895ed81	perlin - made it faster when using in loop	2022-04-07 16:12:25 +02:00
Gerkiz	86ae1d5c9b	fix lua tooltip warnings	2022-04-07 16:11:57 +02:00
Gerkiz	5a6539b6db	fix gui issue	2022-04-07 16:11:26 +02:00
Gerkiz	98d29e73da	mtn v3 - fixes	2022-04-07 16:11:18 +02:00
Gerkiz	38415cead9	player modifiers - limit rpg inventory	2022-04-07 16:11:03 +02:00