Ivan Savenko
|
3e8f110482
|
Merge pull request #3515 from SoundSSGood/backpack-statusbar
Backpack statusbar
|
2024-01-18 16:05:42 +02:00 |
|
Ivan Savenko
|
b698b6e79d
|
Merge pull request #3512 from Alexander-Wilms/use-auto-with-template-factory-functions-for-smart-pointers
Use auto with template factory functions for smart pointers
|
2024-01-18 16:05:05 +02:00 |
|
Ivan Savenko
|
9025744cc5
|
Merge pull request #3510 from Alexander-Wilms/remove-semicolons-from-macros
Remove trailing semicolons from more macros
|
2024-01-18 16:03:55 +02:00 |
|
SoundSSGood
|
a753319ad0
|
backpack window statusbar
|
2024-01-18 15:55:54 +02:00 |
|
Alexander Wilms
|
b364f707cd
|
Fix issues introduced by automated replacement of redundant types
|
2024-01-17 20:12:57 +00:00 |
|
Alexander Wilms
|
7a1cee1a60
|
Fix error: 'auto' not allowed in non-static struct member
|
2024-01-17 14:49:28 +00: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
|
ccac73fb69
|
Remove trailing semicolons from more macros
|
2024-01-16 19:46:21 +00:00 |
|
Alexander Wilms
|
cca08e29da
|
Remove duplicate semicolons
|
2024-01-16 19:02:39 +00:00 |
|
Ivan Savenko
|
019a4151b9
|
Merge pull request #3258 from SoundSSGood/trade-panels
Market rework
|
2024-01-12 21:53:13 +02:00 |
|
SoundSSGood
|
4df7de36c1
|
fixed regression
|
2024-01-11 14:51:42 +02:00 |
|
SoundSSGood
|
b840cf3650
|
suggested changes
|
2024-01-11 12:46:32 +02:00 |
|
Alexander Wilms
|
781328f282
|
Convert C-style casts to the more verbose C++ style
|
2024-01-10 00:30:35 +00:00 |
|
Alexander Wilms
|
5e9f98b15c
|
Resolve intentionality issues
|
2024-01-10 00:23:24 +00:00 |
|
Alexander Wilms
|
f3277b7953
|
Define each identifier in a dedicated statement
|
2024-01-10 00:22:23 +00:00 |
|
SoundSSGood
|
fdf60b2151
|
moved to widgets/markets
|
2024-01-09 20:21:09 +02:00 |
|
SoundSSGood
|
d0ca63d2c9
|
subclasses for market composition
|
2024-01-08 16:24:47 +02:00 |
|
SoundSSGood
|
50a5c72d1b
|
Creatures trade panel
|
2024-01-08 16:24:47 +02:00 |
|
SoundSSGood
|
791ee78cc4
|
players trade panel
|
2024-01-08 16:24:47 +02:00 |
|
SoundSSGood
|
f043c417a1
|
Artifacts trade panel
|
2024-01-08 16:24:47 +02:00 |
|
SoundSSGood
|
b246e24811
|
reworking slot selection
|
2024-01-08 16:24:47 +02:00 |
|
SoundSSGood
|
6c828d1be9
|
Resources trade panel
|
2024-01-08 16:24:47 +02:00 |
|
Ivan Savenko
|
ae79c5e953
|
Merge pull request #3397 from Laserlicht/cheat_allow
option for disabling cheats
|
2024-01-07 21:42:02 +02:00 |
|
Joakim Thorén
|
100664e019
|
Fix compilation error where gcc 12.1.0 (MinGW) errors with "writing 1 byte into a region of size 0"
|
2024-01-02 01:43:49 +01:00 |
|
Laserlicht
|
cb9c4bbaf0
|
unlimited replay option
|
2023-12-28 20:48:19 +01:00 |
|
Laserlicht
|
a3e27b859e
|
extra option tab
|
2023-12-28 19:41:01 +01:00 |
|
Laserlicht
|
c471b626a2
|
code review
|
2023-12-27 15:26:08 +01:00 |
|
Laserlicht
|
fc4827c89c
|
option for allowing cheats
|
2023-12-27 14:39:35 +01:00 |
|
Ivan Savenko
|
28a3deb42b
|
Do not allow stealing input focus from ourselves
|
2023-12-24 22:01:22 +02:00 |
|
Dydzio
|
046d3abee4
|
Add new setting for instant adventure map fade in / fadeout effects
|
2023-12-24 17:18:48 +01:00 |
|
Ivan Savenko
|
172e385f67
|
Merge pull request #3375 from Laserlicht/round_counter
turn indicator
|
2023-12-24 16:25:04 +02:00 |
|
Ivan Savenko
|
85d930bbd0
|
Merge pull request #3374 from dydzio0614/default-large-spellbook
Default large spellbook
|
2023-12-24 16:23:29 +02:00 |
|
Ivan Savenko
|
2b495a9679
|
Merge pull request #3379 from IvanSavenko/fix_genie_spellcasting
Fix genie spellcasting
|
2023-12-24 13:29:05 +02:00 |
|
Laserlicht
|
39c58a9d94
|
disable animation button
|
2023-12-24 00:41:29 +01:00 |
|
Ivan Savenko
|
85de3143ff
|
Fixed Genie spellcasting logic to account for spell immunities
|
2023-12-24 01:13:19 +02:00 |
|
Ivan Savenko
|
bcbd708fa7
|
Added more checks to detect illegal access in CList's class
|
2023-12-24 00:16:29 +02:00 |
|
Laserlicht
|
fe8bf92a20
|
only a bar in small mode
|
2023-12-23 22:00:28 +01:00 |
|
Laserlicht
|
c540dd1183
|
round_counter
|
2023-12-23 19:57:19 +01:00 |
|
Ivan Savenko
|
a08546e964
|
Correctly update hero list on reordering via radial menu
|
2023-12-23 18:13:55 +02:00 |
|
Ivan Savenko
|
50536e28da
|
Fixed invalid text ID in description of "start with hero" campaign bonus
|
2023-12-23 18:13:31 +02:00 |
|
Ivan Savenko
|
ec1aee68d5
|
Fix invisible chat in pregame. Fixed positioning of chat box
|
2023-12-23 18:12:55 +02:00 |
|
Ivan Savenko
|
9bf1e72a19
|
Merge pull request #3346 from IvanSavenko/better_timers
[1.4.2] Better timers
|
2023-12-22 23:19:20 +02:00 |
|
Ivan Savenko
|
5d7901cd8c
|
Fixed timer countdown sound playback
|
2023-12-22 22:46:29 +02:00 |
|
Ivan Savenko
|
0a8b81b2c4
|
Fix deactivation of current stack if player does not acts in time
|
2023-12-22 22:46:09 +02:00 |
|
Ivan Savenko
|
ebbba0029f
|
Fix positioning and size of turn timers widget with English fonts
|
2023-12-22 18:40:29 +02:00 |
|
Ivan Savenko
|
d8c69d39d8
|
Restored sound notifications
|
2023-12-22 18:40:29 +02:00 |
|
Ivan Savenko
|
37a8c8db8d
|
Workaround for vcmi-extras bug
|
2023-12-22 18:40:29 +02:00 |
|
Ivan Savenko
|
fe5918ebf5
|
Clients will now switch to turn options when host does so
|
2023-12-22 18:40:28 +02:00 |
|