507 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Valansch	6c92122de1	moved preset data into map_gen/data/presets #152	2018-01-19 23:10:20 +01:00
Valansch	d3b31a5894	moved map_gen.lua to map_gen/shared/generate.lua. Also fixed typo	2018-01-19 22:33:54 +01:00
Valansch	fbe97925c3	map_gen/combined/grilledham_map_gen/data/ ==> map_gen/data/ #152	2018-01-19 22:11:36 +01:00
Valansch	c2bba1bf29	moved presets into map_gen/presets/ #152	2018-01-19 22:09:03 +01:00
Maik Wild	dd1f298a31	locale/gen_[...] ==> map_gen/[...] #152	2018-01-19 15:18:01 +01:00
Maik Wild	66e5d2ae0e	locale/utils/ ==> utils/ #152	2018-01-19 15:08:48 +01:00
Maik Wild	daa9f0e892	moved map_previews #152	2018-01-19 15:04:54 +01:00
Maik Wild	26d9bbb878	locale/resources/ ==> resources/	2018-01-19 15:03:41 +01:00
Maik Wild	386f4f312f	_locale/ ==> locale/ #152	2018-01-19 15:02:08 +01:00
Maik Wild	59c5618034	replaced / with . in file paths #152	2018-01-19 15:01:06 +01:00
Maik Wild	f63050c1a4	Removed unused files #152	2018-01-19 15:00:07 +01:00
Valansch	109554c91a	Merge pull request #151 from grilledham/map_lines_and_balls ... Map lines and balls	2018-01-18 15:31:04 +01:00
Valansch	76a2d7fe4e	Merge pull request #149 from grilledham/action_queue_changes ... Action queue changes	2018-01-18 15:30:44 +01:00
grilledham	fce709cfd0	commented out map, in map_layout	2018-01-17 14:44:21 +00:00
grilledham	b34c970bd6	Added a map preview folder	2018-01-17 12:08:05 +00:00
grilledham	1006984824	removed old code	2018-01-17 11:59:55 +00:00
grilledham	e5af112ec4	removed commented out lines	2018-01-16 20:35:30 +00:00
grilledham	393de1f999	added lines and balls map	2018-01-16 16:57:54 +00:00
grilledham	0b5a2ed09d	corrected typo	2018-01-15 17:28:10 +00:00
grilledham	66483f5a52	added map_gen_not_threaded	2018-01-15 17:25:46 +00:00
grilledham	10d9023457	change map gen to use actions that are reused	2018-01-15 17:25:29 +00:00
grilledham	4585779a6b	Allow actions in thread_queue to be kept alive if they return true	2018-01-15 17:24:48 +00:00
grilledham	ad1877ece7	Added helpful comments to template	2018-01-15 17:23:36 +00:00
Valansch	215d68c946	Merge pull request #148 from Valansch/dev_usergroups_autoupdate_cleanup ... Dev usergroups autoupdate cleanup	2018-01-09 20:49:26 +01:00
Valansch	8ce0010022	Merge pull request #147 from Valansch/reenable_on_tick ... Reenable on tick	2018-01-09 20:49:14 +01:00
Valansch	0d4acf5951	Merge pull request #146 from Valansch/dev_antigrief_fix ... fixed that antigrief would kick players nading ghosts	2018-01-09 20:48:32 +01:00
Valansch	36e0db3487	Fixed typo	2018-01-07 23:28:55 +01:00
Valansch	562bd6bd5e	removed deprecated user groups code again?	2018-01-07 22:28:00 +01:00
Valansch	f66765bcf5	enabled on_tick stuff again	2018-01-07 11:20:57 +01:00
Valansch	9d491f7cac	fixed that antigrief would kick players nading ghosts	2018-01-07 11:14:36 +01:00
Valansch	eedfcb49fa	Merge pull request #143 from Valansch/dev_anti_grief_tools ... Dev anti grief tools	2017-12-29 15:34:47 +01:00
Valansch	8d138c6526	Merge pull request #142 from Valansch/dev_artillery_control ... implemented auto kick/ban	2017-12-29 15:34:25 +01:00
Triston	c4477fed7a	Merge pull request #144 from Valansch/island_0.16_tweaks ... Tile/Entity name 0.16 port	2017-12-28 18:33:34 -05:00
Maik Wild	9bf96adac3	made allowed_to_nuke not accept strings	2017-12-28 23:03:50 +01:00
Maik Wild	468878b289	stone-rock ==> rock-big	2017-12-28 22:53:39 +01:00
Maik Wild	d98022947b	added a dismembered hooker	2017-12-28 22:47:41 +01:00
Maik Wild	85a310847e	removed red planet	2017-12-28 22:45:49 +01:00
Maik Wild	ba1f81c3e6	Renamed rocks and grass to 0.16 compatibe names	2017-12-28 22:45:27 +01:00
Maik Wild	b50f1b68af	added build.sh to gitignore	2017-12-28 21:54:43 +01:00
Maik Wild	1dd02d2e76	changed additional variable names from sand-1 to sand	2017-12-28 21:54:19 +01:00
Maik Wild	9cffe0e5e8	further tile name changes	2017-12-28 21:32:22 +01:00
Maik Wild	adda0b94a5	fixed missing )	2017-12-28 21:02:36 +01:00
Maik Wild	3163d8c4e8	Added log output in case of error in Thread.lua	2017-12-28 20:55:45 +01:00
Maik Wild	8207c277bb	fixed accidental name changes	2017-12-28 20:53:48 +01:00
Maik Wild	13bd4969f0	ported tile names from 0.15 to 0.16	2017-12-28 19:11:25 +01:00
Maik Wild	e52341219a	island resort: implemented run_chart_update. Ported commit 68397ed7f96	2017-12-28 18:17:29 +01:00
Maik Wild	5846f1c3c5	removed artillery remote from market	2017-12-27 01:38:21 +01:00
Maik Wild	5e2a47bc19	fixed that antigrief would kick players for using fish	2017-12-27 01:33:29 +01:00
Maik Wild	6c16927d66	fixed capsule use resulting in ban	2017-12-26 00:09:32 +01:00
Maik Wild	63408254cf	fix /kill crash #125	2017-12-25 23:09:40 +01:00