2878 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matthew	9595d31665	Merge pull request #837 from SimonFlapse/score-rich-text ... Score GUI - Converted to rich text	2019-03-01 13:31:18 -05:00
SimonFlapse	4f9d004062	Added rich-text-gui	2019-03-01 14:54:36 +01:00
SimonFlapse	e7759b0d37	Converted to rich text ... - Reducing the footprint	2019-03-01 10:18:39 +01:00
Matthew Heguy	d4887834b3	Update to 0.17	2019-02-28 18:39:18 -05:00
Matthew	30809c077a	Merge pull request #806 from plague006/feature/data_manipulation ... Add scenario_data_manipulation	2019-02-28 17:36:40 -05:00
Matthew	6e5b1291a2	Merge pull request #833 from plague006/remove/all-tech ... Remove all-tech command	2019-02-28 17:21:24 -05:00
Matthew	dd9048ed26	Merge pull request #835 from plague006/fix/meltdown ... Don't have meltdown on for all maps	2019-02-28 17:13:56 -05:00
Matthew	e024c436ba	Merge pull request #812 from plague006/17/regenerate_decorative ... [17][Enhancement] Drop unnecessary tables.	2019-02-28 17:08:13 -05:00
Matthew Heguy	15fee1a5ec	Don't put boolean in a table	2019-02-28 16:32:20 -05:00
Matthew	ff0476bd2b	Merge pull request #811 from plague006/17/raise_destroy ... [17][Enhancement] Raise events where appropriate.	2019-02-28 16:27:40 -05:00
Matthew	7896d98fbe	Merge pull request #809 from plague006/17/cheat_items ... [17][Enhancement] Add cheat items to cheats	2019-02-28 16:14:45 -05:00
Matthew Heguy	5a52780b93	Pause game when env_dump is set	2019-02-28 15:05:34 -05:00
Matthew Heguy	3410fa2dd0	Remove all-tech command	2019-02-28 14:48:08 -05:00
Matthew	01d53fdd25	Merge pull request #805 from plague006/fix/admin_commands ... Take offline and invalid players for probation add/remove as well as regular-remove	2019-02-28 12:41:46 -05:00
Matthew	77df5209fd	Merge pull request #804 from SimonFlapse/fix_performance_scale ... Improved performance_scale	2019-02-28 12:37:12 -05:00
Matthew Heguy	97dd73c619	Fix localised string name	2019-02-28 12:35:24 -05:00
Matthew	5779f15752	Merge pull request #814 from plague006/17/error_logging ... [17] Add error_logging	2019-02-28 12:28:47 -05:00
Matthew	ab2b3edb63	Merge pull request #831 from SimonFlapse/Info-fix ... Fixing info GUI	2019-02-28 12:16:41 -05:00
Matthew Heguy	ab6c50e717	Wrap in pcall	2019-02-28 11:48:48 -05:00
plague006	2428a93154	Add error_logging	2019-02-28 11:48:48 -05:00
Matthew	12557f8102	Merge pull request #826 from plague006/fix/walkabout ... Fix walking_state in walkabout	2019-02-28 11:38:14 -05:00
Matthew Heguy	41cd0bffaa	Increase newinfo height	2019-02-28 11:36:28 -05:00
Matthew	38c654421d	Merge pull request #832 from SimonFlapse/Poll-fix ... Fixing poll gui	2019-02-28 11:29:47 -05:00
SimonFlapse	4fbd10543d	Fixed info gui pages ... Tested on all scalings	2019-02-28 15:05:30 +01:00
Matthew Heguy	32baf80cd1	Fix desync risk	2019-02-27 21:30:56 -05:00
Matthew Heguy	2045301baf	Disable word wrapping	2019-02-27 17:44:00 -05:00
Matthew Heguy	9994cbfc7a	Fix unfocused button color, fix width in map info	2019-02-27 16:16:46 -05:00
Matthew	e050bc3251	Merge pull request #830 from SimonFlapse/popup_fix ... Retaining gui size for popups	2019-02-27 15:19:47 -05:00
Matthew	fb586fbfb4	Merge pull request #827 from plague006/fix/redmew_surface ... Fix map gen settings	2019-02-27 15:19:32 -05:00
Matthew Heguy	ba8b4df879	Add doc related to water, add enable_water to grass_only maps (maintaining prior functionality)	2019-02-27 15:10:39 -05:00
SimonFlapse	e613301d8d	Fixed poll styling	2019-02-27 20:09:30 +01:00
SimonFlapse	dbb2bac6d1	Fixed clode button	2019-02-27 17:03:56 +01:00
SimonFlapse	32779ab01a	Fixed REDMEW and small other styles ... I can't seem to fix the rules tab and the scroll-bars. Changing screen resolution and/or changing the gui scale while the gui is open breaks the style. It's fixed by redrawing it	2019-02-27 16:57:17 +01:00
SimonFlapse	650a0d9072	Retaining gui size for popups	2019-02-27 15:49:57 +01:00
SimonFlapse	6015c6c620	Update for 0.17.1	2019-02-27 15:28:47 +01:00
SimonFlapse	fb82e81802	Merge remote-tracking branch 'upstream/develop' into Quadrants	2019-02-27 14:05:46 +01:00
Matthew Heguy	21a3b9cea7	Fix map gen settings	2019-02-26 23:34:49 -05:00
Matthew Heguy	50098ace03	Fix walking_state in walkabout	2019-02-26 20:37:14 -05:00
Matthew Heguy	91be710c78	Add more items	2019-02-26 18:03:57 -05:00
Matthew	cfc85b3b9b	Merge pull request #824 from plague006/fix/mining_speed_buff ... Fix mining speed buff in market	2019-02-26 17:48:12 -05:00
Matthew Heguy	76ae6a1847	Fix mining speed buff in market	2019-02-26 16:31:00 -05:00
Matthew	708f991778	Merge pull request #820 from plague006/items_update ... Update items	2019-02-26 16:05:24 -05:00
Matthew Heguy	014b249f87	Wood gone, raw-wood to wood	2019-02-26 15:45:04 -05:00
Matthew Heguy	08371d5e06	high-tech-science-pack	2019-02-26 14:34:38 -05:00
Matthew Heguy	95ebb4a239	Sciences	2019-02-26 14:25:19 -05:00
Matthew Heguy	09ef833dd2	Remove steel-axe, iron-axe	2019-02-26 14:08:49 -05:00
Matthew	0c2a0a34a8	Merge pull request #819 from grilledham/17/launch_fixes ... 17/launch fixes	2019-02-26 13:51:51 -05:00
grilledham	bd5bbcbd21	removed steel axe from market	2019-02-26 17:38:28 +00:00
grilledham	6a3b0df094	fixes	2019-02-26 17:36:20 +00:00
Matthew	37edcb6751	Merge pull request #816 from plague006/17/player_built_tile ... [17][Fix] Fix for possible nil item in on_player_built_tile	2019-02-26 10:11:23 -05:00