3050 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Gerkiz	4ce2342629	rpg - revert inventory bonus	2022-04-07 16:10:40 +02:00
Gerkiz	096cb77cdb	Merge pull request #240 from ComfyFactory/mtn_v3 ... Fix laggy module and make terrain randomized in Mtn v3	2022-04-07 00:19:09 +02:00
Gerkiz	03d681e29c	mtn v3 -make terrain randomized	2022-04-07 00:17:41 +02:00
Gerkiz	73c0c7f2be	remove unused module	2022-04-07 00:16:16 +02:00
Gerkiz	8cb713af67	fix laggy module	2022-04-07 00:10:58 +02:00
Gerkiz	b19daf9b76	Merge pull request #239 from ComfyFactory/aoe_punch ... rename one punch to aoe punch	2022-04-05 20:04:07 +02:00
Gerkiz	29b865fe3b	rename one punch to aoe punch	2022-04-05 20:02:13 +02:00
Gerkiz	061f6a3d15	Merge pull request #238 from ComfyFactory/refactor_gui ... Refactor gui	2022-04-05 19:44:32 +02:00
Gerkiz	82affb25dd	minor fix	2022-04-05 19:41:44 +02:00
Gerkiz	dbe79dcdfd	minor change	2022-04-05 19:39:01 +02:00
Gerkiz	95f2e90e55	refactor more gui	2022-04-05 19:28:08 +02:00
Gerkiz	f74e99f3f4	refactor gui	2022-04-05 19:27:46 +02:00
Gerkiz	a51d361824	tweaks and changes	2022-04-05 12:00:13 +02:00