1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-28 23:06:24 +02:00
Commit Graph

10006 Commits

Author SHA1 Message Date
Ivan Savenko
8d3bfbe0bc
Merge pull request #1582 from rilian-la-te/modernize-lib-battle
vcmi: modernize lib/battle
2023-02-28 12:12:39 +02:00
Andrey Filipenkov
cc966902cd
Merge pull request #1618 from kambala-decapitator/ci-ignore-upload-failure
prevent CI cancelling other jobs when upload step fails
2023-02-27 11:10:46 +03:00
Andrey Filipenkov
883aeccfe7 prevent CI cancelling other jobs when upload step fails 2023-02-27 10:15:27 +03:00
Andrii Danylchenko
37baec1d24 Fix crash on replaced hero placeholder mouseover 2023-02-27 09:10:26 +02:00
Ivan Savenko
8c52cbcd00
Merge pull request #1429 from dydzio0614/creature-numeric-quantities
Implement numeric creature descriptions with config toggle on/off
2023-02-26 22:57:01 +02:00
Ivan Savenko
195eac3375
Merge pull request #1545 from dydzio0614/town-panel-number-formatting
Improve creature numbers handling in castle interface bottom left part
2023-02-26 22:56:54 +02:00
Ivan Savenko
cc84bed0c0
Merge pull request #1540 from dydzio0614/settings-rework
Settings rework
2023-02-26 22:56:35 +02:00
Andrey Filipenkov
3e6c33e465
Merge pull request #1617 from kambala-decapitator/fix-uploads
fix uploads of artifacts to VCMI server
2023-02-26 23:13:59 +03:00
Andrey Filipenkov
05864821e4 fix uploads of artifacts to VCMI server 2023-02-26 21:38:12 +03:00
Andrey Filipenkov
ddd9dcc918
Merge pull request #1607 from kambala-decapitator/FileStream-minizip
remove copy-pasted ioapi.c functions from FileStream.cpp
2023-02-24 16:11:35 +03:00
Andrey Filipenkov
176dfca578 fix indentation 2023-02-24 13:42:26 +03:00
Andrey Filipenkov
e6d87d5f35 wrap FileStream's helper functions into anonymous namespace 2023-02-24 13:42:26 +03:00
Andrey Filipenkov
85d1909ac5 remove copy-pasted functions from ioapi.c 2023-02-24 13:42:26 +03:00
Ivan Savenko
6fb3aaebc3
Merge pull request #1606 from burunduk/patch-1
Update ukrainian.json
2023-02-24 12:38:55 +02:00
Olexandr Nesterenko
a368a067ee
Update ukrainian.json 2023-02-24 11:29:03 +02:00
Andrey Filipenkov
bb81bde2be
Merge pull request #1602 from kambala-decapitator/conan-foce-v1
force Conan to use v1
2023-02-22 14:41:55 +03:00
Andrey Filipenkov
a3eedbafbe [Conan] lock to v1 2023-02-22 14:00:53 +03:00
Andrey Filipenkov
f128404770 simplify creating client target 2023-02-22 14:00:53 +03:00
Andrey Filipenkov
cc31c4aa3f remove unused macro 2023-02-22 14:00:53 +03:00
Andrey Filipenkov
b0c109d5f7 use target from variable 2023-02-22 14:00:52 +03:00
Andrey Filipenkov
499f870679 [CI] save artifact file directly
no longer zips whole directory hierarchy out/build/...
2023-02-22 14:00:52 +03:00
Andrey Filipenkov
59948a41a6 use std::call_once instead of bool flag 2023-02-22 14:00:50 +03:00
Dydzio
9eccc29e16 Adjust tab positioning 2023-02-19 12:18:54 +01:00
Dydzio
2d80ce8203 Add discord link to readme 2023-02-18 22:22:44 +02:00
Dydzio
7f03223634 Remove SDL_Events reference 2023-02-18 18:00:34 +01:00
Dydzio
6bd4eac27a Rename settings files 2023-02-18 17:58:22 +01:00
Dydzio
7137329e80 Clang-tidy related fixed 2023-02-18 17:49:43 +01:00
Dydzio
7e409df3cb Apply manual changes from code review 2023-02-18 16:35:07 +01: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
Dydzio
c2ef3331ef Change main settings tabs to toggle group + fix json commas 2023-02-16 21:37:37 +01:00
Konstantin
93c2bbf9ab vcmi: modernize lib/battle 2023-02-16 23:37:19 +03:00
Dydzio
1d37f8a62e New buttons graphics, add info about ESC key to battle intro option 2023-02-16 20:39:11 +01:00
Andrii Danylchenko
27ef876bd6
Merge pull request #1576 from vcmi/fix-campaigns
Hack to fix campaigns
2023-02-16 20:22:41 +02:00
Dydzio
e48a4185ed Use config values from new settings 2023-02-15 23:36:09 +01:00
Dydzio
ade52239ea Use config value from new settings 2023-02-15 23:26:55 +01:00
Dydzio
9101f05835 Fixes for new battle settings 2023-02-15 22:38:41 +01:00
Dydzio
9cabdfa675 Better position for main settings buttons 2023-02-15 20:34:08 +01:00
Dydzio
775db89241 Fix battle settings UI labels, add "dont show battle intro" setting 2023-02-15 20:29:29 +01: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
Dydzio
1d153f4ee9 "ForceMovementInfo" support + make other settings tab 2023-02-14 23:45:45 +01:00
Ivan Savenko
5d98471d12
Merge pull request #1567 from rilian-la-te/modernize-maps
Modernize maps
2023-02-14 23:42:03 +02:00
Dydzio
daa2b63dde Further UI improvements 2023-02-14 22:22:11 +01:00
Dydzio
be9c71934c Merge remote-tracking branch 'origin/develop' into settings-rework 2023-02-14 21:00:17 +01:00
Dydzio
fb06aca0bb Further progress - UI tweaks, new settings etc 2023-02-14 20:30:06 +01: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