1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Commit Graph

9204 Commits

Author SHA1 Message Date
Ivan Savenko
b275d9de72 merge beta branch into develop 2022-12-29 22:08:53 +02:00
Ivan Savenko
7a35bcc812
Merge pull request #1221 from IvanSavenko/warnings_fix
Fix remaining compiler warnings
2022-12-29 21:51:55 +02:00
Ivan Savenko
b1082aa621 Do not attempt to display multiple assembly dialogs at once 2022-12-29 21:50:25 +02:00
Ivan Savenko
90b669f507 Fix order of dialogs on assembling artefacts after battle 2022-12-29 21:50:25 +02:00
Ivan Savenko
d3d8a6de1b Fix directory test 2022-12-29 21:50:04 +02:00
Ivan Savenko
b6735618f5 Formatting 2022-12-29 21:50:04 +02:00
Ivan Savenko
ce76696af4 Detect slightly different gog.com installer file layout 2022-12-29 21:50:04 +02:00
Ivan Savenko
986c0c534d Main menu buttons are now defined using position of their center
Fixes positioning of main menu buttons in localized versions of the game
2022-12-29 21:50:04 +02:00
Ivan Savenko
e19dc41295 Support Polish version of H3 data files 2022-12-29 21:50:04 +02:00
Ivan Savenko
61ed408f61 Fix typo 2022-12-29 21:49:20 +02:00
Ivan Savenko
588b635d1c Workaround for a potential deadlock in MusicHandler 2022-12-29 21:49:20 +02:00
Ivan Savenko
d6674e73cd Explicitly define build type to add NDEBUG flag 2022-12-29 19:49:06 +02:00
Andrey Filipenkov
b030a88ca5 fix gold check for School of War 2022-12-29 01:45:51 +04:00
Ivan Savenko
7b2ac670f2 Changed woring according to review 2022-12-28 22:42:34 +02:00
Andrii Danylchenko
d1dc545f53
Merge pull request #1314 from vcmi/optimze-connection-write
[1.1] Socket buffered write. Write full cpack at once
2022-12-27 19:08:43 +02:00
Nordsoft91
37d1e1e748
Merge pull request #1277 from Nordsoft91/editor-cutcopypaste 2022-12-27 17:28:39 +04:00
Ivan Savenko
37003cd0e6
Create basic issue templates (#1260)
* Create basic issue templates

Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>
2022-12-27 13:09:48 +02:00
Andrii Danylchenko
a954cc08fb Made intermediate class to hide some implementation details from header. 2022-12-27 12:55:31 +02:00
nordsoft
e6f459cbe4 Address naming questions 2022-12-27 04:04:09 +04:00
Andrii Danylchenko
c271f9187f Connection buffered read cpack. 2022-12-26 21:49:53 +02:00
Andrii Danylchenko
cb13064a62 Socket buffered write. Write full cpack at once 2022-12-26 20:17:53 +02:00
Ivan Savenko
78ed2f154b Revert uninteded change 2022-12-26 14:48:13 +02:00
Ivan Savenko
370e92a90a Added workaround for no longer accessible hero in MoveHero 2022-12-25 16:12:26 +02:00
Ivan Savenko
94597e7af6 Remove deprecated usage of sprintf 2022-12-25 14:04:12 +02:00
Ivan Savenko
405b2976d5 Renamed getUpgradeInfo -> fillUpgradeInfo 2022-12-25 14:03:43 +02:00
Andrii Danylchenko
33602c879d #1286 - use iOS flow for Android resolutions management 2022-12-25 13:39:27 +02:00
Nordsoft91
a7f521cbd9
Merge pull request #1225 from Nordsoft91/interface-builder 2022-12-25 10:25:57 +04:00
DjWarmonger
ccc79d4ab9 Update README.md
Keep total download counter
2022-12-24 22:07:34 +04:00
DjWarmonger
e43e127339 Update README.md
Update download counter
2022-12-24 22:07:34 +04:00
Nordsoft91
64fb4a744e
Merge pull request #1269 from vcmi/beta
Merge android fix into develop
2022-12-24 22:07:04 +04:00
Nordsoft91
785787e454
Merge branch 'develop' into interface-builder 2022-12-24 21:56:29 +04:00
Ivan Savenko
5b57b69699 Bumped version to 1.2 for Linux packaging 2022-12-23 17:54:41 +02:00
nordsoft
2953b8fe9d Fix android build 2022-12-23 19:12:48 +04:00
nordsoft
339846a307 Add build from beta branch for android 2022-12-23 16:42:32 +04:00
nordsoft
1250f67771 Fix android build 2022-12-23 16:42:32 +04:00
Ivan Savenko
eb20a4b208 Merge remote-tracking branch 'vcmi/develop' into warnings_fix 2022-12-23 14:40:45 +02:00
Ivan Savenko
f073c676f9 Merge 1.1 release into develop 2022-12-23 14:17:18 +02:00
Nordsoft91
52782713f8
Merge pull request #1262 from vcmi/beta
Release 1.1
2022-12-23 14:52:00 +04:00
nordsoft
25803b3c3a Disable patch version for releases 2022-12-23 13:26:26 +04:00
Ivan Savenko
b84e0775b3 Updated release date for Linux packaging 2022-12-23 10:41:59 +04:00
Ivan Savenko
b2279484fc
Merge pull request #1227 from Shatur/opendingux
Port to OpenDingux handhelds
2022-12-22 16:56:55 +02:00
nordsoft
ad5bf2ac4f Fix msvc build 2022-12-22 02:10:56 +04:00
nordsoft
cb76cc54ac Move logging to debug level 2022-12-22 02:08:26 +04:00
nordsoft
e245dbaf9d Use kind-of-factory approach for widget builders 2022-12-22 02:05:29 +04:00
nordsoft
8f7025328f Read default template from config, named custom types 2022-12-22 01:37:33 +04:00
nordsoft
7e7071fc95 Merge remote-tracking branch 'upstream/develop' into interface-builder 2022-12-22 01:24:29 +04:00
nordsoft
c7f430f051 Added debug lines 2022-12-22 01:13:32 +04:00
nordsoft
521328addd Adding macros for targeted object binding 2022-12-22 00:54:06 +04:00
nordsoft
34b81e8838 Revert VCMIDirs to fix the build 2022-12-21 23:08:53 +04:00
nordsoft
4c15531a05 Fix cmake for macOS build 2022-12-21 23:08:53 +04:00