Commit Graph
8928 Commits
Author SHA1 Message Date
Ivan Savenko d2702a8fcd Removed old definitions from Global.h 2022-12-05 23:09:22 +02:00
Ivan Savenko 5e37ad6836 Changes to single-app build
- client version of library is now always called vcmi, like in regular
builds (e.g. libvcmi.so)
- server version of library keeps its separate name
2022-12-05 22:57:43 +02:00
Ivan Savenko 538c6e39f9 Split VCMIDirs::developmentMode to handle data & binaries separately 2022-12-05 22:56:10 +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
Ivan Savenko d13bbabf08 Made copying of config & mods directories on build optional
Added option COPY_CONFIG_ON_BUILD, if set to OFF then post-process
command that copies config & mods directories to build destination will
be disabled.

This command may be convenient in most cases, but when only config file is
edited CMake won't trigger this command since lib was not changed.

At least on Linux, symlinks are more reliable alternative
2022-12-05 22:26:59 +02:00
Ivan Savenko 98f6173516 BUILD_SINGLE_APP is now CMake option 2022-12-05 22:21:21 +02:00
Ivan Savenko 6463e906d5 vcmi can be compiled as single app on Linux
TODO: check compilation on Win/Mac using Github Actions
2022-12-05 21:36:02 +02:00
Andrii Danylchenko fd21f9ead2 Merge pull request #1180 from vcmi/beta
allow uploading beta to build server
2022-12-02 11:47:19 +02:00
Andrii Danylchenko c7510cb8ae allow uploading beta to build server 2022-12-02 09:23:06 +02:00
Andrii Danylchenko d9c4b28ccc Merge pull request #1177 from IvanSavenko/fix_mod_identifiers
Fix mod identifiers registration & incorrect mod validation
2022-12-02 09:20:49 +02:00
Nordsoft91 2a857cf0b9 Merge pull request #1179 from Nordsoft91/ios-files-browser 2022-12-01 16:43:42 +04:00
nordsoft 632ffb4462 Alphabetical order for parameters 2022-12-01 14:56:42 +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 09c681ca64 Implement browsing data 2022-12-01 00:24:09 +04:00
SoundSSGood 45a3064e5d suggested changes 2022-11-30 18:28:33 +02:00
Ivan Savenko 7c410ab5ce Fix potential crash due to iterator invalidation 2022-11-30 18:07:21 +02:00
Ivan Savenko 5cd405bce8 Fixed meta field handling in JsonUtils::inherit function, removed
workarounds
2022-11-30 17:38:53 +02:00
Ivan Savenko 79c96e94fa Cleared up comments 2022-11-30 17:37:36 +02:00
Andrii Danylchenko 6015e160cf Merge pull request #1178 from Nordsoft91/editor-icons
Add icons for map editor toolbal
2022-11-30 14:43:37 +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
Ivan Savenko 36ae26bc37 Fixed several scenarios which could lead to json with incorrectly set
mod origin info, leading to non-resolving identifiers
2022-11-29 22:34:32 +02:00
SoundSSGood 3bf0cfe4fa Merge branch 'vcmi:develop' into refactoring-art 2022-11-29 22:34:08 +02:00
Ivan Savenko abe11aaf54 Introduced "map" scope for accessing identifier on map loading.
Currently it allows access to all mods, should be restricted to mods
that map depends on
2022-11-29 22:33:08 +02:00
SoundSSGood 96d8e952c4 attempt to fix the build 2022-11-29 21:45:37 +02:00
Nordsoft91 c6d317e409 Merge pull request #1119 from krs0/feature/H3_original_files_extractor
VCMI H3 original archives extractor #1118
2022-11-29 21:54:57 +04:00
Ivan Savenko 4a42ef29d9 VCMI mod version bump 2022-11-29 19:07:21 +02:00
Nordsoft91 89b8b87a6b Merge pull request #1156 from vcmi/features/online
Online mode
2022-11-29 20:43:39 +04:00
Ivan SavenkoandNordsoft91 c233e57079 Apply suggestions from code review
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2022-11-29 18:24:03 +02:00
nordsoft 98d59eb221 Added more comments 2022-11-29 19:42:09 +04:00
Ivan Savenko 26a2ac72b8 Added default tower shooter icons to all standard factions 2022-11-29 15:14:57 +02:00
Ivan Savenko 8b7ca176f8 Updated schema 2022-11-29 15:14:10 +02:00
Ivan Savenko 178cd0226f Show town-specific tower icon in battle queue, if such icon exists 2022-11-29 14:59:50 +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
Ivan Savenko 3d1f6df0e2 Added simple icon for tower shooter creature, fixes #791 2022-11-29 12:18:27 +02:00
Andrii Danylchenko a6b92fc152 Merge pull request #1153 from vcmi/click-to-send-message
Clickable status bar to send messages with on mobile
2022-11-29 09:28:34 +02:00
Andrii Danylchenko d6ca8017bf Clickable status bar to send messages with on mobile 2022-11-29 08:05:54 +02:00
SoundSSGood 8a6052fd54 CArtHandler refactoring 2022-11-29 02:34:04 +02:00
SoundSSGood 909dcb82fa use ArtifactID 2022-11-29 00:32:18 +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 ea2fe78776 (char*)&data[0] changed to (char*)data.data() 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 6130776fe4 removed one too many implementation of extractToFolder.
changed parameter 2 from CFileInputStream to CInputStream
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