21158 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
tri4ng1e	9126e844bf	Use data paths from config (bug #4412)	2018-05-11 17:24:36 +03:00
Marc Zinnschlag	b7cce1a665	Merged pull request #1702	2018-05-11 10:11:17 +02:00
Marc Zinnschlag	6630a02c3f	updated credits file	2018-05-11 09:56:44 +02:00
Kyle Cooley	d78ae4bab4	Allow the clang build to fail for now	2018-05-10 21:19:41 -04:00
Kyle Cooley	6c7d73af7f	Bump c++ standard version to 14	2018-05-10 19:01:22 -04:00
David Cernat	c00b3bbe97	[Documentation] Update credits	2018-05-11 01:10:53 +03:00
Kyle Cooley	cf5bd0dca7	Travis: use qt5, newer boost libraries, callff, gcc/clang builds...	2018-05-10 18:02:45 -04:00
David Cernat	57b791ea2a	[Client] Show selected object's refNum & mpNum in console window title ... This allows for much easier debugging of all objects and actors.	2018-05-11 00:46:24 +03:00
Nelsson Huotari	49ae5bc75c	List initialization -> initialization in constructor	2018-05-10 22:57:48 +03:00
Nelsson Huotari	1c79d5311c	Brush history menu	2018-05-10 21:58:36 +03:00
Nelsson Huotari	d2cf764a46	Tooltips, fixes	2018-05-10 15:01:53 +03:00
Nelsson Huotari	62066f01bd	clean-up	2018-05-10 11:18:54 +03:00
Nelsson Huotari	d33c98c68d	Revert unintended changes	2018-05-10 11:18:54 +03:00
Nelsson Huotari	5656745445	Select dragged texture-assets, add brush settings widget-type, fixes.	2018-05-10 11:18:54 +03:00
Nelsson Huotari	baa707b5e3	User setting for selective cell editing or new land creation	2018-05-10 11:18:54 +03:00
Nelsson Huotari	24977fcc0f	improve hit calculation accuracy for texture editing	2018-05-10 11:18:54 +03:00
Nelsson Huotari	e8a9bff85c	Drop textures to landtextures from assets (try-method)	2018-05-10 11:18:54 +03:00
Nelsson Huotari	7139889566	Brush button window opens at modebutton, slider 1-50, doxygen comments	2018-05-10 11:18:54 +03:00
Nelsson Huotari	20d1d8ac89	Fixed brush calculations, implement undostack macro when clicked.	2018-05-10 11:18:54 +03:00
Nelsson Huotari	5f3c8b2b99	c_str -> fromStdString, remove TextureBrushButton class	2018-05-10 11:18:54 +03:00
Nelsson Huotari	cf7a0f715e	Command macro for complete drag-editing operations.	2018-05-10 11:18:54 +03:00
Nelsson Huotari	9f742d5b1f	Brush affects adjancent cells	2018-05-10 11:18:54 +03:00
Nelsson Huotari	1ca2710a2a	Formatting, fixes	2018-05-10 11:18:54 +03:00
Nelsson Huotari	1c113eca9c	15 to landTextureSize-1	2018-05-10 11:18:54 +03:00
Nelsson Huotari	3327d6f7c4	Drag terrain painting, code cleanup	2018-05-10 11:18:54 +03:00
Nelsson Huotari	a54a1b9940	Command system and undo	2018-05-10 11:18:54 +03:00
Nelsson Huotari	cc415526b0	fix texture index +1, better icons	2018-05-10 11:18:54 +03:00
Nelsson Huotari	316d05bdc4	{} to ()	2018-05-10 11:18:54 +03:00
Nelsson Huotari	4649d1258c	Direct data terrain editing	2018-05-10 11:18:54 +03:00
Nelsson Huotari	4ae75d1d20	Terrain texture brush frame	2018-05-10 11:18:54 +03:00
David Cernat	12727b66ea	[Server] Use consistent variable names in map tile script functions	2018-05-10 07:44:08 +03:00
David Cernat	7f00005f04	[Client] Fix GCC build ... Based on 71040659ac	2018-05-10 07:16:33 +03:00
Alf Henrik Sauge	d4f278a113	Replacing tab with spaces	2018-05-09 18:02:02 +02:00
David Cernat	32d71de2f5	Update MapWindow every frame, not just when it's open (bug #4279)	2018-05-09 07:33:45 +03:00
Alf Henrik Sauge	feeee50a88	Dropping a separate NPDTstruct12 object and instead use NPDTstruct52 ... NPDTstruct12 is now only used when loading and saving. Turning auto calc on and off now no longer switches between to different set of values	2018-05-09 00:25:07 +02:00
tri4ng1e	103a07b744	Less cryptic abbreviations	2018-05-08 18:32:06 +03:00
Marc Zinnschlag	3197ebd8e7	Merged pull request #1694	2018-05-08 12:19:14 +02:00
David Cernat	715012f087	[General] Implement sending of image data for map tiles in PlayerMap	2018-05-08 05:57:04 +03:00
Andrei Kortunov	2f89080b36	Load default markers definitions in editor	2018-05-07 22:32:04 +04:00
Andrei Kortunov	b15bed8e22	Avoid excessive loadSound calls	2018-05-07 20:40:53 +04:00
tri4ng1e	905cde10db	Smart-sorting in iniimporter (time + dependency)	2018-05-07 15:51:46 +03:00
Marc Zinnschlag	53b6ef6f8c	minor code cleanup	2018-05-07 09:54:42 +02:00
Marc Zinnschlag	57ee5f9b53	updated credits file	2018-05-07 09:51:09 +02:00
Marc Zinnschlag	e661e3cf74	Merged pull request #1677	2018-05-07 09:42:41 +02:00
Marc Zinnschlag	f5f8f62e8e	updated credits file	2018-05-07 09:34:46 +02:00
Marc Zinnschlag	a255bdebd4	Merged pull request #1700	2018-05-07 09:33:44 +02:00
Nelsson Huotari	a2745683e6	new run icon	2018-05-06 22:30:01 +03:00
Alf Henrik Sauge	9b971caddc	CSVTools::ReportTable should now have case insensitive sorting	2018-05-06 16:49:23 +02:00
Andrei Kortunov	17222eb821	Get rid of unnecessary find	2018-05-06 16:42:05 +04:00
Bret Curtis	c44f87afd1	Merge pull request #1699 from Capostrophic/editorwarnings ... Editor verifier updates	2018-05-06 10:57:24 +02:00