games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Code Issues Releases Activity
14,554 Commits 19 Branches 62 Tags 110 MiB
339fad6e27
Commit Graph

582 Commits

Author SHA1 Message Date
Ivan Savenko
bd5682ecc3 Merge remote-tracking branch 'vcmi/master' into develop 2024-01-19 13:49:54 +02:00
Ivan Savenko
3e8f110482
Merge pull request #3515 from SoundSSGood/backpack-statusbar 
Backpack statusbar
 2024-01-18 16:05:42 +02:00
SoundSSGood
a753319ad0 backpack window statusbar 2024-01-18 15:55: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
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
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
Laserlicht
056dccda30
different max width 2024-01-08 00:08:05 +01:00
Laserlicht
24d4816a36
trim text 2024-01-07 23:42:48 +01:00
Ivan Savenko
a9005da01e
Merge pull request #3366 from Laserlicht/battle_informations 
Battle stacks informations
 2023-12-28 12:39:26 +02:00
Ivan Savenko
28a3deb42b Do not allow stealing input focus from ourselves 2023-12-24 22:01:22 +02:00
Ivan Savenko
ec1aee68d5 Fix invisible chat in pregame. Fixed positioning of chat box 2023-12-23 18:12:55 +02:00
Laserlicht
f0c97b344a
add duration + morale/luck 2023-12-23 16:07:12 +01:00
Laserlicht
c20f0bdc3e
using CHeroArea 2023-12-22 01:30:41 +01:00
SoundSSGood
e5c532beb4 gesture for quick backpack window 2023-12-20 16:55:38 +02:00
SoundSSGood
5099b52a4f Quick backpack. Spells on scrolls view 2023-12-19 19:01:56 +02:00
SoundSSGood
21b02414bf Refactoring. Callbacks have been encapsulated. Added cursorPosition 2023-12-19 19:01:56 +02:00
SoundSSGood
29b61081f3 Quick backpack 2023-12-19 19:01:56 +02:00
Ivan Savenko
902db091da Simple fix for slider activation when clicking on left/right buttons 2023-12-09 18:09:10 +02:00
Ivan Savenko
861c53059e Added callbacks for preset dropdowns 2023-12-07 13:57:16 +02:00
Ivan Savenko
1f0bcbc194 Added option to configure dropdown position 2023-12-07 13:57:16 +02:00
Ivan Savenko
0fd966818f Remove 'visible' property from images, replaced with enable/disabled 
call
 2023-12-07 13:57:16 +02:00
Ivan Savenko
5df53f6ea2 Hota compatibility fix - allow stack selection border to have different 
size than creature icon
 2023-11-27 23:20:24 +02:00
Ivan Savenko
81a48f2d80 Do not attempt to resize text box to zero-width 2023-11-27 14:08:49 +02:00
Ivan Savenko
c5eeaa6526 Added non-linear slider for better simturn duration selection 2023-11-13 19:06:56 +02:00
gamestales-com
a574f18e69 #2903-morale-description-#1442 2023-11-10 15:58:19 +01:00
Ivan Savenko
6b81012f31 Use variant identifier in netpacks where applicable 2023-11-08 14:00:23 +02:00
Ivan Savenko
0b4fa20bdc
Merge pull request #3152 from SoundSSGood/CAltar-widget 
Altar rework
 2023-11-08 13:42:00 +02:00
SoundSSGood
41ee52d9d4 fix build & suggested changed 2023-11-08 01:51:13 +02:00
Ivan Savenko
f039b20653 Improvement for wandering monster tooltip/hover text: 
- show Visions information only on right-click (H3 logic)
- show threat level only on right-click and only if UI tweaks are on
 2023-11-06 20:37:07 +02:00
SoundSSGood
539b2e596d adjusting the placement of artifact slots 2023-11-06 14:31:32 +02:00
SoundSSGood
75ebd954af Creatures altar & Artifacts altar 2023-11-06 14:31:32 +02:00
SoundSSGood
9f9317a8a0 CTradeBase initial commit 2023-11-06 14:31:31 +02:00
SoundSSGood
fbe3e0fe12 CArtPlace preparation 2023-11-06 14:01:13 +02:00
Ivan Savenko
056ef00f74 Bugfixing 2023-11-02 13:52:58 +02:00
Ivan Savenko
10e50548e7 Converted Component class to use VariantIdentifier instead of int 2023-11-02 12:00:04 +02:00
Ivan Savenko
7107b3202f
Merge pull request #3069 from SoundSSGood/artifact-location-id 
ArtifactLocation now use ID for artHolder identification
 2023-11-01 14:41:36 +02:00
SoundSSGood
3c5527a222 ArtifactLocation now use ID for artHolder identification part3 2023-10-29 17:46:13 +02:00
SoundSSGood
ab2f6abb87 ArtifactLocation now use ID for artHolder identification part2 2023-10-29 17:46:13 +02:00
Alexander Wilms
5cbc75d3b7 Merge remote-tracking branch 'upstream/develop' into develop 2023-10-29 13:35:37 +00:00
Alexander Wilms
e677164ed0 client/widgets/Buttons.h: Fix const reference 
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
 2023-10-29 13:34:19 +00:00