1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Commit Graph

9911 Commits

Author SHA1 Message Date
c5dd8b17d7 Merge pull request #1575 from rilian-la-te/russian.json
vcmi: russian translation
2023-02-14 00:32:56 +02:00
4f4f2db9c0 Merge pull request #1521 from vcmi/android-remove-server-main
Rework netpacks
2023-02-13 22:10:33 +02:00
9f55666931 rework netpacks to avoid double typeinfo 2023-02-13 20:26:39 +02:00
8855829527 Andorid: remove server main 2023-02-13 20:26:39 +02:00
71b1d77613 Merge pull request #1569 from SoundSSGood/contitutient-swap
combined arts swap
2023-02-13 20:23:42 +02:00
0f93b0991c Regression fixed 2023-02-13 15:16:42 +02:00
8504102c53 Merge branch 'vcmi:develop' into contitutient-swap 2023-02-13 09:51:42 +02:00
e6b21ed298 Merge pull request #1574 from SoundSSGood/contitutient-move
combined art move
2023-02-13 08:30:35 +02:00
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
2976739c97 some refactoring 2023-02-12 21:27:37 +02:00
203b7ed364 vcmi: russian translation 2023-02-12 22:05:25 +03:00
34a0dbc0b6 misc slots. fixed combined arts moving 2023-02-12 20:13:26 +02:00
6362983db2 Merge pull request #1573 from rilian-la-te/small-optimizations
Small optimizations
2023-02-12 19:43:55 +02:00
6d8eac320d vcmi/client: add missing include to GUIclasses.cpp
Fix building with clang++ version 15.
2023-02-12 19:11:24 +03:00
0627e1ecaa vcmi: remove unused variables from lib/rmg 2023-02-12 19:11:24 +03:00
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
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
b30d23d278 vcmi: make ConstTransitivePtr always init self. 2023-02-12 17:59:06 +03:00
c8c38ac922 Merge pull request #1386 from IvanSavenko/resolutions_filter
Do not allow selecting resolutions not supported by display
2023-02-12 14:33:39 +02:00
7314df56ac contitutient arts swap 2023-02-11 13:21:45 +02:00
a20e6aecb7 Merge pull request #1568 from vcmi/DjWarmonger-patch-2
Update CRewardableConstructor.cpp
2023-02-11 12:14:50 +01:00
94bc418e34 Update CRewardableConstructor.cpp
Fixed swapped identifiers in Limiter.
2023-02-11 08:28:29 +01:00
286c1e522e vcmi: modernize netpacks 2023-02-09 20:22:48 +03:00
4a0a82ceb4 Merge pull request #1553 from IvanSavenko/sdl_cleanup
SDL usage cleanup
2023-02-08 18:14:15 +02:00
f1b348ae87 Suppress warning 2023-02-08 20:09:37 +04:00
06c451c1f5 Fix compiling 2023-02-08 20:09:37 +04:00
da8942ccfb Try to fix compilation 2023-02-08 20:09:37 +04:00
44e195c625 Fix compiling according to latest changes 2023-02-08 20:09:37 +04:00
fac93bb7d6 Address review comments 2023-02-08 20:09:37 +04:00
e0b467e144 Code polishing 2023-02-08 20:09:37 +04:00
447e01aba3 Proper defeat message 2023-02-08 20:09:37 +04:00
5fceb97838 Support few more victory conditions 2023-02-08 20:09:37 +04:00
7f55916a4b Support couple more conditions 2023-02-08 20:09:37 +04:00
a3413eefce Some vic/loss conditions for editor 2023-02-08 20:09:37 +04:00
4e21aab76a Continue working on vicloss conditions 2023-02-08 20:09:37 +04:00
4ce68298d1 Starting work on map settings 2023-02-08 20:09:37 +04:00
aad635b2e6 Merge pull request #1559 from rilian-la-te/modernize-vstd-spell-effects
Modernize vstd spell effects
2023-02-08 18:05:16 +02:00
f662f38984 Merge pull request #1558 from rilian-la-te/lua-strict
vcmi: build lua with STRICT_COMPILATION
2023-02-08 18:04:53 +02:00
e82cc56ddb vcmi: modernize lib/spells/effects 2023-02-08 15:38:26 +03:00
ab8b407294 Style cleanup 2023-02-08 13:56:09 +02:00
2f440e435a Merge pull request #1557 from Nordsoft91/fix-altactions
Fix alternative actions button redraw
2023-02-08 13:52:21 +02:00
976c5e7bd4 vcmi: modernize lua 2023-02-08 13:51:22 +03:00
cb3723b54c vstd: pass separators and input by reference
It removes many cases of redundnant string copying
2023-02-05 18:07:56 +03:00
fb38050f9b vcmi: build lua with STRICT_COMPILATION
This is a fixes for some LUA warnings for building it with strict
compilation.
2023-02-05 12:18:09 +03:00
14d27c788f hide AI cheating message 2023-02-05 11:00:58 +02:00
588b744534 Merge pull request #1552 from dydzio0614/polish-translations
Add polish translations, tiny improvement of english translations
2023-02-05 10:23:53 +02:00
908f8f5aee Update README.md 2023-02-05 10:06:35 +02:00
b9030fe9cc Better name for bonus 2023-02-05 00:56:37 +01:00
fd6987ea0a Fix alternative actions button redraw 2023-02-05 03:29:50 +04:00
719a11bdf6 Translate VCMI essential files 2023-02-04 18:51:30 +01:00