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
Andrey Filipenkov
63409dd700
fix indentation
2022-09-19 11:31:48 +03:00
Agoston Szepessy
411038195c
Add clickeable area on top of creature picture
...
A class that wraps an instance of `CIntObject` creates an area
that users can right click to view information about the creature
they're buying.
The constants were based off the existing ones in the code and were
refined by guessing and checking where clicking falls inside/outside
the border of the rectangle.
2022-09-18 22:53:11 -07:00
Andrey Filipenkov
e423e415c1
move Uninstall button to the left side of layout
2022-09-19 08:48:50 +03:00
nordsoft
dcfafac266
Reuse QVersionNumber
2022-09-19 03:52:54 +04:00
nordsoft
097fe2584b
Use ptr to identify rmg template
2022-09-19 03:17:39 +04:00
Agoston Szepessy
dfdaf57803
Set position for CreaturePurchaseCard
...
This will make it pick up on right clicks. It was 0 before, so it wasn't
doing it.
2022-09-18 16:00:54 -07:00
nordsoft
c348c1a053
Revert "Load template name from user settings"
...
This reverts commit 73cc606ee2
2022-09-19 02:46:01 +04:00
nordsoft
3aa19f92a0
Add seed option to rmg
2022-09-19 02:42:38 +04:00
Nordsoft91
60264aae29
Apply suggestions from code review
...
Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>
2022-09-19 01:18:17 +04:00
Andrey Filipenkov
beeef8527f
Apply suggestions from code review
...
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2022-09-18 17:43:40 +03:00
Andrey Filipenkov
81dec1405f
fix typo: purhase -> purchase
2022-09-18 17:43:40 +03:00
Andrey Filipenkov
a320af837d
fix includes in client subdirectories
2022-09-18 17:43:40 +03:00
Andrey Filipenkov
0163190ac5
move hardcoded strings to JSON file
2022-09-18 17:43:37 +03:00
DjWarmonger
7ba271edf1
Rotation rebase2 ( #912 )
...
* Instead of [x][y][z] coordinates, map will be stored as [z][x][y].
* Nullkiller AI can get it too.
* Use boost::multi_array instead of nested vectors
* In MapHandler too
* Rotate foreach algorithms, too
* VCAI gets rotated, too
2022-09-18 17:39:10 +03:00
Andrey Filipenkov
90d355dd05
check availability only of town creatures
...
QRD shows only town creatures ignoring Summoning Portal
2022-09-18 15:58:15 +03:00
Andrey Filipenkov
a0832c39f9
show message instead of the Quick Recruit dialog when there're no creatures in town
2022-09-18 15:50:06 +03:00
Andrey Filipenkov
e85f8a56bb
make FFmpeg dependency optional
2022-09-18 09:25:10 +03:00
Andrey Filipenkov
45f5fc04be
[macOS] store logs in the standard system directory
...
~/Library/Logs/vcmi
2022-09-18 09:24:36 +03:00
Andrey Filipenkov
99af5bbe4c
add dedicated method to get logs path
2022-09-18 09:24:36 +03:00
Andrey Filipenkov
03b4ea71ba
move VCMIDirs::genHelpString() implementation to the base class
...
removes copy-paste
2022-09-18 09:24:36 +03:00
nordsoft
0563828763
Fix hero initialization for random map
2022-09-18 03:44:52 +04:00
nordsoft
0b9f601d2c
Squashing editor
2022-09-18 03:23:17 +04:00
nordsoft
12c71c154f
Merge remote-tracking branch 'origin/vlc-obstacles' into vlc-obstacles
...
# Conflicts:
# lib/LoadProgress.cpp
# lib/LoadProgress.h
# lib/ObstacleHandler.cpp
# lib/ObstacleHandler.h
# lib/battle/BattleInfo.cpp
# lib/battle/CObstacleInstance.cpp
# lib/filesystem/Filesystem.h
# lib/mapObjects/CGHeroInstance.h
# lib/mapObjects/CGTownInstance.cpp
# lib/mapObjects/CGTownInstance.h
# lib/mapObjects/CObjectHandler.cpp
# lib/mapObjects/CObjectHandler.h
# lib/mapping/CMap.cpp
# lib/mapping/CMap.h
# lib/mapping/CMapEditManager.h
# lib/mapping/CMapOperation.cpp
# lib/mapping/CMapOperation.h
# lib/mapping/MapEditUtils.cpp
# lib/mapping/MapEditUtils.h
# lib/rmg/CMapGenerator.cpp
# lib/rmg/CRmgTemplateStorage.cpp
# lib/rmg/CRmgTemplateStorage.h
2022-09-17 17:47:36 +04:00
nordsoft
1b6f4a5cf3
Rebase on develop
2022-09-17 17:43:59 +04:00
Nordsoft91
e4ac0d4370
Editor prerequisites [part 2] ( #889 )
2022-09-17 14:04:01 +03:00
nordsoft
736962a79c
Forgotten objects
2022-09-17 13:00:55 +03:00
Andrii Danylchenko
faccad7a15
#913 fix artifact assembling check
2022-09-16 14:13:56 +03:00
nordsoft
a598925a0b
Support pickable objects
2022-09-16 09:41:23 +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
7dc05d8e81
Support rewardable objects
2022-09-15 11:05:13 +03:00
