Ivan Savenko
42df5626d9
Added Color class to replace SDL_Color
2023-01-30 00:12:43 +02:00
Andrey Filipenkov
07dc2e1c48
Merge pull request #1496 from kambala-decapitator/resurrect-message
...
show resurrect message in the battle log
2023-01-29 22:18:32 +03:00
Andrey Filipenkov
783174c2af
Merge pull request #1523 from rilian-la-te/fix-ios-ci
...
suppress warning on iOS
2023-01-29 22:17:43 +03:00
Konstantin
080d4b13dd
vcmi: suppress warning on IOS
...
Let CI passes on develop.
2023-01-29 21:30:37 +03:00
Ivan Savenko
57ee9a9bf3
Merge vcmi/beta into vcmi/develop
2023-01-29 18:21:55 +02:00
Ivan Savenko
7bbaae75a2
Merge pull request #1508 from kambala-decapitator/shipyard-regression
...
attempt to show shipyard dialog only when a hero is selected
2023-01-28 02:04:10 +02:00
Ivan Savenko
c2c08a46bf
Merge pull request #1513 from IvanSavenko/gui_handler_remove_current_event
...
Removed pointer to current SDL_Event from GuiHandler
2023-01-28 01:35:08 +02:00
Ivan Savenko
50a0fc4fb2
Removed pointer to current SDL_Event from GuiHandler
2023-01-27 23:17:40 +02:00
Ivan Savenko
4d1c338503
Merge pull request #1498 from rilian-la-te/conan-v2
...
Conan as MXE replacement
2023-01-27 23:14:37 +02:00
Ivan Savenko
beb58ee8b0
Merge pull request #1516 from IvanSavenko/changelog_fix
...
Fix formatting of list inside another list
2023-01-27 13:51:37 +02:00
Ivan Savenko
94e7293eec
Fix formatting of list inside another list
2023-01-27 13:24:13 +02:00
Ivan Savenko
aef4cb3c71
Merge pull request #1466 from IvanSavenko/translate_adventure_map
...
Translate adventure map objects
2023-01-27 11:38:16 +02:00
Ivan Savenko
2b28dc5b2d
Merge pull request #1512 from IvanSavenko/changelog_markdown
...
Converted ChangeLog to use Markdown syntax
2023-01-27 11:38:00 +02:00
Ivan Savenko
e87adf334d
Fix loading of vcmi json maps
2023-01-26 23:32:56 +02:00
Ivan Savenko
8b2d336562
Fix initialization of visitDir in templates
2023-01-26 23:32:56 +02:00
Ivan Savenko
a3846f1b31
Fix incorrect identifiers format
2023-01-26 23:32:56 +02:00
Ivan Savenko
eebc6fd625
Map object use format mod:object (or mod:object.subobject)
2023-01-26 23:32:56 +02:00
Ivan Savenko
7b82387a49
Dwellings & Banks will register custom names for their objects
2023-01-26 23:32:56 +02:00
Ivan Savenko
bc27faea57
All objects will register single name per object type
2023-01-26 23:32:55 +02:00
Ivan Savenko
49d0459412
Remove unused code
2023-01-26 23:27:26 +02:00
Ivan Savenko
50e8a62178
Remove access to creature dwellings names via CGeneralTextHandler
2023-01-26 23:27:26 +02:00
Ivan Savenko
f71cbc5d9b
Fixed loading of object names
2023-01-26 23:27:26 +02:00
Ivan Savenko
b13637cdd5
Fix regressions in RMG & map editor
2023-01-26 23:27:26 +02:00
Ivan Savenko
d0fe875cc6
Removed wog object
2023-01-26 23:27:26 +02:00
Ivan Savenko
6f324216db
Bugfixing
2023-01-26 23:27:24 +02:00
Ivan Savenko
6c472339ce
Refactoring of ObjectClassesHandler
2023-01-26 23:26:49 +02:00
Ivan Savenko
c5f72ccdc7
Names for object supertypes are passed through translator
2023-01-26 23:19:53 +02:00
Konstantin
2aaaa5a05a
CMakeLists.txt: check CMAKE_SYSTEM_PROCESSOR
...
Check CMAKE_SYSTEM_PROCESSOR when generating NSIS package.
This allows us correctly determine install dir on Windows
2023-01-27 00:11:17 +03:00
Konstantin
f31ec77e1c
docs/conan.md: add Windows instructions
...
Add instructions for building a Windows binaries from Linux in Conan
2023-01-27 00:11:17 +03:00
Konstantin
38ebb62c3e
conan: build for 64-bit windows by default
...
This was strongly suggested by VCMI developers.
2023-01-27 00:11:17 +03:00
Konstantin
30784477e0
CMakeLists.txt: strip on package if no debuginfo is requested
...
It significantly reduces size of the executable
2023-01-26 23:50:08 +03:00
Konstantin
d62d5a83ab
CMakeLists.txt: fix compilation with latest TBB on 22.04
...
It has a config file only for None build type. Map this as fallback
for all build types.
2023-01-26 23:50:08 +03:00
Konstantin
bd0c7c2b54
vcmi: add before_install.sh
...
For now, it uses pregenerated deps from my repository, but
should be transitioned to vcmi one after PR is finished
2023-01-26 23:50:08 +03:00
Konstantin
57b93e00ca
github/workflows: add conan-win32 workflow
...
This will not work for now, but added for future proof
2023-01-26 23:49:54 +03:00
Konstantin
a24ec53df2
vcmi: enable Conan builds for cross-compiling Win
...
This patch enables usage of Conan for cross-compiling Windows
builds instead of MXE.
2023-01-26 23:49:00 +03:00
Konstantin
f0cb8b63c7
lib/CGameInterface.cpp: add MinGW workaround
...
MinGW returns all dynamic library functions as FARPROC, which need
to be cast to actual signatures, and this casts emits
-Wcast-function-type.
So, silence it for GetProcAddress.
2023-01-26 23:49:00 +03:00
Konstantin
cf56f7ccce
vcmi: remove unused-but-set-variables
2023-01-26 23:49:00 +03:00
Konstantin
3ea4e8c249
AI/CMakeLists.txt: disable some errors for FuzzyLite
...
It generates false positives on MinGW due to Fuzzylite errorneous
assuming than Windows=MSVC.
2023-01-26 23:49:00 +03:00
Ivan Savenko
da124b2c78
Converted ChangeLog to use Markdown syntax
2023-01-26 19:58:54 +02:00
DjWarmonger
25ef065dbe
Merge pull request #1486 from IvanSavenko/configurable_rewardables
...
Well, it works for my brand new objects with arbitrary bonus, so likely will work with everything else.
2023-01-26 17:01:01 +01:00
Andrey Filipenkov
612b5e2746
attempt to show shipyard dialog only when a hero is selected
...
fixes regression from a4e8255cbc
2023-01-25 20:49:37 +03:00
Andrey Filipenkov
7e78e0abdc
Merge pull request #1493 from kambala-decapitator/ios-spacebar
...
[iOS] use pinch gesture as Spacebar hotkey instead of Tab
2023-01-25 18:32:40 +03:00
Andrey Filipenkov
a2ac189e03
fix typo
2023-01-25 18:13:11 +03:00
Andrey Filipenkov
0bbf70f30a
show resurrect message in the battle log
2023-01-25 18:13:06 +03:00
Andrey Filipenkov
54537fc02c
Merge pull request #1478 from kambala-decapitator/units-huge-numbers
...
limit displayed units number to 4 digits
2023-01-25 17:47:08 +03:00
Andrey Filipenkov
785d565f31
Merge pull request #1483 from kambala-decapitator/statue-of-legion-bonus
...
fix displaying growth bonus from Statue of Legion
2023-01-25 17:45:30 +03:00
Andrey Filipenkov
b2d2c7a2dc
Merge pull request #1501 from kambala-decapitator/townportal-doubleclick
...
handle double-click in Town Portal dialog
2023-01-25 17:42:15 +03:00
Andrey Filipenkov
18c52f05ca
Merge pull request #1506 from kambala-decapitator/cmake-zip-ipa
...
generate ipa file with CPack directly
2023-01-25 17:41:10 +03:00
Konstantin
a7bd7232ce
CGuiHandler: fix false positive dangling pointer
...
Making this an auto variable fixes compilation with Werror.
2023-01-25 17:14:41 +03:00
Ivan Savenko
bd45d88a1b
Merge pull request #1459 from IvanSavenko/mod_translations
...
Translation support for mods
2023-01-25 14:05:05 +02:00
