524 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Valansch	f4b87078e9	Merge pull request #98 from Valansch/develop_nextmap ... Adding missing maps and updating the first market	2017-10-25 12:35:52 +02:00
TWLTriston	827e7d0455	Grass drawing fix	2017-10-25 06:25:56 -04:00
Valansch	2745b80ce8	Dimentions: Implemented Portal and different surfaces	2017-10-25 01:51:49 +02:00
Valansch	d709f53ad3	brought back ghosts	2017-10-25 01:51:15 +02:00
TWLTriston	8f2ceaa383	Updates to allow threaded to run faster and fixed dagobah to be threaded	2017-10-23 07:24:05 -04:00
TWLTriston	ce54d23d5c	Threaded updates	2017-10-23 06:45:46 -04:00
TWLTriston	87b933a9bc	Adding missing maps and updating the first market	2017-10-23 06:27:36 -04:00
TWLTriston	2dfaa43d0c	Initial start of cleanup for swamp threaded	2017-10-22 22:07:32 -04:00
Valansch	3a710c10a5	took out log(message)	2017-10-23 02:06:47 +02:00
Valansch	e578416b23	Merge pull request #97 from Valansch/user_groups_output_format_change ... Changed user groups output format	2017-10-23 01:32:10 +02:00
Valansch	dff94ed033	Changed user groups output format	2017-10-23 01:30:39 +02:00
Maik Wild	05f78d6ce6	Merge branch 'temp_ban_temp_fix' into develop	2017-10-22 13:26:11 +02:00
Maik Wild	538e5fdaa9	changed tempban erros to player_print	2017-10-22 13:25:51 +02:00
Triston	e051c09d3e	Merge pull request #96 from Valansch/temp_ban_temp_fix ... Temp ban temp fix	2017-10-21 21:06:54 -04:00
Maik Wild	e0c710107a	Added debug text	2017-10-21 23:58:35 +02:00
Maik Wild	8014be1735	Please-dont-crash-the-server-tempban-fix	2017-10-21 23:55:07 +02:00
Valansch	8bced79fdf	Merge pull request #95 from Valansch/develop_red_stutter ... Red planet is now threaded	2017-10-21 23:44:38 +02:00
TWLTriston	98820ddeb2	Red planet is now threaded	2017-10-21 07:14:50 -04:00
Valansch	c0a6303493	Merge pull request #94 from Valansch/develop_mona_lisa ... Updated regulars, added mona lisa gen	2017-10-19 02:25:35 +02:00
Valansch	8d1f2cf362	Fixed ore module after terrain module	2017-10-19 02:24:17 +02:00
TWLTriston	8e38ebc8ed	Updated regulars, added mona lisa gen	2017-10-18 05:29:49 -04:00
Valansch	59bf78b489	Merge pull request #93 from Valansch/develop_fish_economy ... Additional fish market items, and add ons to the player gui	2017-10-15 16:21:00 +02:00
TWLTriston	db41043817	Local round 2	2017-10-15 10:17:04 -04:00
TWLTriston	7e8d123932	Localizing	2017-10-15 10:15:15 -04:00
Valansch	dfc132742e	Merge pull request #92 from Valansch/develop_mines ... Develop mines	2017-10-15 16:10:24 +02:00
Valansch	bcdbfe4eed	added death messages to mines.lua	2017-10-15 16:07:11 +02:00
Valansch	7b4d805505	Fixed tempban crash (hopefully)	2017-10-15 15:57:25 +02:00
TWLTriston	8fce21c50a	Compressing the width of player list	2017-10-15 09:56:51 -04:00
TWLTriston	a134d633e1	Added steel axe and removed debug messages	2017-10-15 07:57:32 -04:00
TWLTriston	f4f644d721	Additional ways to earn fish by contributing to the factory	2017-10-15 07:33:51 -04:00
TWLTriston	3d6a105dd2	Additional fish market items, and add ons to the player gui	2017-10-15 06:58:24 -04:00
Valansch	735c6b718a	updated worms to call using string	2017-10-15 01:54:20 +02:00
Valansch	0d840b6e14	implemented mines	2017-10-15 01:53:39 +02:00
Valansch	348096bb87	Merge branch 'develop_island_threaded' into develop ... # Conflicts: # locale/gen_combined/island_resort.lua	2017-10-14 23:47:36 +02:00
TWLTriston	4ea1c60465	Updated regular's list	2017-10-14 05:19:18 -04:00
TWLTriston	628b9d94b3	Changed setTiles to happen in one hit to avoid chunk edge problems	2017-10-11 11:37:03 -04:00
TWLTriston	41dbaeaa5f	Changes to Island to Threaded	2017-10-11 11:01:27 -04:00
Valansch	65fd551e27	Merge pull request #86 from Valansch/develop_borg_threaded ... Conversion of borg planet to threaded generation	2017-10-11 16:58:34 +02:00
Valansch	ef091f42f2	Merge pull request #85 from Valansch/dev_island_resort ... Cleanup to island resort code, elseifs and whitespace mostly.	2017-10-11 16:58:09 +02:00
TWLTriston	ad58b95d68	pulled the mined item code out to determine if that is causing on death desyncs	2017-10-10 13:24:24 -04:00
TWLTriston	d7ba450760	Additional updates to the way callbacks are handled, using "STRING" names instead of serializing the function seems to resolve the desync issues.	2017-10-10 12:21:04 -04:00
Triston	1949a9eb86	Merge pull request #84 from Valansch/dev_worms ... Dev worms	2017-10-10 06:41:45 -04:00
TWLTriston	d6149e0fab	Conversion of borg planet to threaded generation	2017-10-10 06:35:30 -04:00
TWLTriston	cbf618327c	Cleanup to island resort code, elseifs and whitespace mostly. ... Overall -- did not affect game stutter, however code is playtested.	2017-10-06 04:03:02 -04:00
Triston	2a42074a89	Merge pull request #83 from Valansch/dev_async_worker ... Implemented Thread.queue_action	2017-10-06 04:00:10 -04:00
Valansch	059a80bbe6	Implemented worms	2017-10-06 02:14:38 +02:00
Valansch	adbb1b36be	Implemented Thread.queue_action	2017-10-06 02:13:56 +02:00
Triston	8a678bdd4a	Merge pull request #82 from Valansch/temp_ban ... Temp ban	2017-10-05 19:01:33 -04:00
Triston	5d0adb671f	Merge pull request #81 from Valansch/dev_autodecon ... Fixed pumpjack deconstruction and miners not deconstructing next to w…	2017-10-05 19:00:25 -04:00
Valansch	4494fc0a6c	Changed Animal case	2017-10-06 00:43:55 +02:00