altiereslima
437ff290e2
Update CMakeLists.txt
2024-04-07 14:17:19 -03:00
Evgeny Malygin
25125f96da
Fix: licenses, pragma guards, StdInc
2024-03-29 07:48:52 +02:00
Ivan Savenko
1ef8452370
Merge pull request #3679 from godric3/map-editor-customize-hero-spells
...
map editor: Allow to customize hero spells
2024-03-28 13:17:27 +02:00
godric3
353435047f
use GameConstants::SPELL_LEVELS
2024-03-24 19:02:39 +01:00
godric3
acceca0139
map editor: Allow to customize hero spells
2024-03-24 10:01:20 +01:00
DjWarmonger
3e959f3ad9
Merge pull request #3132 from vcmi/reward_select_all
...
Support for "selectAll" reward
2024-03-14 21:46:02 +01:00
DjWarmonger
2c9b7089ad
Merge pull request #3645 from vcmi/save_rmg_options
...
Save rmg options
2024-03-14 19:54:08 +01:00
Tomasz Zieliński
43a1e691e4
Trying to satisfy Sonarcloud
2024-03-09 10:17:30 +01:00
Tomasz Zieliński
5ca3fd2d9c
Restored previous solution, which is handled already.
2024-03-04 21:49:35 +01:00
Tomasz Zieliński
e7af9d5607
Code review fixes, Sonarcloud fixes
2024-03-04 21:23:17 +01:00
Alexander Wilms
ea48257100
Fix SonarCloud issues
...
Replace the use of "::value" with "std::is_abstract_v" and similar issues
2024-03-02 14:08:03 +01:00
Ivan Savenko
00058ea609
Merge pull request #3649 from godric3/map-editor-fix-owner-selection
...
Map editor fix owner selection
2024-03-01 13:34:47 +02:00
Tomasz Zieliński
1b2d01c25f
Add new map sizes & better layout
2024-03-01 12:15:04 +01:00
godric3
da91e90a7b
map editor: dont suggest neutral owner for hero
2024-02-29 23:08:21 +01:00
godric3
51386db347
map editor: fix owner selection
2024-02-29 22:11:28 +01:00
Tomasz Zieliński
c87b0e6d65
Compile fix
2024-02-29 20:44:14 +01:00
Tomasz Zieliński
17fc1604ca
Remove unused file
2024-02-29 20:20:35 +01:00
Tomasz Zieliński
fcbe399541
Cleanup
2024-02-29 20:12:46 +01:00
Tomasz Zieliński
74bd6d6075
Editor save & load template works
2024-02-29 20:05:20 +01:00
Tomasz Zieliński
2c32c770f7
First version that works in lobby
2024-02-29 12:45:08 +01:00
Ivan Savenko
08a27663f9
Reworked JsonNode constructors to more logical form
2024-02-26 12:55:49 +02:00
Ivan Savenko
54796c7c56
Rename toJson to toString/toCompactString for consistency
2024-02-26 12:55:49 +02:00
Ivan Savenko
c3957c2c2a
Moved json files to new directory, split on per-class basis
2024-02-14 13:08:24 +02:00
Ivan Savenko
9ebd194ab1
Merge pull request #3609 from IvanSavenko/single_process
...
Allow running server as part of client process
2024-02-14 12:06:22 +02:00
Ivan Savenko
6e399eb21a
Make some non-const static variables const or constexpr
2024-02-12 13:22:54 +02:00
Ivan Savenko
a909d7ddde
Removed cmake_modules/VCMI_lib macro, use it directly in place
2024-02-11 20:38:24 +02:00
Ivan Savenko
fd17133da3
Fix editor build
2024-02-06 00:40:26 +02:00
godric3
ec735aa959
Fix mine resource and productivity on map load, also made them non editable
2024-02-03 11:30:09 +01:00
godric3
b2cd92d937
Fix initializing map editor mod settings with more than one level of submods
2024-02-03 10:36:47 +01:00
godric3
dd004f0f6e
Fix inspector using wrong editor for some values
2024-01-21 21:07:06 +01:00
Ivan Savenko
6b760089a4
Merge pull request #3473 from IvanSavenko/const_lib
...
[1.5] Remove non-const global variables from library
2024-01-20 19:22:46 +02:00
Ivan Savenko
db5539b39d
Regenerated Qt translations
2024-01-19 21:21:23 +02:00
Ivan Savenko
ea1f05d15a
Stabilization
2024-01-19 13:55:22 +02:00
Ivan Savenko
e67e4430ba
Removed most of non-const static fields in lib. Reduced header includes.
2024-01-19 13:55:22 +02:00
Ivan Savenko
a15366f5a5
Make IObjectInterface::cb non-static
2024-01-19 13:55:21 +02:00
Ivan Savenko
d5c4478816
Remove most of non-const access to VLC entities
2024-01-19 13:54:49 +02:00
Ivan Savenko
bd5682ecc3
Merge remote-tracking branch 'vcmi/master' into develop
2024-01-19 13:49:54 +02:00
Alexander Wilms
73019c204d
Replace redundant types with auto for the lvalues of template factory functions for smart pointers
...
grep -r --include \*.h --include \*.cpp "= std::" * | grep -v auto | grep -Po ".*[^ ]+ [^ ]+ [^ ]*[ ]*=.*;" | grep -v "auto\|int\|char\|bool\|float|\double\|for\|if\|googletest\|fuzzylite\|size_t\|using\|return" | grep -v double | grep -v si64 | grep -v si32 | grep -v ui32 | grep \< | grep -v float | tr -d '\t' | grep -v assert > redundant_types.txt
import re
with open("redundant_types.txt") as f:
for line in f:
line = line.strip()
path = line.split(":", 1)[0]
original_code = ":".join(line.split(":")[1:]).strip()
print()
print(path)
print(original_code)
prefix = "auto "
if original_code.startswith("static"):
static = True
else:
static = False
cpp_type = " ".join(original_code.split("=")[0].strip().split(" ")[0:-1])
print(cpp_type)
if static:
new_code = "static auto "+ " ".join(original_code.split(" ")[2:])
else:
new_code = "auto "+ " ".join(original_code.split(" ")[1:])
print(new_code)
if True:
with open(path, "r") as f:
filedata = f.read()
filedata = filedata.replace(original_code, new_code)
with open(path, "w") as f:
f.write(filedata)
2024-01-17 12:50:00 +00:00
Ivan Savenko
e849e4170a
Merge pull request #3486 from Alexander-Wilms/replace-redundant-types-with-auto
...
Replace redundant types with `auto`
2024-01-17 13:31:05 +02:00
Alexander Wilms
1b85abb508
Use auto instead of redundant type in initializations using new
...
grep -r --include \*.h --include \*.cpp "=" * | grep -v "auto\|int\|char\|bool\|float|\double\|for\|if\|googletest\|fuzzylite\|size_t\|using\|return\|{\|}\|= \"\|= tr(\|virtual\|void" | grep -Po ".*[^ ]+ [^ ]+ [^ ]*[ ]*=.*;" | grep -v "float\|nullptr" | grep "new" | grep -v "AI/FuzzyLite" | grep \( | grep "= new" > redundant_types.txt
import re
with open("redundant_types.txt") as f:
for line in f:
line = line.strip()
path = line.split(":", 1)[0]
original_code = line.split(":")[1].strip()
if "new " in original_code:
cpp_type = original_code.split(" ")[0]
if original_code.count(cpp_type) == 2:
print()
print(path)
print(original_code)
new_code = "auto "+" ".join(original_code.split(" ")[1:])
print(new_code)
with open(path, "r") as f:
filedata = f.read()
filedata = filedata.replace(original_code, new_code)
with open(path, "w") as f:
f.write(filedata)
2024-01-16 21:40:53 +00:00
Alexander Wilms
cca08e29da
Remove duplicate semicolons
2024-01-16 19:02:39 +00:00
Tomasz Zieliński
817ab1d53d
Actually fix quest artifacts not getting banned at all
2024-01-16 17:16:03 +01:00
Tomasz Zieliński
285bafdbf4
Do not ban heroes in Prisons, they might be rehired after they are defeated.
...
Restore hero to pool if Prison fails to be placed.
2024-01-15 07:41:29 +01:00
kdmcser
f9252f2e90
Update Chinese translation for mapeditor
2024-01-13 17:57:36 +08:00
kdmcser
a2cda7f736
add Chinese mapeditor translation into its CMakeFiles.txt
2024-01-13 17:27:28 +08:00
Ivan Savenko
29eab0fdbe
Merge pull request #3476 from kdmcser/develop
...
Add Chinese translate for mapeditor
2024-01-12 21:54:22 +02:00
kdmcser
1d4862fc83
add Chinese translate for mapeditor
2024-01-12 23:12:54 +08:00
Alexander Wilms
781328f282
Convert C-style casts to the more verbose C++ style
2024-01-10 00:30:35 +00:00
Alexander Wilms
f3277b7953
Define each identifier in a dedicated statement
2024-01-10 00:22:23 +00:00
godric3
78b73961d1
Fix saving map settings (allowed abilities, spells, arts and heroes)
2024-01-09 21:52:11 +01:00
Ivan Savenko
ef5686634d
Removed no longer used code
2024-01-04 23:48:58 +02:00
Kryštof Černý
2bf0bb3ca4
cz consisteny
2023-12-29 16:56:04 +01:00
Kryštof Černý
c608a6dbdb
Apply suggestions from code review
...
Co-authored-by: Alexander Wilms <Alexander-Wilms@users.noreply.github.com>
2023-12-29 16:47:56 +01:00
Kryštof Černý
4429b20693
Update desktop files
2023-12-29 12:19:05 +01:00
Kryštof Černý
207b54fc6f
Add Czech to cmakelists
2023-12-27 17:20:13 +01:00
Ivan Savenko
161fc6eb58
Merge pull request #3344 from cewbdex/czech-work
...
More Czech translation work
2023-12-24 19:28:29 +02:00
Ivan Savenko
9b40271ab1
Update editor and tests
2023-12-22 17:56:43 +02:00
Kryštof Černý
23c58861ff
More Czech translation work
2023-12-18 17:15:50 +01:00
Kryštof Černý
a292bf1ce8
Translate editor
2023-12-14 11:10:27 +01:00
Laserlicht
4318e94bd0
regenerate translations; german update
2023-12-03 20:18:22 +01:00
Ivan Savenko
52050d0ef1
Fix build
2023-11-15 15:55:19 +02:00
Ivan Savenko
96c81be68e
Win/loss conditions now use VariantIdentifier. Removed non-implemented
...
options
2023-11-15 15:55:19 +02:00
Ivan Savenko
10e110320b
Remove std::vector<boo> from Json Serializer, simplify affected code
2023-11-15 15:55:18 +02:00
Ivan Savenko
eb167d94a6
Mod compatibility check is now in a separate class and not part of
...
ModHandler
2023-11-08 21:27:05 +02:00
Ivan Savenko
6b81012f31
Use variant identifier in netpacks where applicable
2023-11-08 14:00:23 +02:00
Tomasz Zieliński
c909bd766e
Merge remote-tracking branch 'origin/develop' into fix_rmg_teams
...
# Conflicts:
# lib/rmg/CMapGenOptions.cpp
# lib/rmg/CMapGenOptions.h
2023-11-07 20:54:04 +01:00
gamestales-com
afc0d8665a
#3151-windows-build-symlinks
2023-11-06 15:57:39 +01:00
Ivan Savenko
184f5a72cc
Use toEntity/toXXX methods in Identifier instead VLC objects access
2023-11-03 16:03:29 +02:00
Ivan Savenko
b42f073f0c
Stabilization
2023-11-01 18:26:57 +02:00
Ivan Savenko
8346d71c98
Remove more subID access
2023-11-01 14:44:05 +02:00
Ivan Savenko
7a09646009
Cleaned up dwelling randomization
2023-11-01 14:43:20 +02:00
Tomasz Zieliński
e105b23a37
Merge remote-tracking branch 'origin/develop' into fix_rmg_teams
...
# Conflicts:
# Mods/vcmi/config/vcmi/rmg/heroes3/newcomers.JSON
# Mods/vcmi/config/vcmi/rmg/heroes3/southOfHell.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/2sm0k.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/2sm2i(2).JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/3sb0b.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/3sb0c.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/5sb0a.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/5sb0b.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/7sb0b.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/7sb0c.JSON
# client/lobby/RandomMapTab.cpp
2023-10-30 20:08:13 +01:00
Ivan Savenko
29a78c14a2
Merge pull request #3113 from Alexander-Wilms/develop
...
Fix small issues
2023-10-30 11:02:28 +02:00
Andrii Danylchenko
b579ca8a33
#1912 trap, exception on adding duplicating hero
2023-10-29 11:03:37 +02:00
Tomasz Zieliński
07dac8b6d4
Works more or less
2023-10-28 20:30:38 +02:00
Alexander Wilms
a6db82f6f1
mapeditor/inspector/inspector.cpp: Directly assign to the "std::optional", without dereferencing it.
...
Assigning to an optional should directly target the optiona
2023-10-28 10:16:33 +00:00
nordsoft
b6b75beb29
Fixes for map editor
...
1) fix owner serialization for hero placeholder
2) fix roads/rivers layout
3) fix lasso
2023-10-24 23:58:26 +02:00
Ivan Savenko
3880ea58b9
Merge branch 'josch/dos2unix' into develop
2023-10-22 18:39:03 +03:00
Ivan Savenko
3867e512f7
Merge pull request #3064 from IvanSavenko/bonus_metaidentifier
...
Type-safe bonus system
2023-10-22 18:34:12 +03:00
Ivan Savenko
4f47555977
Split OBJECT bonus source into OBJECT_TYPE and OBJECT_INSTANCE
2023-10-22 16:55:19 +03:00
Ivan Savenko
ac925bb786
Renamed new types for consistency with code style
2023-10-22 16:55:19 +03:00
Ivan Savenko
b394158dc9
Bonus Source ID now uses metaidentifier
2023-10-22 16:55:18 +03:00
nordsoft
b9a660f6c3
Redesign map editor rendering
2023-10-20 01:25:06 +02:00
Nordsoft91
d03b75696a
Merge pull request #3067 from Nordsoft91/editor-improvements-1.4
...
Add hero placeholder properties
2023-10-19 22:23:58 +02:00
Johannes Schauer Marin Rodrigues
a1a5bc28c2
convert line endings from CRLF (Windows) to LF (Linux/Unix)
...
Mixed line endings cause problems when exporting patches with
git-format-patch and then trying to "git am" a patch with mixed and
non-matching line endings. In such a situation git will fail to apply
the patch.
This commit runs the dos2unix tools on the remaining files with CRLF
(\r\n) line endings to convert them to line-feeds (\n) only.
Files that are Windows specific like *.vcxproj and *.props files were
not converted.
Closes : #3073
2023-10-19 16:23:21 +02:00
Johannes Schauer Marin Rodrigues
f9e1b302c7
some spelling fixes
2023-10-18 01:41:02 +02:00
nordsoft
f6d7755c6a
Add hero placeholder properties
2023-10-16 22:24:12 +02:00
Nordsoft91
02c1425939
Merge pull request #3046 from Nordsoft91/editor-improvements-1.4
...
Add map editor zoom and objects lock functionality
2023-10-16 01:22:18 +02:00
nordsoft
4ab203eaae
Add more object search flexibility
2023-10-14 03:16:17 +02:00
nordsoft
788147a897
Add line and fill brushes
2023-10-14 02:58:13 +02:00
nordsoft
55900ceb66
Add portraits delegate
2023-10-13 20:15:29 +02:00
nordsoft
051886c98e
Add shurtcuts
2023-10-13 11:13:57 +02:00
nordsoft
d85c5189ba
Add object lock and zoom functinoality
2023-10-13 11:07:17 +02:00
nordsoft
006def7690
ui improvements
2023-10-13 11:07:17 +02:00
nordsoft
3199b7261f
Cosmetic fixes for map editor
2023-10-11 23:28:10 +02:00
nordsoft
7b7aaa36b2
fix compiling
2023-10-11 01:44:58 +02:00
nordsoft
5b10b457cf
Fix code review suggestions
2023-10-11 00:47:19 +02:00
nordsoft
5eeda3cd25
Quests mostly work
2023-10-10 23:44:29 +02:00
nordsoft
d2d64dbddd
Bugfixes
2023-10-10 23:44:29 +02:00
nordsoft
bb238f9b72
New quests work
2023-10-10 23:44:29 +02:00
nordsoft
63bdfb8ff6
New quests implemented
2023-10-10 23:44:29 +02:00
nordsoft
3a17eeb330
Fix typos in rewards widget
2023-10-10 23:44:29 +02:00
nordsoft
335585bd11
Remove unused variable
2023-10-09 19:21:27 +02:00
nordsoft
e2b8c2e9f8
PickObject delegate for random dwellings
2023-10-09 01:24:00 +02:00
nordsoft
cfa1a6d880
Show coordinates on map
2023-10-08 20:25:59 +02:00
nordsoft
043f54698b
Fix translations in map editor / fix crash on game end
2023-10-05 23:34:29 +02:00
nordsoft
766f9cf19f
Mistake fix
2023-10-05 22:55:24 +02:00
nordsoft
189f790b44
Translations bugfixes
2023-10-05 22:54:28 +02:00
Ivan Savenko
b75a67ef7c
Merge pull request #2973 from IvanSavenko/identifier_explicit_constructor
...
Improvements to type safety of Identifier class
2023-10-05 00:33:07 +03:00
Fabrice Tiercelin
99221c2d56
Fix Chinese translation
2023-10-04 21:04:06 +02:00
Ivan Savenko
037efdf5fc
Improvements to type safety of Identifier class
...
- Constructor of Identifier from integer is now explicit
- Lobby hero/town selection now uses Identifiers instead of int's
- Removed serialization workaround for hero portraits
- Added dummy objects for custom heroes portraits for ID resolver to use
- HeroInstance now stores portrait ID only in case of custom portrait
- Fixed loading of campaign heroes portraits on RoE maps
2023-10-04 18:05:23 +03:00
nordsoft
65e63bdf69
Fix text duplicating
2023-10-01 14:04:46 +02:00
nordsoft
f6093a84f0
Add newline symbol
2023-10-01 14:00:08 +02:00
nordsoft
7d56b704a2
Fix events/rumors identifiers
2023-10-01 13:38:16 +02:00
nordsoft
9c5725da66
Convertion finished
2023-10-01 13:32:35 +02:00
nordsoft
4e5580f3d9
Fix typo
2023-10-01 02:39:03 +02:00
nordsoft
e9855de101
Layout fixes
2023-10-01 02:35:02 +02:00
nordsoft
cb02e221f3
Couple fixes
2023-09-30 04:33:41 +02:00
nordsoft
3018178956
Remember folder for images as well
2023-09-30 03:44:13 +02:00
nordsoft
53dadc6dc3
Add map converter
2023-09-30 03:42:29 +02:00
nordsoft
70796d232b
Full support of maps translations
2023-09-29 00:24:45 +02:00
nordsoft
ae073ee35d
Remove unused identifiers
2023-09-28 23:15:36 +02:00
nordsoft
38d12bbe8c
Final changes for map editor translations
2023-09-28 22:48:52 +02:00
nordsoft
ab85e724eb
Read-only UI logic for translations
2023-09-28 16:20:21 +02:00
nordsoft
db93b8eaa1
UI draft for map translations
2023-09-28 15:29:43 +02:00
nordsoft
dbf3cad796
Register all text IDs in map editor
2023-09-28 14:49:47 +02:00
nordsoft
98fde9ab1d
Add string IDs in map editor
2023-09-28 14:38:31 +02:00
nordsoft
60df49236f
Inspector widgets set string ID
2023-09-28 14:03:58 +02:00
nordsoft
232b3e8cf6
Compile map editor
2023-09-28 13:28:37 +02:00
nordsoft
486091a915
Heroes switched to text id
2023-09-28 00:00:32 +02:00
nordsoft
0c94a4d891
Town name switched to id
2023-09-27 23:57:05 +02:00
Nordsoft91
c803b57c33
Merge pull request #2889 from Nordsoft91/mod-compatibility-check
...
Proper mod compatibility check logic
2023-09-26 19:29:46 +02:00
An Vu
b8eba01b7d
add Launcher and Map Editor
2023-09-24 21:09:09 +07:00
nordsoft
dce1ac1538
Redesign mod incompatibility message
2023-09-23 00:32:48 +02:00
nordsoft
a05f8339ae
Proper mod compatibility check system
2023-09-21 04:31:08 +02:00
Ivan Savenko
a16d47037e
Fix build
2023-09-19 19:24:35 +03:00
nordsoft
2960895041
Issues fixed
2023-09-17 22:19:45 +02:00
nordsoft
a517e6ad8e
Message split for pandora box
2023-09-17 18:02:24 +02:00
nordsoft
7b22aefb12
Some minor fixes
2023-09-17 13:03:42 +02:00
nordsoft
10d783d8ee
Undefined behavior fix
2023-09-16 05:59:16 +02:00
nordsoft
033e7010ca
Fix for empty primary skills array
2023-09-16 05:52:23 +02:00
nordsoft
991a755a1f
Added new rewardable widget
2023-09-16 05:34:27 +02:00
nordsoft
06f01c3b82
Seerhut works as rewardable object
2023-09-15 10:06:06 +02:00
nordsoft
574047c55c
Start making new serialization for rewardables
2023-09-13 09:18:46 +02:00
nordsoft
6a0b26d402
Object picker for victory/loss conditions
2023-09-11 20:37:26 +02:00
nordsoft
1ac886ca71
Refactor abstract settings to have map controller
2023-09-11 20:37:26 +02:00
nordsoft
3024aaae30
Town picker in player settings implemented
2023-09-11 20:37:26 +02:00
nordsoft
727284c05e
Bump editor version
2023-09-11 20:37:26 +02:00
nordsoft
19407954ed
Object picker implemented
2023-09-11 20:37:26 +02:00
nordsoft
082e1194ff
Little refactoring
2023-09-11 20:37:26 +02:00
