SoundSSGood
a0568823a9
swap contitutient
2023-01-11 13:17:33 +02:00
Ivan Savenko
1e37e66e6c
Replaced Terrain::BORDER and WRONG with NONE
2023-01-10 20:09:09 +02:00
Ivan Savenko
1b25043dab
Terrain identifiers will also have mod:name format
2023-01-10 20:08:37 +02:00
Ivan Savenko
1caec0a8cb
Removed default native terrains - breaks neutral faction
2023-01-10 20:08:07 +02:00
Ivan Savenko
8c2b1d74be
Removed unused code
2023-01-10 20:07:22 +02:00
Ivan Savenko
3fd9a14651
Fix #1401 - Restored accessing creature names via GeneralTextHandler
2023-01-10 12:26:20 +02:00
nordsoft
03c3fa9e1a
Merge remote-tracking branch 'upstream/develop' into enet
...
# Conflicts:
# client/CServerHandler.cpp
# lib/serializer/Connection.cpp
# lib/serializer/Connection.h
# server/CVCMIServer.cpp
2023-01-10 04:54:14 +04:00
nordsoft
fedeb3db7a
Prototype is ready
2023-01-10 04:47:00 +04:00
Ivan Savenko
c455986a55
Fix regressions in RMG & map editor
2023-01-10 01:05:28 +02:00
Ivan Savenko
4f3ea0d1d9
Renamed Terrain.h/cpp -> TerrainHandler.h/cpp
2023-01-10 00:01:35 +02:00
Ivan Savenko
f51b3bca57
use JsonKey or NameTranslated instead of ambiguos Name
2023-01-10 00:01:35 +02:00
Ivan Savenko
009705e794
Names for terrains now pass through translator
2023-01-10 00:01:35 +02:00
Ivan Savenko
7c7ae26e67
Map/Road/River identifiers are now private members
2023-01-10 00:01:35 +02:00
Ivan Savenko
f3985d205b
Added horseSoundPenalty for terrains (for movement outside of roads)
2023-01-10 00:01:35 +02:00
Ivan Savenko
64885bdf6b
Better names for terrain parameters. Support for new movement sounds.
2023-01-10 00:01:35 +02:00
Ivan Savenko
4e4dae854f
Final stabilization changes
2023-01-10 00:01:35 +02:00
Ivan Savenko
99745b5c3c
Fix rivers & roads loading
2023-01-10 00:01:35 +02:00
Ivan Savenko
2de3178158
Fixed game startup
2023-01-10 00:01:35 +02:00
Ivan Savenko
e1799379dd
Terrain/Road/River handler are now in compileable state
2023-01-10 00:01:35 +02:00
Ivan Savenko
1468f6aded
Converted terrainTypeHandler into proper handler class
2023-01-10 00:01:35 +02:00
Ivan Savenko
01811317f9
Remove assert which may not always be true
2023-01-09 23:22:59 +02:00
Ivan Savenko
1fece0ce18
Merge pull request #1229 from IvanSavenko/battle_improvements
...
Battle: Fixing bugs & Implementation of missing features
2023-01-09 22:07:13 +02:00
Ivan Savenko
bde988ca43
Merge pull request #1329 from IvanSavenko/translate_game
...
Translations support - base functionality for main game texts
2023-01-09 20:33:56 +02:00
Ivan Savenko
8f42c86962
Formatting: space -> tabs
2023-01-09 18:34:37 +02:00
Ivan Savenko
84aefc3362
Changed log file format: print timestamp instead of thread ID
2023-01-09 18:34:37 +02:00
Ivan Savenko
2f5ee44cbe
Fixes patrol position initialization on H3M load
2023-01-09 18:34:13 +02:00
Ivan Savenko
7e8516f927
Changed Sirens behavior to match H3 logic
2023-01-09 13:04:56 +02:00
SoundSSGood
4005b48360
Regressions fixed
2023-01-08 23:31:12 +02:00
SoundSSGood
6b7ce798d0
artifactTransitionPos created
2023-01-08 23:24:13 +02:00
nordsoft
d3710b82ad
intermediate connection
2023-01-08 05:42:12 +04:00
Andrey Filipenkov
48c01157e6
fix typo
2023-01-08 01:33:26 +02:00
Andrey Filipenkov
db98575d10
fix unaligned memory access (UB) on Clang/GCC/MSVC
...
sample UBSAN report:
client/gui/CAnimation.cpp:329:24: runtime error: load of misaligned address 0x62d0004b094f for type 'const ui32' (aka 'const unsigned int'), which requires 4 byte alignment
2023-01-08 01:33:26 +02:00
Ivan Savenko
481f756b51
Fixes #1304 - correct battle log message on spellcast without kills
2023-01-07 19:52:57 +02:00
Andrii Danylchenko
9f9798d3a4
Update android JNI bindings
2023-01-07 09:26:01 +02:00
Dydzio
622e012fcf
Allow ingame console to use clientside commands and print output
2023-01-06 21:01:54 +01:00
Dydzio
a2ce9220ed
Fix tests + scripting compilation on gcc
2023-01-05 17:42:33 +02:00
SoundSSGood
d5cef0c069
end of battle art assembling fix
2023-01-05 17:37:14 +02:00
Dydzio
3e1e41ef59
Apply suggestions from code review
...
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2023-01-05 17:31:30 +02:00
Dydzio
a83c7eb00f
Add configurable damage and defense parameters
2023-01-05 17:31:30 +02:00
Ivan Savenko
6b2490903d
Fix casting of massive spells by creatures
2023-01-04 21:26:13 +02:00
Ivan Savenko
e1a244beb0
Fix crash on firewall cast attempt
2023-01-04 17:38:55 +02:00
Ivan Savenko
d3ecd43aba
Merge remote-tracking branch 'vcmi/develop' into battle_improvements
2023-01-04 16:20:53 +02:00
nordsoft
445f6c8598
Compile enet
2023-01-03 03:52:44 +04:00
Ivan Savenko
c479504646
Formatting cleanup
2023-01-01 22:50:38 +02:00
Ivan Savenko
d237bee927
Removed unused code
2023-01-01 21:12:47 +02:00
Ivan Savenko
7c0d5666a0
Return string by copy to fix cases when string is constructed on stack
2023-01-01 20:55:43 +02:00
Ivan Savenko
9a620a9091
Refactoring of GeneralTextHandler to reduce boilerplate code in callers
2023-01-01 15:13:02 +02:00
Ivan Savenko
01d0cd4f7a
Changed configurable UI to match text refactoring:
...
- help.txt strings are now loaded as (hover, help) pairs
- renamed string pairs from translate.json to use (hover, help) form
- interface builder will always load label texts via unified ID
- interface builder way of loading buttons text has been changed:
- - field has been renamed "zelp" -> "help" for consistency
- - "help" field now only accepts string or object json type
2023-01-01 14:56:45 +02:00
Ivan Savenko
84493e1bff
Translate received string identifier before storing
2023-01-01 14:56:45 +02:00
Ivan Savenko
10541855d9
Don't load empty rumor strings
2023-01-01 14:56:45 +02:00
Ivan Savenko
a499390b9c
Restored text export command
2023-01-01 14:56:45 +02:00
Ivan Savenko
1979b3e97f
Fixes typo
2023-01-01 14:56:45 +02:00
Ivan Savenko
e9e2ebb1c9
Cleanup
2023-01-01 14:56:45 +02:00
Ivan Savenko
cb4f5edae9
All Heroes 3 texts are now passed through translator
2023-01-01 14:56:45 +02:00
Ivan Savenko
85d7b470d4
Access to quests texts is now processed via translator
2023-01-01 14:56:45 +02:00
Ivan Savenko
bdb8e0ee5c
Introduced string identifiers for H3 texts, still WIP
2023-01-01 14:56:44 +02:00
Dydzio
7e321b2405
Fix missing formatting
2022-12-30 16:14:04 +01:00
Dydzio
306348c301
Tweak condition to remove hardcoded terrain ID
2022-12-30 16:04:19 +01:00
Dydzio
2c09bfb22a
Fix code formatting
2022-12-30 15:51:13 +01:00
Dydzio
c40dcec7cd
Improve terrain check condition
2022-12-30 15:46:10 +01:00
Dydzio
1967416eb2
Remove no longer needed code
2022-12-30 15:26:27 +01:00
M
23de4a188b
Change cartographer tile reveal logic to match H3
2022-12-30 15:09:09 +01:00
Ivan Savenko
0c78e47dce
Fixed serialization due to changed lsit of bonuses
2022-12-30 11:55:40 +02:00
Ivan Savenko
5d80457eda
Merge with vcmi/develop branch
2022-12-30 00:52:23 +02:00
Ivan Savenko
b8b1e07621
Fix serialization
2022-12-30 00:36:10 +02:00
Ivan Savenko
486c9612b8
Fix regression from warnings_fix branch
2022-12-30 00:23:34 +02:00
Ivan Savenko
b89e8a9dfe
Fix serialization
2022-12-29 23:37:46 +02:00
Ivan Savenko
b275d9de72
merge beta branch into develop
2022-12-29 22:08:53 +02:00
Ivan Savenko
7a35bcc812
Merge pull request #1221 from IvanSavenko/warnings_fix
...
Fix remaining compiler warnings
2022-12-29 21:51:55 +02:00
Ivan Savenko
e19dc41295
Support Polish version of H3 data files
2022-12-29 21:50:04 +02:00
Andrey Filipenkov
b030a88ca5
fix gold check for School of War
2022-12-29 01:45:51 +04:00
Ivan Savenko
5f4a998435
editorPath -> mapEditorPath
2022-12-28 17:59:16 +02:00
Andrii Danylchenko
a954cc08fb
Made intermediate class to hide some implementation details from header.
2022-12-27 12:55:31 +02:00
Andrii Danylchenko
c271f9187f
Connection buffered read cpack.
2022-12-26 21:49:53 +02:00
Andrii Danylchenko
cb13064a62
Socket buffered write. Write full cpack at once
2022-12-26 20:17:53 +02:00
Ivan Savenko
78ed2f154b
Revert uninteded change
2022-12-26 14:48:13 +02:00
Ivan Savenko
bb65246aa3
Merge remote-tracking branch 'vcmi/develop' into battle_improvements
2022-12-26 01:15:44 +02:00
Ivan Savenko
e4e5278f60
Merge with vcmi/develop
2022-12-25 23:10:52 +02:00
Ivan Savenko
b38752bde1
Editor can be started from Launcher (disabled for ios)
2022-12-25 23:08:39 +02:00
Ivan Savenko
7e3cd7db51
Fix for missing Death Blow sound
2022-12-25 20:11:22 +02:00
Ivan Savenko
063b8732ff
Save compatibility with main branch
2022-12-25 18:07:08 +02:00
Ivan Savenko
a0ab760249
Removed debug code
2022-12-25 16:53:40 +02:00
Ivan Savenko
94597e7af6
Remove deprecated usage of sprintf
2022-12-25 14:04:12 +02:00
Ivan Savenko
405b2976d5
Renamed getUpgradeInfo -> fillUpgradeInfo
2022-12-25 14:03:43 +02:00
Nordsoft91
785787e454
Merge branch 'develop' into interface-builder
2022-12-24 21:56:29 +04:00
Ivan Savenko
325c29da0d
Merge remote-tracking branch 'vcmi/develop' into battle_improvements
2022-12-23 14:51:34 +02: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
Ivan Savenko
9248e06ae0
Demon summon is now a spell. DEMON_SUMMONING bonus has been removed
2022-12-22 23:11:55 +02:00
Ivan Savenko
b2279484fc
Merge pull request #1227 from Shatur/opendingux
...
Port to OpenDingux handhelds
2022-12-22 16:56:55 +02:00
Ivan Savenko
bab5922951
Spells can now define color muxer effect (e.g. Bloodlust & Petrify)
2022-12-22 00:25:35 +02:00
Ivan Savenko
41b87088d5
Color muxer effects can now be (partially) configured by user.
...
TODO: move color muxer effects from spells into spell config
2022-12-21 23:29:56 +02:00
nordsoft
7e7071fc95
Merge remote-tracking branch 'upstream/develop' into interface-builder
2022-12-22 01:24:29 +04:00
nordsoft
34b81e8838
Revert VCMIDirs to fix the build
2022-12-21 23:08:53 +04:00
Ivan Savenko
26985600b2
Fixed several more cases of incorrect scope for identifiers resolving
2022-12-21 23:02:19 +04:00
Ivan Savenko
23cb47b457
Fixed several scenarios with incorrect scope for requesting identifiers
2022-12-21 23:02:19 +04:00
Ivan Savenko
b423b3fa6b
Fix dragon breath & fire shield
2022-12-21 18:04:54 +02:00
Ivan Savenko
5f8cfadc4d
Better formatting for not found terrains ID's
2022-12-20 01:55:59 +04:00
Ivan Savenko
3cf1e3b4d4
Restored neutral faction ID, changed warnings related to H3 ID's
2022-12-20 01:55:59 +04:00
Ivan Savenko
b13723305d
Better error reporting for usages of invalid terrain in mods
...
TODO: switch to proper mechanism via identifier requests
2022-12-20 01:55:59 +04:00
