Commit Graph
9178 Commits
Author SHA1 Message Date
Ivan Savenko 4e43f5bdc2 Removed dllimport/export from single-app launcher build 2022-12-06 19:39:33 +02:00
Ivan Savenko e0c8bd5d70 Removed unused friend class reference 2022-12-06 19:38:55 +02:00
Ivan Savenko fd97b51183 Yet another attempt to fix Windows compile:
when building vcmi_lib statically (or linking against static vcmi_lib)
do not place dllexport/dllimport tags
2022-12-06 18:35:24 +02:00
Ivan Savenko 17f9c3af23 Library of Enlightenment fix
Do not offer choice between multiple identical option if hero is qualified
to receive multiple of them due to diplomacy skill
2022-12-06 18:08:10 +02:00
Ivan Savenko 65f9a1ffd2 Fixes identifiers resolving for json serialization 2022-12-06 16:26:32 +02:00
Andrii Danylchenko cb1ef1490c Merge pull request #1207 from Nordsoft91/fix-1206
Throw an exception if empty zone is generated
2022-12-06 14:36:56 +02:00
Ivan Savenko a06d7ec80e Fix Armaggeddon visual effect 2022-12-06 14:29:31 +02:00
Ivan Savenko 3c037ed620 Fix spellcaster animations 2022-12-06 14:12:13 +02:00
nordsoft d4c9b8f6b5 Absolute threshold for retreat decision 2022-12-06 16:11:52 +04:00
Ivan Savenko f247a98373 Fix non-siege battles 2022-12-06 14:11:37 +02:00
Ivan Savenko 2c05f588fd Moved CBattleRenderer into a separate file 2022-12-06 13:41:29 +02:00
nordsoft 5d1b5b6c9c Throw an exception if empty zone is generated 2022-12-06 15:07:16 +04:00
Ivan Savenko 085abb9e32 Fix compilation on Windows 2022-12-06 12:46:10 +02:00
Nordsoft91 923d4e6e6b Merge pull request #1205 from krs0/feature/PCX_file_conversion_in_Resource_Extractor_throws_exception_on_IOS_(boost__locale_stuff)
PCX file conversion in Resource Extractor throws exception on IOS (boost::locale stuff)
2022-12-06 04:38:27 +04:00
Ivan Savenko 09ac2421b9 Fix Windows single-app build 2022-12-06 01:53:19 +02:00
Ivan Savenko 2a492261e1 Fix building with cmake older than 3.12 2022-12-06 01:33:00 +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 bc1ba2135d TEST COMMIT, will be reverted after successful Github Action run 2022-12-06 00:02:14 +02:00
Ivan Savenko fa23965d0b Renamed for consistency BUILD_SINGLE_APP -> ENABLE_SINGLE_APP_BUILD 2022-12-06 00:00:56 +02:00
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
Ivan Savenko 96caceba79 Fixed validation of extracted data 2022-12-05 17:34:05 +02:00
Ivan Savenko 68cbac96af Fixed data extraction from gog.com installer 2022-12-05 17:24:11 +02:00
Andrii Danylchenko 34cd856f53 Merge pull request #1197 from IvanSavenko/hero_positioning_fix
Adjust positions of heroes in towns earlier
2022-12-05 14:47:44 +02:00
Ivan Savenko 46b8709712 Adjust positions of heroes in towns earlier
fixes crash due to accessing tile that is outside of map bonds
2022-12-05 13:02:55 +02:00
Andrii Danylchenko 40e55e2788 Merge pull request #1196 from IvanSavenko/hero_positioning_fix
Fixes incorrect positioning of heroes on spawn/release from prison
2022-12-05 10:35:24 +02:00
Ivan Savenko 2cc4f59699 Update map properly on hero position change 2022-12-04 22:03:25 +02:00
Ivan Savenko b6b6063505 Fix positioning of heroes after release from prisons 2022-12-04 22:00:33 +02:00
Ivan Savenko fa3a05a074 Removed hardcoded constants in hero placement code for more robust
solution
2022-12-04 21:23:47 +02: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
Andrii Danylchenko 35e8b794cd Merge pull request #1194 from Nordsoft91/editor-crash
Fix hero-related problems in editor [1.1]
2022-12-04 18:19:41 +02:00
nordsoft bbe51bfaf4 Fix hero experience deserialization 2022-12-04 16:58:46 +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
Andrii Danylchenko b26c874446 Merge pull request #1185 from Nordsoft91/editor-crash
Fix editor crashes [1.1]
2022-12-04 09:39:28 +02:00
Andrii Danylchenko f8165bfceb Merge pull request #1191 from vcmi/fix-1186
#1186 - disable status bar with other advmap controls
2022-12-04 08:57:24 +02:00
Andrii Danylchenko a72d1270cd #1186 - disable status bar with other advmap controls 2022-12-03 21:32:47 +02:00
nordsoft bc37ceb7f3 Smart invalidation for move/erase/new object 2022-12-03 23:11:40 +04:00
nordsoft 8d1024fcfc Clear error message 2022-12-03 20:56:05 +04:00
nordsoft 2f2c980a0c Fix crash on map destroying 2022-12-03 20:56:05 +04:00
nordsoft fc6026969f Fix town building inspector 2022-12-03 20:56:05 +04:00