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 |
|