games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity
13,635 Commits 19 Branches 62 Tags 112 MiB
e105b23a37
Commit Graph

5154 Commits

Author SHA1 Message Date
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
Tomasz Zieliński
f39edf9413 Update ally and enemy flags when selecting new template 2023-10-30 07:48:51 +01:00
Tomasz Zieliński
4f2cde018c Fixed most of reported issues, removed unused code. 2023-10-29 21:25:39 +01: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
Alexander Wilms
5d7b83c10b client/widgets/Buttons.cpp: Fix const reference 
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
 2023-10-29 13:34:19 +00:00
Alexander Wilms
466cdb9d2b client/widgetsImages.{h,cpp}: implicit conversion loses integer precision: 'int' to 'uint8_t' (aka 'unsigned char') 2023-10-29 13:34:19 +00:00
Alexander Wilms
f1bb6b999c client/widgets/Buttons.{h,cpp}: Pass expensive to copy object "callback" by reference to const. 2023-10-29 13:33:57 +00:00
Ivan Savenko
0169c65937
Merge pull request #3100 from IvanSavenko/split_net_packs 
Split netpacks.h into multiple files
 2023-10-29 13:46:40 +02:00
Tomasz Zieliński
368a185008 Cleaning up the code 2023-10-29 10:05:24 +01:00
Alexander Wilms
e4db6f2af8 CClient::removeGUI(): This function should be declared 'const' 2023-10-28 23:05:05 +00:00
Tomasz Zieliński
07dac8b6d4 Works more or less 2023-10-28 20:30:38 +02:00
Alexander Wilms
bb04ca46b5 client/NetPacksClient.cpp: Combine null pointer checks 
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
 2023-10-27 23:43:39 +00:00
Alexander Wilms
92bab6dd08 client/NetPacksClient.cpp: Combine null pointer checks 
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
 2023-10-27 23:43:39 +00:00
Alexander Wilms
d2c03773cd client/NetpacksClient.cpp: Called C++ object pointer is null 
Null pointers should not be dereferenced
 2023-10-27 23:43:39 +00:00
Alexander Wilms
ead1140b9b client/icons/generate_icns.py: Replace print statement by built-in function. 
The "print" statement should not be used
 2023-10-27 23:34:11 +00:00
Alexander Wilms
10ad5b6789 client/windows/CCastleInterface.cpp: Identical sub-expressions on both sides of operator "&&". 
Identical expressions should not be used on both sides of a binary operator
 2023-10-27 18:19:17 +00:00
Alexander Wilms
f01ec55d21 Use the "nullptr" literal. 
"nullptr" should be used to denote the null pointer
 2023-10-27 18:18:59 +00:00
Alexander Wilms
3616235bb5 FramerateManager.cpp: Merge this "if" statement with the enclosing one. 
Collapsible "if" statements should be merged
 2023-10-27 14:30:04 +00:00
Nordsoft91
8f2b50a5e2
Merge pull request #3095 from Laserlicht/team_alignment 
fix team alignments
 2023-10-26 23:19:18 +02:00
Tomasz Zieliński
a817e481d0 Merge fix 2023-10-26 10:46:04 +02:00
Tomasz Zieliński
36911d1e0a Merge remote-tracking branch 'origin/develop' into fix_rmg_teams 
# Conflicts:
#	client/lobby/RandomMapTab.cpp
 2023-10-26 10:31:41 +02:00
Laserlicht
e28d14d16d
not needed anymore 2023-10-24 18:56:30 +02:00
Laserlicht
abb279f5b4
use config 2023-10-24 18:51:58 +02:00
Ivan Savenko
5523f05284 Moved ArtifactLocation to a separate file 2023-10-23 19:02:28 +03:00
Ivan Savenko
b88a8da4e8 Split off some netpack structures into separate files 2023-10-23 13:59:15 +03: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
a70ad7202f
Merge pull request #3088 from Laserlicht/non_squared 
Minimap keep aspect ratio (Letterboxing)
 2023-10-22 16:55:58 +03:00
Ivan Savenko
ac925bb786 Renamed new types for consistency with code style 2023-10-22 16:55:19 +03:00
Ivan Savenko
80e6485965 MetaIdentifier now uses std::variant internally 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
Ivan Savenko
77facf9387 Implement missing functions, fixes linking errors 2023-10-22 16:54:56 +03:00
Ivan Savenko
454ba44ac5
Merge pull request #2988 from IvanSavenko/configurable_extensions 
Extension of configurable object functionality
 2023-10-22 16:24:47 +03:00
Laserlicht
b67548e7cf
format 2023-10-22 15:06:12 +02:00
Laserlicht
7b370d1967
fix team alignments 2023-10-22 15:00:04 +02:00
Ivan Savenko
8752551786
Merge pull request #3086 from Laserlicht/show_random 
show random maps
 2023-10-22 12:29:31 +03:00
Ivan Savenko
acc8e9db32
Merge pull request #3082 from SoundSSGood/crash-hotfix 
Сrash fixed  and little optimization
 2023-10-22 12:01:28 +03:00
Ivan Savenko
07cd894024
Merge pull request #3090 from Laserlicht/fix_town_selection 
[fix] no town selection on loadscreen
 2023-10-22 12:01:00 +03:00
Laserlicht
0b0082eebc
format 2023-10-22 00:22:49 +02:00
Laserlicht
ab59c153b3
fix 2023-10-22 00:22:16 +02:00
Laserlicht
05a9f0fe39
move to EventReceiver 2023-10-22 00:05:14 +02:00
Laserlicht
6939989026
try to fix 2023-10-21 23:37:59 +02:00
Laserlicht
a042cc46c2
no town selection on loadscreen 2023-10-21 19:10:02 +02:00
Laserlicht
d215ffa011
optics 2023-10-21 18:45:45 +02:00
Laserlicht
737525756f
fix redraw 2023-10-21 17:28:23 +02:00
Laserlicht
e03f2a9d3a
improvements for non quadratic maps 2023-10-21 16:49:50 +02:00
Laserlicht
86e6f7d156
fix 2023-10-21 02:26:03 +02:00
Laserlicht
ceb70af528
fix 2023-10-21 02:22:22 +02:00
Laserlicht
9a116f9b20
small optimisation 2023-10-21 02:16:42 +02:00