games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity
9,912 Commits 21 Branches 61 Tags 104 MiB
fb06aca0bb
Commit Graph

9912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dydzio
fb06aca0bb Further progress - UI tweaks, new settings etc 2023-02-14 20:30:06 +01:00
Dydzio
80a5595d6c Adding some settings options, minor UI fixes 2023-02-13 23:53:28 +01:00
Dydzio
b28a16ddd4 Settings UI tweaks 2023-02-12 21:35:30 +01:00
Dydzio
de5138c854 Basic separation of adventure map & general tabs 2023-02-12 19:25:59 +01: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
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
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
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
Konstantin
976c5e7bd4 vcmi: modernize lua 2023-02-08 13:51:22 +03:00
Konstantin
cb3723b54c vstd: pass separators and input by reference 
It removes many cases of redundnant string copying
 2023-02-05 18:07:56 +03:00
Konstantin
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
Andrii Danylchenko
14d27c788f hide AI cheating message 2023-02-05 11:00:58 +02:00
Andrii Danylchenko
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
DjWarmonger
908f8f5aee Update README.md 2023-02-05 10:06:35 +02:00
Dydzio
b9030fe9cc
Better name for bonus 2023-02-05 00:56:37 +01:00
nordsoft
fd6987ea0a Fix alternative actions button redraw 2023-02-05 03:29:50 +04:00
Dydzio
719a11bdf6 Translate VCMI essential files 2023-02-04 18:51:30 +01:00
Dydzio
a9f279d1ab Add polish translations, tiny improvement of english translations 2023-02-04 18:45:32 +01:00
DjWarmonger
ca01c179b4
Merge pull request #1528 from rilian-la-te/daremyth-fix-bonus-v2 
vcmi: deprecate MAXED_SPELL
 2023-02-04 15:08:59 +01:00
Konstantin
7b8aebe4e3 vcmi: deprecate MAXED_SPELL 
It is almost identical to SPECIAL_FIXED_VALUE_ENCHANT.

Replace its usage in JSON and inside deprecated converter
to SPECIAL_FIXED_VALUE_ENCHANT. Remove buggy string inside
getEffectLevel.
 2023-02-04 16:23:03 +03:00
Ivan Savenko
62151cd20c Replaced genRect with Rect constructor call 2023-02-03 19:17:59 +02:00
Ivan Savenko
34dcb4127a Removed text utilities from SDL_Extensions 2023-02-03 18:55:25 +02:00
Ivan Savenko
7c58a46279 Removed some instances of access to screen surface 2023-02-03 18:23:53 +02:00
Ivan Savenko
00c1a4ef76
Merge pull request #1543 from IvanSavenko/changelog-1.2 
Add current version of 1.2 changelog
 2023-02-03 14:55:59 +02:00