Commit Graph
91 Commits
Author SHA1 Message Date
Ivan Savenko 7a35bcc812 Merge pull request #1221 from IvanSavenko/warnings_fix
Fix remaining compiler warnings
2022-12-29 21:51:55 +02:00
Nordsoft91 37d1e1e748 Merge pull request #1277 from Nordsoft91/editor-cutcopypaste 2022-12-27 17:28:39 +04:00
nordsoft e6f459cbe4 Address naming questions 2022-12-27 04:04:09 +04:00
Ivan Savenko eb20a4b208 Merge remote-tracking branch 'vcmi/develop' into warnings_fix 2022-12-23 14:40:45 +02:00
Ivan Savenko f073c676f9 Merge 1.1 release into develop 2022-12-23 14:17:18 +02:00
nordsoft 3a49bc6f8b Fix icons path for macOS if editor started from installed package 2022-12-21 23:03:17 +04:00
nordsoft 4674e240d8 Fix mxe map editor drag'n'drop 2022-12-21 23:02:53 +04:00
Andrii Danylchenko ee55a21fae Merge pull request #1190 from Nordsoft91/editor-speedup
Smart invalidation for move/erase/new object [1.2]
2022-12-15 12:23:28 +02:00
Andrii Danylchenko 8c07ddbae0 Merge pull request #1204 from IvanSavenko/single_process_app_upgrade
[1.2] Single process app support for platforms other than ios
2022-12-15 12:22:24 +02:00
Nordsoft91 be6b5fc0e5 Merge pull request #1195 from Nordsoft91/editor-drapndrop 2022-12-09 12:05:56 +04:00
Ivan Savenko db2a40600d Fixed some of the warnings detected by CI run 2022-12-08 23:20:42 +02:00
Ivan Savenko facf77b3ae vstd::unique -> std::unique 2022-12-07 23:36:20 +02:00
Ivan Savenko 3219e322ae Fixed all non-silenced gcc/clang warnings 2022-12-07 18:05:47 +02:00
krs 117496cb23 PCX file conversion in Resource Extractor throws exception on IOS (boost::locale stuff) 2022-12-06 00:49:39 +02:00
Ivan Savenko b8a3bcc8f1 Map editor can be built during single-app build
Editor remains as separate .exe in such build, but it won't break
compilation
2022-12-05 22:28:01 +02:00
nordsoft aa120fa69f Implemented cut copy paste 2022-12-05 01:32:50 +04:00
nordsoft 2e4b4fbebf Increase opacity for new objects 2022-12-04 20:48:30 +04:00
nordsoft 2489a21ced Fix linux build 2022-12-04 20:48:21 +04:00
nordsoft fb9711186b Hero experinece set property 2022-12-04 16:58:30 +04:00
nordsoft bd32bd66b3 Fix hero serialization 2022-12-04 16:58:03 +04:00
nordsoft 9d054f0bd5 Fix editor crash 2022-12-04 16:57:46 +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 bc37ceb7f3 Smart invalidation for move/erase/new object 2022-12-03 23:11:40 +04:00
nordsoft fc6026969f Fix town building inspector 2022-12-03 20:56:05 +04:00
nordsoft 00789cb0d7 Cleanup undo stack for new map 2022-12-03 20:56:05 +04:00
nordsoft 40300972bc Add undo/redo icons 2022-12-03 20:56:05 +04:00
nordsoft c290153cd0 Fix crash related to unblocked menu item 2022-12-03 20:56:05 +04:00
nordsoft 522cb00edd Fix crash related to zeros stored in settings 2022-12-03 20:56:05 +04: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 SavenkoandNordsoft91 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