33 Commits

Author	SHA1	Message	Date
Andrii Danylchenko	8b964be71f	Merge pull request #1111 from GermanAizek/develop ... Code refactor and fix condition bug	2022-11-15 09:23:16 +02:00
lainon	7fdad4e0f6	Code refactor following C++ standard and condition fixes	2022-11-15 03:20:55 +03:00
Sergei Trofimovich	560c528ec8	mapeditor/mainwindow.cpp: use '%s' (not '%b') for string formatter ... mapeditor/mainwindow.cpp: In member function 'void MainWindow::onSelectionMade(int, bool)': mapeditor/mainwindow.cpp:1014:47: warning: format '%b' expects argument of type 'unsigned int', but argument 3 has type 'const char*' [-Wformat=] 1014 | auto info = QString::asprintf( "Selection on layer %d: %b", level, anythingSelected ? "true" : "false"); ^~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | const char*	2022-11-05 20:25:51 +00:00
Andrey Filipenkov	7dcd910877	add Linux icons for the map editor ... Co-authored-by: SoundSSGood <87084363+SoundSSGood@users.noreply.github.com>	2022-10-22 23:03:01 +03:00
Andrey Filipenkov	278e6bedeb	[Linux] add proper desktop entry for the map editor	2022-10-22 17:08:55 +03:00
nordsoft	fe942902df	Fix road bug	2022-10-17 02:23:26 +04:00
nordsoft	9ead21326a	Partially implement seerhuts	2022-10-17 01:16:27 +04:00
nordsoft	d9819d3a20	Attempt to fix compilation	2022-10-16 15:37:01 +04:00
nordsoft	5bac36ba38	Attempt to fix compilation	2022-10-16 14:22:34 +04:00
nordsoft	4b0815d9db	Attempt to fix compilation	2022-10-16 13:49:47 +04:00
nordsoft	3de6569dab	Fix rewards nullptr bug	2022-10-16 03:42:21 +04:00
nordsoft	cd28a0791b	Fix rewards bug	2022-10-16 03:26:19 +04:00
nordsoft	dd463ca95a	Add seerhut rewards	2022-10-16 03:20:24 +04:00
nordsoft	36b87689f9	Enable editor for 32bit platform	2022-10-16 00:20:21 +04:00
nordsoft	29b2a81442	Fix compilation	2022-10-13 01:58:49 +04:00
nordsoft	b4a806d7fa	Code polishing	2022-10-13 01:51:55 +04:00
nordsoft	d7de9accee	Fix code review problems	2022-10-13 01:40:52 +04:00
nordsoft	d3d1306ef0	Address part of feedback	2022-10-09 00:32:02 +04:00
nordsoft	2eb49315f5	Fix terrains/roads/rivers after code synch	2022-10-09 00:11:29 +04:00
nordsoft	6d92a66fea	Fix compilation with latest develop	2022-10-08 23:54:45 +04:00
Nordsoft91	23f80c58dc	Apply suggestions from code review ... Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>	2022-10-08 22:55:15 +04:00
nordsoft	bc84ffe8d6	Code review changes	2022-09-25 00:55:05 +04:00
nordsoft	700e957cdb	Some code cleaning up	2022-09-25 00:53:57 +04:00
nordsoft	061ac414e8	Incorporate changes with scripting	2022-09-22 19:22:31 +04:00
nordsoft	6817cfe2bc	Some automation	2022-09-20 03:34:07 +04:00
nordsoft	7d58ede8a9	Revert "Auxiliary commit to revert individual files from c08fce4d65313cb862ea404199be323dcd5c3fd2" ... This reverts commit 1e21c0893404a6ec75c2699213cfb6725c21d4de.	2022-09-20 02:42:12 +04:00
nordsoft	3a2951b329	Fix events visibility	2022-09-20 02:39:26 +04:00
nordsoft	c08fce4d65	Fix map export	2022-09-20 02:38:10 +04:00
nordsoft	097fe2584b	Use ptr to identify rmg template	2022-09-19 03:17:39 +04:00
nordsoft	c348c1a053	Revert "Load template name from user settings" ... This reverts commit 73cc606ee2. # Conflicts: # lib/rmg/CRmgTemplateStorage.cpp # lib/rmg/CRmgTemplateStorage.h # mapeditor/windownewmap.cpp	2022-09-19 02:46:01 +04:00
nordsoft	3aa19f92a0	Add seed option to rmg	2022-09-19 02:42:38 +04:00
nordsoft	0563828763	Fix hero initialization for random map	2022-09-18 03:44:52 +04:00
nordsoft	0b9f601d2c	Squashing editor	2022-09-18 03:23:17 +04:00