1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Commit Graph

9943 Commits

Author SHA1 Message Date
Andrey Filipenkov
59948a41a6 use std::call_once instead of bool flag 2023-02-22 14:00:50 +03:00
Dydzio
2d80ce8203 Add discord link to readme 2023-02-18 22:22:44 +02:00
Andrii Danylchenko
e13a230848 merge conflict regression fix 2023-02-18 17:19:33 +02:00
Andrii Danylchenko
3033b9751e
Merge pull request #1590 from vcmi/fix-1579
#1579 - check z coord as well
2023-02-18 14:31:31 +02:00
Andrii Danylchenko
47b253e837 #1579 - check z coord as well 2023-02-17 18:34:57 +02:00
Andrii Danylchenko
27ef876bd6
Merge pull request #1576 from vcmi/fix-campaigns
Hack to fix campaigns
2023-02-16 20:22:41 +02:00
Andrii Danylchenko
6314fc0506 Fix destructor order 2023-02-15 20:37:18 +02:00
Andrii Danylchenko
c6feafc367 Hack to fix campaigns 2023-02-15 20:37:18 +02:00
Ivan Savenko
59fe6dc358
Merge pull request #1583 from IvanSavenko/regressions_fix
fix regressions from modernization
2023-02-15 14:27:34 +02:00
Ivan Savenko
f65c6ad275 fix regressions from modernization 2023-02-15 14:27:12 +02:00
Ivan Savenko
5d98471d12
Merge pull request #1567 from rilian-la-te/modernize-maps
Modernize maps
2023-02-14 23:42:03 +02:00
Ivan Savenko
afbe22f0ca
Merge pull request #1577 from rilian-la-te/toolbar-actions
Toolbar action names
2023-02-14 19:33:35 +02:00
Konstantin
5f181e25af vcmi: modernize lib/mapObjects 2023-02-14 14:39:56 +03:00
Konstantin
b16f66477c vcmi: modernize lib/mapping 2023-02-14 14:22:13 +03:00
Ivan Savenko
64ddd75cdc
Merge pull request #1571 from IvanSavenko/advmap_elements_refactoring
Advmap elements refactoring
2023-02-14 12:53:23 +02:00
Ivan Savenko
fbbfa29030
Merge pull request #1561 from rilian-la-te/modernize-serializer-spells
VCMI: modernize lib/serializer and modernize lib/spells
2023-02-14 12:12:39 +02:00
Ivan Savenko
18d1823d44 Fix build 2023-02-14 11:32:20 +02:00
Ivan Savenko
72fe1fcfa9 Fix minimap updating on hero loss 2023-02-14 11:32:19 +02:00
Ivan Savenko
91b17bed79 Partial encapsulation of AdvMapInt 2023-02-14 11:18:42 +02:00
Ivan Savenko
e15c7dcd33 Attempt at better encapsulation of CTerrainRect 2023-02-14 11:18:41 +02:00
Ivan Savenko
89c29206f1 Internal classes of mapHandler are now in global namespace 2023-02-14 11:18:41 +02:00
Ivan Savenko
cc0c3e5bc9 All adventure map components now use shared_ptr 2023-02-14 11:18:41 +02:00
Ivan Savenko
f8c1c46562 removed CAdvMapInt::handleRightClick method 2023-02-14 11:18:41 +02:00
Ivan Savenko
d0f57fed6f Cleaned up code of Minimap 2023-02-14 11:18:41 +02:00
Konstantin
e4f4eb3c1b vcmi/mapeditor: change source strings 2023-02-14 11:22:27 +03:00
Konstantin
7bfb37df4d vcmi: modernize lib/rmg 2023-02-14 02:50:39 +03:00
Konstantin
61e61420e9 vcmi/mapeditor: update translations 2023-02-14 02:31:14 +03:00
Konstantin
9675213beb vcmi: fix #1454
This is fix for this issue.
2023-02-14 02:18:15 +03:00
Ivan Savenko
c5dd8b17d7
Merge pull request #1575 from rilian-la-te/russian.json
vcmi: russian translation
2023-02-14 00:32:56 +02:00
Andrii Danylchenko
4f4f2db9c0
Merge pull request #1521 from vcmi/android-remove-server-main
Rework netpacks
2023-02-13 22:10:33 +02:00
Andrii Danylchenko
9f55666931 rework netpacks to avoid double typeinfo 2023-02-13 20:26:39 +02:00
Andrii Danylchenko
8855829527 Andorid: remove server main 2023-02-13 20:26:39 +02:00
Andrii Danylchenko
71b1d77613
Merge pull request #1569 from SoundSSGood/contitutient-swap
combined arts swap
2023-02-13 20:23:42 +02:00
SoundSSGood
0f93b0991c Regression fixed 2023-02-13 15:16:42 +02:00
SoundSSGood
8504102c53
Merge branch 'vcmi:develop' into contitutient-swap 2023-02-13 09:51:42 +02:00
Andrii Danylchenko
e6b21ed298
Merge pull request #1574 from SoundSSGood/contitutient-move
combined art move
2023-02-13 08:30:35 +02:00
Andrii Danylchenko
c41a0a37e7
Merge pull request #1562 from rilian-la-te/modernize-netpacks
vcmi: modernize lib/NetPacks.h and lib/NetPacksBase.h
2023-02-12 23:10:21 +02:00
SoundSSGood
2976739c97 some refactoring 2023-02-12 21:27:37 +02:00
Konstantin
203b7ed364 vcmi: russian translation 2023-02-12 22:05:25 +03:00
Konstantin
f0bfce29a0 vcmi: modernize lua v2 2023-02-12 21:23:00 +03:00
Konstantin
bdd976cc1e vcmi: modernize spell effects v2 2023-02-12 21:23:00 +03:00
Konstantin
97fc424e98 vcmi: modernize lib/spells (except adventure one, needs major rework) 2023-02-12 21:23:00 +03:00
Konstantin
8661496f6c vcmi: modernize lib/serializer 2023-02-12 21:23:00 +03:00
SoundSSGood
34a0dbc0b6 misc slots. fixed combined arts moving 2023-02-12 20:13:26 +02:00
Ivan Savenko
6362983db2
Merge pull request #1573 from rilian-la-te/small-optimizations
Small optimizations
2023-02-12 19:43:55 +02:00
Konstantin
6d8eac320d vcmi/client: add missing include to GUIclasses.cpp
Fix building with clang++ version 15.
2023-02-12 19:11:24 +03:00
Konstantin
0627e1ecaa vcmi: remove unused variables from lib/rmg 2023-02-12 19:11:24 +03:00
Konstantin
3cf303f1c7 vcmi/client: make ColorRGBA constexpr
1. Replace overflowing int3 to ColorRGBA, which is more semantically
   correct
2. Make ColorRGBA constexpr, to make sure than hardcoded colors can
   be initialized in compile time
2023-02-12 19:11:24 +03:00
Konstantin
038db5c71b vcmi: make int3 as constexpr class
This allows us to calculate distances and check const vector validity
at compile time
2023-02-12 19:00:43 +03:00
Konstantin
b30d23d278 vcmi: make ConstTransitivePtr always init self. 2023-02-12 17:59:06 +03:00