2627 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
theorangeangle	d6495dcc47	added mapgen settings	2019-02-18 16:04:55 -06:00
plague006	b7f51cf10a	Fix spacing	2019-02-18 16:56:32 -05:00
theorangeangle	211e751854	removed flamethrowers from market	2019-02-18 15:45:29 -06:00
theorangeangle	a1cff8cd8e	enabled coin drops from biters/spitters and hydra mode	2019-02-18 15:25:01 -06:00
theorangeangle	fd826826d7	fixed market items	2019-02-18 15:06:16 -06:00
theorangeangle	afb07c0e11	it works but the market stuff still needs a fix	2019-02-18 12:36:45 -06:00
plague006	0155498a20	Load apocalypse	2019-02-18 01:56:36 -05:00
plague006	0c5ba99147	Add success, warning, fail colors as well as comments about which ranks are which numbers	2019-02-18 01:51:58 -05:00
plague006	8ccfe43cef	Make lifecycle more readable.	2019-02-18 01:43:59 -05:00
plague006	00991ba5c4	Remove standard market from 1000x	2019-02-18 01:17:14 -05:00
plague006	7f53ad171d	After init, check if loaders should be enabled.	2019-02-18 01:16:33 -05:00
Matthew	06915dd5bb	Merge pull request #744 from plague006/1000x ... Add 1000x	2019-02-18 00:50:08 -05:00
plague006	034745971d	New year, new banner	2019-02-17 22:24:40 -05:00
plague006	b99bf99c4f	Toast-all to toast	2019-02-17 11:55:01 -05:00
Matthew	e9a27f5151	Merge pull request #767 from grilledham/player_list/sort_donators ... sort donators	2019-02-17 11:54:12 -05:00
grilledham	d622712f1f	sort donators	2019-02-17 15:56:18 +00:00
Matthew	18976ee541	Merge pull request #765 from plague006/fix/jail_bug_in_train ... Fix bug preventing jailing of a player in a train	2019-02-17 04:25:21 -05:00
plague006	169db650d1	Fix bug preventing jailing of a player in a train	2019-02-17 04:12:12 -05:00
plague006	70d11a46ae	Small optimizations, doc refining, scope narrowing	2019-02-17 00:32:43 -05:00
plague006	7c29683b2e	Split commands into their respective modules	2019-02-16 21:24:28 -05:00
plague006	e4eff300f2	Add toast command	2019-02-16 20:14:04 -05:00
Matthew	52ef181117	Merge pull request #763 from plague006/disable_command_search ... Disable command search, and autoformat	2019-02-16 20:12:22 -05:00
plague006	b4b1bd21c0	Disable command search, and autoformat	2019-02-16 20:06:15 -05:00
Matthew	2b18c30949	Merge pull request #760 from grilledham/print_override ... print override to own module	2019-02-16 18:16:25 -05:00
grilledham	03b81f4221	Switch to log to allow localized strings	2019-02-16 18:15:50 -05:00
plague006	0ae4cbcf0c	Get rid of deep copy	2019-02-16 18:12:49 -05:00
Matthew	e508c9133c	Merge pull request #743 from plague006/create_market_on_launch ... Create market on launch	2019-02-16 17:01:51 -05:00
Matthew	b8d47b73d5	Merge pull request #755 from plague006/fix/command_locale ... Change command feedback and help text to use locale	2019-02-16 17:01:35 -05:00
Matthew	9587c37926	Merge branch 'develop' into fix/command_locale	2019-02-16 17:01:09 -05:00
Matthew	3526ccf1e4	Merge pull request #756 from plague006/fix/apocalypse_hail_hydra_desync ... Fix/apocalypse hail hydra desync	2019-02-16 16:48:41 -05:00
plague006	600d6b8865	Clean up conditions, change countdown time ... Prevent additional saves after apocalypse is active. Give feedback when running command after it is active.	2019-02-16 16:46:18 -05:00
Matthew	b394d74b3c	Merge pull request #761 from plague006/fix/unjail_from_report ... Fix unjail from report not working	2019-02-16 15:24:27 -05:00
plague006	24d2ad8c6b	Improve fix	2019-02-16 15:11:33 -05:00
plague006	af179c7189	Fix unjailing player not in jail	2019-02-16 15:09:04 -05:00
Matthew	4c9b093d0a	Merge pull request #759 from grilledham/player_list/left_align_rank ... left align rank cells	2019-02-16 14:50:20 -05:00
plague006	4f7236d390	Fix merge/compatibility with other changes.	2019-02-16 14:09:50 -05:00
plague006	d8fea761f8	Add missing layer of table	2019-02-16 14:03:58 -05:00
plague006	a9e4e23024	Balance changes for variable tech costs	2019-02-16 13:58:27 -05:00
plague006	f05c02da81	Hacky fix for how event handles unjailing via the button	2019-02-16 13:43:48 -05:00
plague006	f691c0d67f	Fix unjail button calling wrong function	2019-02-16 13:09:39 -05:00
plague006	63ccee13c1	Update doc for tetris	2019-02-16 12:49:26 -05:00
grilledham	17d799224c	print override to own module	2019-02-16 12:57:10 +00:00
grilledham	e44658d15a	left align rank cells	2019-02-16 12:24:54 +00:00
Matthew Heguy	da7e0a1b06	Fix merge	2019-02-16 00:01:45 -05:00
plague006	72f68b95a0	Add maps that don't want automatic markets	2019-02-16 00:00:50 -05:00
plague006	f20e4c6247	Add market location config options	2019-02-16 00:00:50 -05:00
plague006	39ad01b3fb	Fix doc for redmew_surface use	2019-02-16 00:00:24 -05:00
plague006	35af187e63	Autoformat	2019-02-16 00:00:24 -05:00
Matthew Heguy	e4abc69bf2	Merge for rebase	2019-02-16 00:00:18 -05:00
Matthew	d0ccce4033	Merge pull request #757 from plague006/donator_transition ... Have donator handle string and table.	2019-02-15 12:03:54 -05:00