1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Commit Graph

75 Commits

Author SHA1 Message Date
f386f42166 Merge remote-tracking branch 'origin/develop' into terrain-rewrite
# Conflicts:
#	lib/Terrain.cpp
#	lib/Terrain.h
#	lib/battle/CBattleInfoEssentials.cpp
#	lib/rmg/ObstaclePlacer.cpp
#	lib/rmg/RiverPlacer.cpp
2022-09-27 07:50:17 +02:00
a851e630d5 fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
7b411a5fc4 fix building vcmiERM for iOS 2022-09-24 15:55:24 +03:00
cd88f3fa9e add vcmiLua headers to CMake 2022-09-24 15:55:24 +03:00
9dc5f3ed8b improve RPATH handling, apply RPATH when installing dylibs 2022-09-24 15:55:20 +03:00
494b0f0226 First version that compiles 2022-09-21 11:34:23 +02:00
4b4cc3cf4b battlefields in VLC and custom bonuses for terrain patches 2022-09-11 11:31:27 +03:00
c4035134e5 New battlegrounds (#758) 2022-09-11 11:31:26 +03:00
aaa07e4d2e New terrain support - part 1 (#755)
Initial support of new terrains
2022-09-11 11:31:26 +03:00
188607b05f Replace cotire with CMake builtin precompiled headers support (Requires CMake version >= 3.16) 2022-06-17 17:20:08 +03:00
c87df8e704 Fix warnings/errors on MSVC (#753)
* Fix warnings/errors on MSVC
1. update googletest to tag release-1.11.0 to make googletest and
   googlemock compile on MSVC2022.
2. set gtest_force_shared_crt to ON in test cmake project to make tests
   compile on MSVC.
3. add /wd4251 and /wd4275 to MSVC compile flags to ignore DLL related
   warnings for class exports.
4. fix some other warnings and errors while compiling on MSVC2022.
2022-06-11 18:45:34 +03:00
8fc14369a4 CMake presets. (#744)
* CI: use single build action
* CMake: use imported targets
* CI: do not build boost for linux
* CMake: add FORCE_BUNDLED_MINIZIP option
* linux: use external minizip and fuzzylite
* CMake: add presets
* .gitignore: ignore cmake build dirs
* github: use cmake presets
2022-05-26 08:55:20 +03:00
2f450f6592 Fix MXE lib address and new compilation issues 2021-09-06 21:27:17 +03:00
ec7453ae85 Fix some warnings, Add headers to the solution 2021-09-05 17:31:12 +03:00
093076c6d0 Workaround msvc crash 2021-08-24 14:25:57 +03:00
d56760eb4b Workaround msvc compiler crash 2021-08-24 12:19:18 +03:00
fc9bbfb895 ERM: revert unwanted changes 2021-04-19 18:33:07 +03:00
061941b3ac ERM VR:M,VR:U 2021-04-19 18:28:55 +03:00
35566d7748 ERM: fix string concatenations and bit operations 2021-04-09 23:41:50 +03:00
bd31a87133 a few erm interpretter unit tests and fixes (#688) 2021-03-27 15:47:44 +03:00
483a4689ce Fixes for code review issues 2021-02-20 04:57:50 +03:00
6d245a7821 Less ugly API declarations 2021-02-17 01:14:53 +03:00
ec6f7b88fe !?OB WIP 2021-02-16 13:32:18 +03:00
ecaa9f5d0b Entities redesign and a few ERM features
* Made most Handlers derived from CHandlerBase and moved service API there.
* Declared existing Entity APIs.
* Added basic script context caching
* Started Lua script module
* Started Lua spell effect API
* Started script state persistence
* Started battle info callback binding
* CommitPackage removed
* Extracted spells::Caster to own header; Expanded Spell API.
* implemented !!MC:S, !!FU:E, !!FU:P, !!MA, !!VR:H, !!VR:C
* !!BU:C, !!BU:E, !!BU:G, !!BU:M implemented
* Allow use of "MC:S@varName@" to declare normal variable (technically v-variable with string key)
* Re-enabled VERM macros.
* !?GM0 added
* !?TM implemented
* Added !!MF:N
* Started !?OB, !!BM, !!HE, !!OW, !!UN
* Added basic support of w-variables
* Added support for ERM indirect variables
* Made !?FU regular trigger
* !!re (ERA loop receiver) implemented
* Fixed ERM receivers with zero args.
2021-02-14 19:05:43 +03:00
54550b50de Update VS files to 2019, partially fix test project 2019-06-09 17:28:55 +02:00
1f2ee843aa [C::B] Switched to boost shared linkage 2019-05-30 20:55:40 +03:00
9311966706 [C::B] Switch to MinGW 7.3 2019-02-19 14:59:10 +03:00
216d50788b Fix AI build, update default Windows SDK version for projects 2018-12-31 15:18:42 +01:00
324717acbe Spelling fixes: privilaged -> privileged, retreive -> retrieve 2018-02-10 21:52:23 +03:00
38d836d1a5 Update project files to Visual Studio 2017 2018-01-13 16:33:49 +01:00
e3ba491fa1 Use multi-core compile by default, fix VCMI_client path 2017-08-19 13:27:24 +02:00
193f492b99 CMake: cleanup, project generation and other improvements
- Use EXCLUDE_FROM_ALL for FuzzyLite and GoogleTest to avoid inclusion of unneded headers and libraries into installers.
- Set minimum CMake version only in main CMakeLists.txt
- Set project name only in main CMakeLists.txt
- Visual Studio: add assign_source_group function to generate proper filesystem tree
- Visual Studio: set PROJECT_LABEL so generated projects have same names binaries on Windows
- Visual Studio: enabled USE_FOLDERS for projects grouping. This also possibly affect other IDEs.
- Added add_subdirectory_with_folder function to make sure 3rd-party libraries are affected by USE_FOLDERS.
2017-08-16 16:10:07 +03:00
b52cfe5283 Code style: use parentheses for creating heap-based objects (#344) 2017-07-16 12:58:05 +03:00
a4c0ad94b1 Code style: remove default value hints in definitions (#342)
Some are outdated and this is something IDE are useful for.
2017-07-15 14:08:20 +03:00
f1e5797834 Code style: move or add licensing information on top of every file 2017-07-14 01:26:03 +03:00
dbcd79c48a Code cleanup: remove double and unneded semicolons 2017-07-12 22:01:10 +03:00
80d5f7b4a4 Updated project files to MVS 2015 (in fact, it's trivial). 2016-12-12 19:14:45 +01:00
204ee37ae4 boost/program_options has only 2 uses, and unlikely will be used more -> removed form Global.h. 2016-11-28 21:38:17 +03:00
3f075e391a ERM convert logging 2016-08-29 19:49:52 +03:00
5e5ce0bb09 Merge pull request #203 from vcmi/logFormat
boost::format support for CLogger
2016-08-29 17:32:44 +04:00
439aeecc8b [c::b] re-enabled PCH, tested with GCC 5.3. (Older versions may not work) 2016-08-18 13:40:35 +03:00
599f4cfb55 extracted base logger class to vstd 2016-08-13 16:57:16 +03:00
36c44c2ce7 projects update 2016-08-13 16:57:11 +03:00
72f79a3ad7 Draft boost::format based log proxy. 2016-08-13 16:57:09 +03:00
9fd1cff090 Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared
Long time ago it's was used without prefix to make future switch from boost to std version easier.
I discusses this with Ivan and decide to drop these using from Global.h now.

This change wouldn't break anything because there was already code with prefix for each of three cases.
2015-12-29 05:43:33 +03:00
1c0d4e3f6f Fix filenames in file headers 2015-12-08 09:53:14 +03:00
5dfd48a4fa Addition to win 64 build 2015-08-20 03:28:04 +03:00
03a295f1a0 Added debug mingw64 build, minimum Windows version set to windows 7, SDL suffixes removed from Build Tagerts 2015-08-20 03:28:04 +03:00
febd4595dc [ERM] Less heavy includes in header 2015-02-08 15:15:31 +03:00
b7ed11f582 Fix ERM build
(-) there is one regression, but ERM is unused yet
2014-11-14 07:45:44 +03:00