Andrii Danylchenko
2b0f02c832
Merge pull request #944 from AgostonSzepessy/dev/agos/937
...
Add right click to Quick Recruit Window
2022-09-23 14:01:52 +03:00
Andrii Danylchenko
1c62f9db1a
Merge pull request #970 from Nordsoft91/srv-healthcheck
...
Add simple server healthcheck
2022-09-23 14:00:45 +03:00
Andrii Danylchenko
cfbd933d7d
Merge pull request #905 from Nordsoft91/mod-version-launcher
...
Mod versioning in launcher [part 4]
2022-09-23 13:59:29 +03:00
Andrii Danylchenko
0256f2d920
Merge pull request #974 from Nordsoft91/loading-hotfix
...
hotfix for broken game loading
2022-09-23 13:58:45 +03:00
nordsoft
3101a207a0
hotfix for broken game loading
2022-09-23 12:34:44 +04:00
Andrii Danylchenko
eb7c263010
Merge pull request #964 from kambala-decapitator/warriors-tomb-message
...
fix showing "visited" message for Warrior's Tomb
2022-09-23 11:08:52 +03:00
Tomasz Zieliński
6aaf77812b
Changed logic for zone placement.
...
Now every zone can be surface, underground, or both. This is separate from water <-> land distinction.
Iand type is now a combination of flags and can take multiple values: "type": ["LAND", "WATER", "SURFACE", "SUB", "ROCK"]. In nothing is specified, terrains get LAND | SURFACE flags by default.
Non-surface zones will default to DIRT, and non-underground zones will default to SUBTERRA.
2022-09-22 18:23:31 +02:00
nordsoft
7de4d94aff
Move text string to translations.json
2022-09-22 20:06:14 +04:00
Andrii Danylchenko
328fe4a556
Merge pull request #952 from kambala-decapitator/fix-vampire-drain-effect
...
server-side fixes to battle events
2022-09-22 18:37:29 +03:00
nordsoft
061ac414e8
Incorporate changes with scripting
2022-09-22 19:22:31 +04:00
Andrii Danylchenko
43a1a8b76d
Merge pull request #928 from kambala-decapitator/quick-recruit-no-creatures
...
show message instead of the Quick Recruit dialog when there're no creatures in town
2022-09-22 18:21:45 +03:00
nordsoft
2c2c044191
revert launcher changes
2022-09-22 17:15:49 +04:00
nordsoft
89d0de53da
Merge remote-tracking branch 'upstream/develop' into features/cpp-map-editor
...
# Conflicts:
# .github/workflows/github.yml
# launcher/modManager/cmodlist.cpp
# lib/CModHandler.cpp
# lib/CModHandler.h
2022-09-22 17:09:47 +04:00
Andrii Danylchenko
b4d3445559
Merge pull request #971 from kambala-decapitator/fix-warnings
...
Fix most project warnings
2022-09-22 16:05:32 +03:00
nordsoft
2c7198a01a
Increment vcmi version
2022-09-22 16:41:23 +04:00
nordsoft
145103a32d
Allow enabling of compatible mods only
2022-09-22 16:41:13 +04:00
Andrii Danylchenko
afe84f16e8
Merge pull request #968 from kambala-decapitator/disable-scripting
...
Disable scripting modules by default
2022-09-22 15:23:17 +03:00
Andrii Danylchenko
3d3c513603
Merge pull request #929 from Nordsoft91/branch-merge-versioning
...
Mods versioning [part 3]
2022-09-22 14:56:20 +03:00
nordsoft
c2f5628fc5
Add system message
...
# Conflicts:
# client/CServerHandler.cpp
2022-09-22 15:42:43 +04:00
Andrey Filipenkov
635d8c7883
silence varargs warning from fuzzylite
2022-09-22 11:54:10 +03:00
Andrey Filipenkov
c9c79887a7
remove unused variables
2022-09-22 11:54:10 +03:00
Andrey Filipenkov
143b0983e6
fix enum value
2022-09-22 11:54:09 +03:00
Andrey Filipenkov
1d57c40740
wrap && conditions in parentheses when near ||
2022-09-22 11:54:09 +03:00
Andrey Filipenkov
2ce78ba8c9
fix operator precedence
2022-09-22 11:54:09 +03:00
Andrey Filipenkov
3616827aad
use default implementation of special methods
2022-09-22 11:54:09 +03:00
Andrey Filipenkov
aae1d4fed5
fix variable type in for-in loops
2022-09-22 11:54:09 +03:00
Andrey Filipenkov
a1cf120ea6
add missing virtual destructors
2022-09-22 11:54:09 +03:00
nordsoft
667d97d300
Add simple healthcheck
2022-09-22 05:06:49 +04:00
Tomasz Zieliński
e53613caa7
Fixed crash in pathfinder
2022-09-21 21:44:39 +02:00
Andrey Filipenkov
7e6ed0583c
disable all scripting code when configuring without scripting modules
2022-09-21 19:31:42 +03:00
Andrey Filipenkov
4058c2c18a
model implicit ERM -> LUA dependency
2022-09-21 19:31:42 +03:00
Andrey Filipenkov
f54f8022e2
disable scripting modules by default
2022-09-21 19:31:42 +03:00
Tomasz Zieliński
fa31309eed
Fixed minimap colors
2022-09-21 14:42:22 +02:00
Andrey Filipenkov
6cd810e065
fix showing "visited" message for Warrior's Tomb
2022-09-21 15:19:04 +03:00
Tomasz Zieliński
97c17c6294
- Terrain config
...
- Fix for underground terrains
2022-09-21 14:11:32 +02:00
Tomasz Zieliński
c9c4603f75
Firts working version that launches original maps
2022-09-21 13:43:57 +02:00
Tomasz Zieliński
11e1bb44a2
Load sounds for new terrains later
2022-09-21 13:43:00 +02:00
Tomasz Zieliński
494b0f0226
First version that compiles
2022-09-21 11:34:23 +02:00
Andrey Filipenkov
87a88da3a9
add Fire Shield damage to the battle log
2022-09-21 10:42:42 +03:00
Andrey Filipenkov
b95841dabb
fix creating "creatures perished" battle log entry
2022-09-21 10:38:42 +03:00
Andrii Danylchenko
8e1c88e8c5
Merge pull request #956 from kambala-decapitator/ci-develop-nightly
...
[CI] switch develop to nightly builds
2022-09-21 09:12:43 +03:00
Andrey Filipenkov
1313da191b
trigger Drain Life effects after the attack
...
- animation and sound are played after the attack
- amount of drained life appears after damage dealt in the battle log
2022-09-20 18:00:00 +03:00
Andrey Filipenkov
861df6fe71
[CI] add ability to run workflow manually
2022-09-20 12:30:14 +03:00
Andrey Filipenkov
753e7905b3
[CI] perform nightly develop builds instead of on each push
2022-09-20 12:30:14 +03:00
nordsoft
6817cfe2bc
Some automation
2022-09-20 03:34:07 +04:00
nordsoft
7d58ede8a9
Revert "Auxiliary commit to revert individual files from c08fce4d65313cb862ea404199be323dcd5c3fd2"
...
This reverts commit 1e21c0893404a6ec75c2699213cfb6725c21d4de.
2022-09-20 02:42:12 +04:00
nordsoft
3a2951b329
Fix events visibility
2022-09-20 02:39:26 +04:00
nordsoft
c08fce4d65
Fix map export
2022-09-20 02:38:10 +04:00
Tomasz Zieliński
b20f649521
stash
2022-09-19 16:13:58 +02:00
nordsoft
fd10d8a887
Fix compilation on msvc
2022-09-19 12:34:18 +04:00
