games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-28 23:06:24 +02:00
Code Issues Releases Activity
9,011 Commits 19 Branches 63 Tags 113 MiB
733f21f8dc
Commit Graph

63 Commits

Author SHA1 Message Date
krs
117496cb23 PCX file conversion in Resource Extractor throws exception on IOS (boost::locale stuff) 2022-12-06 00:49:39 +02:00
Andrii Danylchenko
82179a9cdb
Merge pull request #1176 from IvanSavenko/tower_shooter_icons 
Tower shooter icons fix
 2022-12-01 12:30:24 +02:00
Andrii Danylchenko
ab365fdaef
Merge pull request #1175 from SoundSSGood/refactoring-art 
Refactoring of artifacts code
 2022-12-01 11:13:31 +02:00
nordsoft
e9e8fdecb5 Update icon for underground toggle 2022-11-30 15:33:59 +04:00
nordsoft
4b8403be4b Add icons into search path 2022-11-30 15:22:53 +04:00
nordsoft
3c4d2a4b92 Add icons for map editor toolbal 2022-11-30 02:59:36 +04:00
SoundSSGood
3bf0cfe4fa
Merge branch 'vcmi:develop' into refactoring-art 2022-11-29 22:34:08 +02:00
SoundSSGood
96d8e952c4 attempt to fix the build 2022-11-29 21:45:37 +02:00
Ivan Savenko
c233e57079
Apply suggestions from code review 
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
 2022-11-29 18:24:03 +02:00
Ivan Savenko
861a6849f9 Added possibility to define per-town tower icon for battle queue in siege 2022-11-29 14:47:51 +02: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
9b3cab1181 IVCMIDirs::userExtractedPath() created 2022-11-27 19:35:11 +02:00
krs
14b031118c exportBitmaps now uses QT libs 2022-11-27 19:35:11 +02:00
krs
ec1a995218 export bitmaps now by default prepends def name to exported PNG 2022-11-27 19:35:11 +02:00
krs
75b4b64b6f Final checks according to review 2022-11-27 19:35:11 +02:00
krs
d516a5f529 More changes following review. 2022-11-27 19:35:10 +02:00
krs
f0b66b6192 Animation.cpp fixes after 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
cca1f074bf Convert PCX to PNG, Final touches, everything deactivated. 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
Nordsoft91
640ebcdca4
Update BitmapHandler.cpp 2022-11-19 01:52:21 +04:00
Nordsoft91
fef3b7652b
Update BitmapHandler.cpp 2022-11-19 01:02:18 +04:00
nordsoft
3e7e29c714 Fixes for pcx 2022-11-19 00:09:28 +04:00
nordsoft
0d9f7d15a2 Fix typo 2022-11-19 00:02:08 +04:00
nordsoft
7bac01f10a More fixes on image loader 2022-11-19 00:01:48 +04:00
nordsoft
3a913140fd Fix loading images 2022-11-18 23:26:19 +04:00
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