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

7110 Commits

Author SHA1 Message Date
c22ab5ec9e Initial version of limiting shooters range feature 2023-01-18 02:05:30 +04:00
672bcb488b Merge pull request #1381 from dydzio0614/client-commands-improvements
Client commands code improvements + ingame support
2023-01-18 02:04:38 +04:00
05ac217b0f Merge with vcmi/develop 2023-01-17 23:02:25 +02:00
e436b4425f Serialization version bump 2023-01-17 22:59:32 +02:00
633b9ef3be Native terrain is now required for faction, opt-out with value "none" 2023-01-17 22:59:14 +02:00
707de75ac0 Cleared up formatting 2023-01-17 22:58:22 +02:00
e593b61201 Merge branch 'develop' into client-commands-improvements 2023-01-16 01:13:06 +01:00
da39eb789f Fix indent 2023-01-16 00:37:18 +01:00
96141f010b Merge remote-tracking branch 'vcmi/develop' into translate_launcher 2023-01-15 23:55:49 +02:00
0a858d9a7c Upgrade msvc to include enet and qt translator (#1436)
- Updated MSVC prebuilt package
- Fixed build warnings
2023-01-15 23:55:24 +02:00
246281e62a Merged vcmi/beta with vcmi/develop 2023-01-15 17:46:42 +02:00
bec894c348 Implemented automatic detection of H3 files language/encoding 2023-01-15 17:32:39 +02:00
6ea7add4bb Merge pull request #1394 from SoundSSGood/art-move-fix
Artifact movement refactoring
2023-01-15 17:29:36 +02:00
2f14914120 fix Boost deprecation warnings
warnings introduced in v1.81

# Conflicts:
#	mapeditor/resourceExtractor/ResourceConverter.cpp
2023-01-15 17:28:09 +02:00
804b164c75 Changed getQuantityRangeStringForId handling 2023-01-15 16:19:55 +01:00
9f0eb055f9 Merge pull request #1426 from vcmi/android-upgrade-sdl
Update android JNI bindings
2023-01-15 10:36:32 +02:00
b5a1b178d9 Explicitly call reset on shared_ptr for potential readability boost 2023-01-15 01:18:35 +01:00
a46ab835ce Applied review suggestions 2023-01-14 23:01:33 +02:00
8248feebf7 Implement numeric creature descriptions with config toggle on/off 2023-01-14 15:55:08 +01:00
ccc6ebee0d Cleared up gate blocking, Force Field can now block gates 2023-01-13 15:44:42 +02:00
526de47ca4 Removed 0.98 compatibility 2023-01-13 13:00:07 +02:00
3be3c871fb Destroyed walls will now remove wall penalty 2023-01-13 01:59:09 +02:00
1d7f004658 Implemented reinforced walls in towns with Castle 2023-01-13 01:09:24 +02:00
500cf7f15d EWallPart & EWallState are now enum class 2023-01-13 00:35:58 +02:00
dd3adb7e16 Arrow towers damage algorithm should now match H3 2023-01-12 23:52:03 +02:00
aac515f64e Merge 'develop' branch 2023-01-11 16:24:53 +01:00
192e856797 merge with vcmi/develop 2023-01-11 16:47:53 +02:00
e48bd39b9c Moved road & river handlers into a separate file 2023-01-11 15:17:24 +02:00
5e72ef76cf Fix quest texts accessing 2023-01-11 15:10:44 +02:00
8b6f6f9b93 Fix msvc compile 2023-01-11 13:59:43 +02:00
c6f089c6b1 Removed outdated comment 2023-01-11 13:59:33 +02:00
a0568823a9 swap contitutient 2023-01-11 13:17:33 +02:00
1e37e66e6c Replaced Terrain::BORDER and WRONG with NONE 2023-01-10 20:09:09 +02:00
1b25043dab Terrain identifiers will also have mod:name format 2023-01-10 20:08:37 +02:00
1caec0a8cb Removed default native terrains - breaks neutral faction 2023-01-10 20:08:07 +02:00
8c2b1d74be Removed unused code 2023-01-10 20:07:22 +02:00
3fd9a14651 Fix #1401 - Restored accessing creature names via GeneralTextHandler 2023-01-10 12:26:20 +02:00
c455986a55 Fix regressions in RMG & map editor 2023-01-10 01:05:28 +02:00
4f3ea0d1d9 Renamed Terrain.h/cpp -> TerrainHandler.h/cpp 2023-01-10 00:01:35 +02:00
f51b3bca57 use JsonKey or NameTranslated instead of ambiguos Name 2023-01-10 00:01:35 +02:00
009705e794 Names for terrains now pass through translator 2023-01-10 00:01:35 +02:00
7c7ae26e67 Map/Road/River identifiers are now private members 2023-01-10 00:01:35 +02:00
f3985d205b Added horseSoundPenalty for terrains (for movement outside of roads) 2023-01-10 00:01:35 +02:00
64885bdf6b Better names for terrain parameters. Support for new movement sounds. 2023-01-10 00:01:35 +02:00
4e4dae854f Final stabilization changes 2023-01-10 00:01:35 +02:00
99745b5c3c Fix rivers & roads loading 2023-01-10 00:01:35 +02:00
2de3178158 Fixed game startup 2023-01-10 00:01:35 +02:00
e1799379dd Terrain/Road/River handler are now in compileable state 2023-01-10 00:01:35 +02:00
1468f6aded Converted terrainTypeHandler into proper handler class 2023-01-10 00:01:35 +02:00
01811317f9 Remove assert which may not always be true 2023-01-09 23:22:59 +02:00