Ivan Savenko
3e58d1e3c5
Merge remote-tracking branch 'refs/remotes/vcmi/develop' into battleint_refactor
2022-11-28 16:10:13 +02:00
Ivan Savenko
9f21569a79
Next batch of siege fixes
2022-11-27 22:50:18 +02:00
Ivan Savenko
35576834c9
Fixing sieges, part 1
2022-11-27 20:21:51 +02:00
Ivan Savenko
0cae259f53
Most of rendering in BattleInt is done via canvas
...
- refactoring of CBattleStacksController.cpp
- moved EAlignment enum to Geometries.h from CIntObject
- renamed EAlignment to ETextAlignment, to avoid conflict with good/evil
alignemt
- ETextAlignment is now enum class
2022-11-26 23:12:20 +02:00
nordsoft
8f938c7c9b
Change default value for DWELLINGS_ACCUMULATE_CREATURES
2022-11-25 03:41:14 +04:00
Ivan Savenko
0b7edd471c
Merge pull request #1128 from IvanSavenko/movement_fix
...
Fix #1088 - Refactoring of hero movement animation code
2022-11-17 13:05:15 +02:00
Ivan Savenko
9afc1eed49
Expanded schema to validate ray configuration
2022-11-16 12:26:56 +02:00
Ivan Savenko
6678a747bb
Implemented ray-like projectiles for shooters
...
- Added missing support for ray-like projectiles
- Archmages, Evil Eyes and Beholders now use ray for shooting
- New method to draw 1 pixel-wide line with color gradient at arbitrary
angle
- fixed incorrect attackClimaxFrame field for Archmages
2022-11-15 21:42:16 +02:00
Ivan Savenko
153315e8c3
Refactoring of hero movement animation code
...
Replaced ancient and obscure code that had separate routines for each
possible movement direction with generic version.
Fixes #1088 which apparently was due to bug in one of these routines
2022-11-14 12:32:40 +02:00
krs
aab394ff93
#1071 - In latest night builds there are problems with schema obstacle.json and file obstacles.json
2022-11-04 00:06:15 +02:00
Andrii Danylchenko
b43e0ff9e4
Merge pull request #972 from vcmi/cpp-map-editor
...
Cpp map editor
2022-10-22 12:42:27 +03:00
nordsoft
5743310aec
Revert settings.json
2022-10-09 00:13:39 +04:00
nordsoft
4cb31ea912
Merge remote-tracking branch 'upstream/develop' into cpp-map-editor
2022-10-08 23:24:57 +04:00
nordsoft
ea49b8cf40
Cleanup code
2022-10-06 17:56:54 +04:00
nordsoft
0ea5a8fbe7
Merge remote-tracking branch 'upstream/develop' into mp-disconnection
...
# Conflicts:
# server/CVCMIServer.cpp
2022-10-04 17:41:43 +04:00
nordsoft
16a5414247
Reconnection partially works
2022-10-04 05:09:03 +04:00
nordsoft
512cf014aa
Freeze current state
2022-10-03 20:47:00 +04:00
Andrii Danylchenko
a2dbb6c8ac
Merge pull request #978 from kambala-decapitator/hide-unsupported-resolutions
...
Hide unsupported resolutions
2022-09-30 17:34:07 +03:00
DjWarmonger
58a3abb643
Merge pull request #963 from vcmi/terrain-rewrite
...
Terrain rewrite
2022-09-29 18:24:05 +02:00
Andrey Filipenkov
90eeb41618
fix healing from Elixir of Life
2022-09-27 14:03:36 +03:00
Andrey Filipenkov
e8396401f9
fetch Extra Resolutions mod path from the settings schema
2022-09-27 11:56:13 +03:00
Tomasz Zieliński
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
Nordsoft91
d4f97aadf0
Merge branch 'develop' into incomatibility-response
2022-09-25 13:26:07 +04:00
nordsoft
d32898b39b
Merge remote-tracking branch 'upstream/develop' into cpp-map-editor
...
# Conflicts:
# CMakeLists.txt
2022-09-25 00:58:43 +04:00
Andrii Danylchenko
4205701f96
#973 - use ship battleground for favorable winds
2022-09-24 17:43:37 +03:00
Nordsoft91
824aec8416
Apply suggestions from code review
...
Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>
2022-09-24 13:03:46 +04:00
Tomasz Zieliński
a5077245a8
Merge remote-tracking branch 'origin/develop' into terrain-rewrite
...
# Conflicts:
# lib/Terrain.cpp
# lib/Terrain.h
2022-09-23 20:01:13 +02:00
Tomasz Zieliński
09931b6c9d
Moved roads and rivers to config files.
...
This also allows adding new ones via mods.
2022-09-23 18:57:16 +02:00
nordsoft
8f6f9707a6
Read error message from translate.json
2022-09-23 15:20:11 +04:00
Andrii Danylchenko
1c62f9db1a
Merge pull request #970 from Nordsoft91/srv-healthcheck
...
Add simple server healthcheck
2022-09-23 14:00:45 +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
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
Tomasz Zieliński
97c17c6294
- Terrain config
...
- Fix for underground terrains
2022-09-21 14:11:32 +02:00
Tomasz Zieliński
494b0f0226
First version that compiles
2022-09-21 11:34:23 +02:00
Andrey Filipenkov
0163190ac5
move hardcoded strings to JSON file
2022-09-18 17:43:37 +03:00
nordsoft
0b9f601d2c
Squashing editor
2022-09-18 03:23:17 +04:00
nordsoft
736962a79c
Forgotten objects
2022-09-17 13:00:55 +03:00
Nordsoft91
ad01c7ffce
Vlc obstacles [part 1] ( #888 )
...
* obstacles content handler, entity service and VLC integration
2022-09-15 11:06:54 +03:00
nordsoft
9a8a37637f
[839] update config
2022-09-11 11:31:27 +03:00
nordsoft
05c931a4c8
[838] update config
2022-09-11 11:31:27 +03:00
nordsoft
9681c88b65
[837] update config
2022-09-11 11:31:27 +03:00
nordsoft
1a37b06358
[833] Fix spell scroll sound
2022-09-11 11:31:27 +03:00
nordsoft
fa4f79692b
[832] Fix water ambient sound
2022-09-11 11:31:27 +03:00
DjWarmonger
f81d869b4a
Mine roads ( #808 )
...
* Create dirt roads to mines if there are no roads in a zone.
2022-09-11 11:31:27 +03:00
Nordsoft91
99a9680f62
Final preparations for merge into develop ( #780 )
...
* version updated, change log updated from release draft
* horse sounds for terrains
* Update and freeze essential files
2022-09-11 11:31:27 +03:00
Nordsoft91
4bd0ff680a
Random map generator refactoring ( #762 )
...
random map generator refactoring and improvements
2022-09-11 11:31:27 +03:00
nordsoft
804f1bf3f2
Fix typo
2022-09-11 11:31:27 +03:00
Andrii Danylchenko
4b4cc3cf4b
battlefields in VLC and custom bonuses for terrain patches
2022-09-11 11:31:27 +03:00
Andrii Danylchenko
3b1d271ae0
allow configurable battleground graphics
2022-09-11 11:31:26 +03:00
