653 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
MewMew	09c7b1417e	bug fix for construction drone anti cheese	2019-07-13 16:17:17 +02:00
MewMew	ec44e88790	Merge remote-tracking branch 'origin/master'	2019-07-13 15:21:33 +02:00
MewMew	dc85d9e266	builders area config option	2019-07-13 15:21:12 +02:00
Gerkiz	4eee9a800d	Update readme.md	2019-07-13 12:33:15 +02:00
MewMew	fd34e86e60	added ability to allow/disallow blueprint importing	2019-07-13 11:48:56 +02:00
MewMew	b57ac944df	config setting for maximum active biters	2019-07-13 11:20:31 +02:00
Gerkiz	ad03423025	Merge pull request #52 from Gerkiz/dev ... Minor update	2019-07-08 23:20:55 +02:00
Gerkiz	8eff12a647	Minor update ... Added local t to player_list.	2019-07-08 23:20:05 +02:00
Gerkiz	df84b96d35	Merge pull request #51 from Gerkiz/dev ... new map, territorial control	2019-07-08 23:13:30 +02:00
Gerkiz	2b76400228	Added safety checks. ... Added: if play_table then if play_table[player.name] then t = play_table[player.name] end end	2019-07-08 23:12:03 +02:00
Gerkiz	1f69e21f11	Uppercase to lowercase	2019-07-08 20:03:57 +02:00
Gerkiz	ad24fd3db2	new map, territorial control	2019-07-08 16:56:19 +02:00
Gerkiz	042f3734be	Merge pull request #50 from Gerkiz/dev ... removed global.trusted	2019-07-07 18:20:25 +02:00
Gerkiz	c33a43e3c7	removed global.trusted ... added local trusted[player.name] table instead...	2019-07-07 18:18:31 +02:00
Gerkiz	ef9f2a66c6	Merge pull request #49 from Gerkiz/dev ... Fixed desync	2019-07-07 13:01:09 +02:00
Gerkiz	42fc25df49	Fixed desync ... Added them at the top which made the game desync, fixed now...	2019-07-07 13:00:50 +02:00
Gerkiz	9be4651eec	Merge pull request #48 from Gerkiz/dev ... Minor changes	2019-07-07 11:58:03 +02:00
Gerkiz	9aebd69382	Minor changes ... Removed global.trusted_player and made it local. Removed some minor things that I forgot when doing the overhaul.	2019-07-07 11:52:12 +02:00
Gerkiz	2d98b4b0af	Merge pull request #47 from Gerkiz/dev ... Minor change	2019-07-07 02:08:16 +02:00
Gerkiz	4af6aa4be7	Minor change ... Fixed an error: player time could be abused by reconnecting.	2019-07-07 02:07:50 +02:00
Gerkiz	bca457e0ed	Removed unused local	2019-07-06 23:59:27 +02:00
Gerkiz	23701c8e5e	Merge pull request #46 from Gerkiz/dev ... Minor changes	2019-07-06 23:46:05 +02:00
Gerkiz	34fd511970	Minor changes ... Instead of player tables, the values are stored as numbers inside playersession. Added also if player is playing singleplayer then create the player.name is directly on player_join created in the playsession table.	2019-07-06 23:44:27 +02:00
Gerkiz	fc7eccf070	Minor fix ... If the player does not exist within the dataset then create it with online_time as value.	2019-07-06 20:34:33 +02:00
Gerkiz	eb99c9237e	Merge pull request #45 from Gerkiz/dev ... Major overhaul to player sessions	2019-07-06 17:06:46 +02:00
Gerkiz	2ad8db371a	Major overhaul to player sessions ... Removed all local files for player session. Player sessions are now fetched from the scenario-data.	2019-07-06 16:38:03 +02:00
MewMew	55b9b4c3e9	playtimes	2019-07-04 20:05:46 +02:00
Gerkiz	f788e768ce	Fixed /trust /untrust ... The server couldn't run these commands, crashed when used. Now works.	2019-07-04 18:56:45 +02:00
Gerkiz	b86879df91	Minor change to show_health ... Edit: Fixed to it doesn't trigger when the player dies.	2019-07-04 00:11:54 +02:00
Gerkiz	a55f882b7c	Update show_health.lua ... Fixed to it doesn't trigger when the player dies.	2019-07-03 21:29:31 +02:00
Gerkiz	cedffd65a8	Merge pull request #44 from Gerkiz/dev ... Minor changes to server.lua	2019-06-30 20:59:32 +02:00
Gerkiz	acb57960a6	Minor changes to server ... Added so it prints to discord what the player was killed by.	2019-06-30 20:58:39 +02:00
Gerkiz	a0a35d85d0	Merge pull request #43 from Gerkiz/fix_trust_untrust ... Fixed the trusted command	2019-06-29 10:15:23 +02:00
Gerkiz	b7ae14081d	Fixed the trusted command ... It would crash if you didn't have a player name.	2019-06-29 10:13:52 +02:00
Gerkiz	b662d097b5	Merge pull request #42 from Gerkiz/master ... chatbot.lua	2019-06-25 08:59:50 +02:00
Gerkiz	de679e5109	chatbot.lua ... Removed so when an admin trusts a player, [ADMIN] isn't shown to the user who ran the command.	2019-06-25 08:57:16 +02:00
Gerkiz	a14e85ee41	Merge pull request #39 from Gerkiz/trust_untrust ... added command /trust and /untrust	2019-06-24 20:38:40 +02:00
Gerkiz	0c0b29eff9	Merge pull request #41 from Gerkiz/satellite_score ... changes satellite score	2019-06-24 20:29:44 +02:00
Gerkiz	72d4a4e791	changes satellite score ... sends only message if (global.satellites_in_space < 10) or ((global.satellites_in_space < 50) and ((global.satellites_in_space % 5) == 0)) or ((global.satellites_in_space % 25) == 0)	2019-06-24 20:27:12 +02:00
Gerkiz	50b91aa23c	minor changes ... added so it only prints the message to admins	2019-06-24 19:57:24 +02:00
MewMew	9a8037b27f	Merge pull request #40 from Gerkiz/cave_choppy ... Added cave_choppy	2019-06-24 18:57:14 +02:00
MewMew	98cb656e34	tweaks	2019-06-24 18:54:29 +02:00
Gerkiz	61a2b04f7f	Added cave_choppy.cave_miner to control.lua	2019-06-24 13:29:30 +02:00
Gerkiz	bf4b8baf22	Added cave_choppy ... Multi surfaces with cave_miner and choppy.	2019-06-24 13:22:35 +02:00
Gerkiz	07b9d1e6c8	Revert "Added CaveChoppy" ... This reverts commit 418400b301.	2019-06-24 13:20:57 +02:00
Gerkiz	418400b301	Added CaveChoppy ... Multi surfaces with cave_miner and choppy.	2019-06-24 13:20:44 +02:00
Gerkiz	bd30fb4827	added command /trust and /untrust	2019-06-24 13:12:13 +02:00
MewMew	4a44a3dc45	room tweaks	2019-06-18 17:12:54 +02:00
MewMew	e80864933c	update	2019-06-18 16:34:01 +02:00
MewMew	d4f1cd6e53	tweaks	2019-06-17 18:58:06 +02:00