1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-04 09:42:40 +02:00
Commit Graph

33 Commits

Author SHA1 Message Date
Nordsoft91
ea33fed15c
Merge branch 'develop' into editor-lasso 2023-01-16 21:04:44 +04:00
Ivan Savenko
d9aab0a847
Merge pull request #1318 from IvanSavenko/translate_mapeditor
Translate mapeditor
2023-01-09 21:25:09 +02:00
Ivan Savenko
7a8d85e023 Fix formatting 2023-01-07 16:51:03 +02:00
Ivan Savenko
7a35bcc812
Merge pull request #1221 from IvanSavenko/warnings_fix
Fix remaining compiler warnings
2022-12-29 21:51:55 +02:00
Ivan Savenko
ad7944bb83 Fix loading of translations 2022-12-29 17:45:32 +02:00
nordsoft
954ea9d5a9 Implement lasso brush 2022-12-28 01:14:10 +04:00
Nordsoft91
37d1e1e748
Merge pull request #1277 from Nordsoft91/editor-cutcopypaste 2022-12-27 17:28:39 +04:00
Ivan Savenko
9598809995 Fix leftover code copy 2022-12-26 23:33:48 +02:00
Ivan Savenko
a3ee8bb47f Mapeditor will load selected translation on start 2022-12-26 23:29:42 +02:00
Ivan Savenko
eb20a4b208 Merge remote-tracking branch 'vcmi/develop' into warnings_fix 2022-12-23 14:40:45 +02:00
nordsoft
3a49bc6f8b Fix icons path for macOS if editor started from installed package 2022-12-21 23:03:17 +04:00
Ivan Savenko
db2a40600d Fixed some of the warnings detected by CI run 2022-12-08 23:20:42 +02:00
Ivan Savenko
3219e322ae Fixed all non-silenced gcc/clang warnings 2022-12-07 18:05:47 +02:00
nordsoft
aa120fa69f Implemented cut copy paste 2022-12-05 01:32:50 +04:00
nordsoft
20d1d346bb Rubber band for selection 2022-12-04 15:38:38 +04:00
nordsoft
8dc0682d81 Drag drop works for objects 2022-12-04 15:38:31 +04:00
nordsoft
4b8403be4b Add icons into search path 2022-11-30 15:22:53 +04:00
krs
82c1bb5c93 ExtractionOptions extractionOptions is no longer global in mainwindow.h 2022-11-27 19:35:11 +02:00
krs
7aa30a5d7a Fixed extractionOptions formatting. 2022-11-27 19:35:11 +02:00
krs
c32cd190f2 ResourceExtractor code moved to a static class. 2022-11-27 19:35:11 +02:00
krs
8377944fd1 ExtractionOptions removed from MainWindow Class 2022-11-27 19:35:11 +02:00
krs
d516a5f529 More changes following review. 2022-11-27 19:35:10 +02:00
krs
eecaa20693 Resource extractor "enablers" are now command line options
In VCMI_lib the extractArchives will be passed all the way down the call chain!
2022-11-27 19:35:10 +02:00
krs
d1cdd7d59f Reverted changes made in client for Extractor 2022-11-27 19:35:10 +02:00
krs
10ec486251 Extractor moved to Editor 2022-11-27 19:35:10 +02: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
nordsoft
d7de9accee Fix code review problems 2022-10-13 01:40:52 +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
097fe2584b Use ptr to identify rmg template 2022-09-19 03:17:39 +04:00
nordsoft
0b9f601d2c Squashing editor 2022-09-18 03:23:17 +04:00