games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-10 00:43:59 +02:00
Code Issues Releases Activity
10,033 Commits 21 Branches 64 Tags 117 MiB
785e5237ff
Commit Graph

10033 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dydzio
b28a16ddd4 Settings UI tweaks 2023-02-12 21:35:30 +01: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
Dydzio
de5138c854 Basic separation of adventure map & general tabs 2023-02-12 19:25:59 +01: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
Dydzio
58bed920b4 Sort out settings files structure 2023-02-12 17:49:41 +01:00
Dydzio
7430616ada Move settings to separate subfolder 2023-02-12 17:29:23 +01: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
Dydzio
34227a0dab Integrate new settings with battle UI 2023-02-12 15:49:17 +01:00
Dydzio
2f171fcc0e Merge branch 'develop' into settings-rework 2023-02-12 15:03:33 +01:00
Dydzio
ee186f3839 Conversion of battle settings to configurable interface 2023-02-12 13:51:57 +01:00
Ivan Savenko
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
Dydzio
319d05b94f Missing merge conflict stuff 2023-02-12 12:05:12 +01:00
Dydzio
11df79dc2a Minor formatting 2023-02-12 11:55:39 +01:00
Dydzio
fc7d2b9778 Merge remote-tracking branch 'origin/develop' into settings-rework 2023-02-12 11:55:21 +01:00
Dydzio
8f0da8fe17 Move battle options labels to configurable interface 2023-02-12 11:37:40 +01:00
SoundSSGood
7314df56ac contitutient arts swap 2023-02-11 13:21:45 +02:00
DjWarmonger
a20e6aecb7
Merge pull request #1568 from vcmi/DjWarmonger-patch-2 
Update CRewardableConstructor.cpp
 2023-02-11 12:14:50 +01:00
DjWarmonger
94bc418e34
Update CRewardableConstructor.cpp 
Fixed swapped identifiers in Limiter.
 2023-02-11 08:28:29 +01:00
Konstantin
286c1e522e vcmi: modernize netpacks 2023-02-09 20:22:48 +03:00
Ivan Savenko
4a0a82ceb4
Merge pull request #1553 from IvanSavenko/sdl_cleanup 
SDL usage cleanup
 2023-02-08 18:14:15 +02:00
nordsoft
f1b348ae87 Suppress warning 2023-02-08 20:09:37 +04:00
nordsoft
06c451c1f5 Fix compiling 2023-02-08 20:09:37 +04:00
nordsoft
da8942ccfb Try to fix compilation 2023-02-08 20:09:37 +04:00
nordsoft
44e195c625 Fix compiling according to latest changes 2023-02-08 20:09:37 +04:00
nordsoft
fac93bb7d6 Address review comments 2023-02-08 20:09:37 +04:00
nordsoft
e0b467e144 Code polishing 2023-02-08 20:09:37 +04:00
nordsoft
447e01aba3 Proper defeat message 2023-02-08 20:09:37 +04:00
nordsoft
5fceb97838 Support few more victory conditions 2023-02-08 20:09:37 +04:00
nordsoft
7f55916a4b Support couple more conditions 2023-02-08 20:09:37 +04:00
nordsoft
a3413eefce Some vic/loss conditions for editor 2023-02-08 20:09:37 +04:00
nordsoft
4e21aab76a Continue working on vicloss conditions 2023-02-08 20:09:37 +04:00
nordsoft
4ce68298d1 Starting work on map settings 2023-02-08 20:09:37 +04:00
Ivan Savenko
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
Ivan Savenko
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
Konstantin
e82cc56ddb vcmi: modernize lib/spells/effects 2023-02-08 15:38:26 +03:00
Ivan Savenko
ab8b407294 Style cleanup 2023-02-08 13:56:09 +02:00
Ivan Savenko
2f440e435a
Merge pull request #1557 from Nordsoft91/fix-altactions 
Fix alternative actions button redraw
 2023-02-08 13:52:21 +02:00