1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Commit Graph

9031 Commits

Author SHA1 Message Date
SoundSSGood
ff63167553
warnings fixed 2022-11-07 18:31:22 +02:00
SoundSSGood
3a3b559a0b attempt to fix the build 2022-11-07 14:20:28 +02:00
SoundSSGood
203c54e956 BulkMoveArtifacts structure optimization 2022-11-07 14:13:36 +02:00
Andrii Danylchenko
55914290ca
Merge pull request #1109 from trofi/fix-format-string
mapeditor/mainwindow.cpp: use '%s' (not '%b') for string formatter
2022-11-07 14:06:56 +02:00
Andrii Danylchenko
233b850daf NKAI: a few crash/hang fixes 2022-11-07 13:58:20 +02:00
nordsoft
7b6d9c23b3 Attempt to pass lobby parameters as command line arguments 2022-11-07 13:44:58 +04:00
SoundSSGood
0032947735 regression fixed. Artifact assemble dialog shows multiple times. 2022-11-07 00:36:13 +02:00
SoundSSGood
a35db9a696 server blocksPack upd 2022-11-07 00:19:43 +02:00
SoundSSGood
f72a3e3884 function ArtifactUtils::checkSpellbookIsNeeded for the artifacts like a Titan's thunder 2022-11-07 00:18:05 +02:00
nordsoft
9486373906 Fix issue with server 2022-11-07 02:09:05 +04:00
SoundSSGood
0f391e19d5 server side funcs 2022-11-06 23:59:30 +02:00
SoundSSGood
95ab343116 Net Packs BulkMoveArtifacts structure and BulkMoveArtifacts::applyCl 2022-11-06 23:54:50 +02:00
SoundSSGood
d0895e30ef callback functions and cleaning up unused code 2022-11-06 23:41:29 +02:00
SoundSSGood
363e461c3e ArtifactUtils and CArtifactFittingSet class 2022-11-06 23:29:22 +02:00
nordsoft
0eb74b85c9 Merge remote-tracking branch 'upstream/develop' into lobby 2022-11-07 00:23:20 +04:00
nordsoft
0f35082024 Fix crash with objects belonging players without state 2022-11-06 03:26:13 +04:00
Sergei Trofimovich
560c528ec8 mapeditor/mainwindow.cpp: use '%s' (not '%b') for string formatter
mapeditor/mainwindow.cpp: In member function
      'void MainWindow::onSelectionMade(int, bool)':
    mapeditor/mainwindow.cpp:1014:47:
      warning: format '%b' expects argument of type 'unsigned int',
      but argument 3 has type 'const char*' [-Wformat=]
     1014 |                 auto info = QString::asprintf(
         "Selection on layer %d: %b", level, anythingSelected ? "true" : "false");
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         |                                                    |
         |                                                    const char*
2022-11-05 20:25:51 +00:00
nordsoft
dffd7c0f24 Fix crash related to V hotkey during AI turn 2022-11-04 18:29:45 +04:00
krs
aab394ff93 #1071 - In latest night builds there are problems with schema obstacle.json and file obstacles.json 2022-11-04 00:06:15 +02:00
nordsoft
6995911d6e Preventing multiple AI from being created 2022-11-03 22:01:20 +04:00
Andrii Danylchenko
ae1d2c50e2
Merge pull request #1099 from kambala-decapitator/disable-tests
disable tests by default
2022-11-03 14:01:25 +02:00
Andrey Filipenkov
c20ae90973 disable tests by default 2022-11-03 11:33:17 +03:00
Andrii Danylchenko
6c31b50e73
Merge pull request #1094 from Nordsoft91/autobattle-bugfix
[965] Fix for auto-battle crash
2022-11-03 08:17:30 +02:00
nordsoft
e21c2a02ce Merge remote-tracking branch 'upstream/develop' into lobby 2022-11-02 18:33:33 +04:00
nordsoft
a7d11856ec Merge remote-tracking branch 'upstream/develop' into autobattle-bugfix 2022-11-02 18:32:53 +04:00
Andrii Danylchenko
418aabcd94
Merge pull request #1095 from kambala-decapitator/ci-fix-running-conan
[CI] fix running Conan
2022-11-02 12:34:22 +02:00
Andrey Filipenkov
a5ad4893a7 [CI] use setup-python action
fixes running pip-installed packages without `python3 -m`
2022-11-02 11:07:20 +03:00
nordsoft
52b3b329a4 Fix [965] 2022-11-01 19:16:45 +04:00
nordsoft
1c84cc4521 Merge remote-tracking branch 'upstream/develop' into lobby 2022-11-01 16:30:27 +04:00
Andrii Danylchenko
80ce205d94
Merge pull request #1093 from Nordsoft91/port-override
Write port override
2022-10-31 07:21:01 +02:00
nordsoft
410c402dd6 Try to fix windows encoding 2022-10-30 22:53:05 +04:00
nordsoft
ecfa568774 Minor fixes for lobby 2022-10-30 22:50:16 +04:00
nordsoft
27bff89e66 Write port override 2022-10-30 19:59:43 +04:00
nordsoft
d8641324a3 Try to fix mxe build 2022-10-29 21:49:30 +04:00
nordsoft
0a2a250379 Try to fix mxe build 2022-10-29 21:10:21 +04:00
nordsoft
6eb43d3834 Minor changes 2022-10-27 01:39:57 +04:00
nordsoft
1455c65e1a Move proxy server 2022-10-27 00:53:32 +04:00
nordsoft
21a1706627 First working prototype 2022-10-27 00:52:39 +04:00
Andrii Danylchenko
8fc38c617f
Merge pull request #1086 from vcmi/fix-mantis-2934
Mantis-2934: fix conditions to upgrade town in h3m format parser
2022-10-25 11:52:22 +03:00
nordsoft
dd45d1a9cf Develop game part 2022-10-25 05:27:53 +04:00
nordsoft
aac859a030 Store settings 2022-10-23 23:24:33 +04:00
nordsoft
2761c59cf0 Add server prototype 2022-10-23 23:11:19 +04:00
nordsoft
05cba08b40 Continue development 2022-10-23 23:10:46 +04:00
Andrii Danylchenko
7618bc7425 Mantis-2934: fix conditions to upgrade town in h3m format parser 2022-10-23 16:40:07 +03:00
Andrii Danylchenko
afc0cc1c15
Merge pull request #1067 from vcmi/battle-ai-improvements
Battle ai improvements
2022-10-23 11:41:29 +03:00
Andrii Danylchenko
ebf4854801 Battle AI: add some comments + refactoring 2022-10-23 11:41:03 +03:00
Andrii Danylchenko
601ced3749 BattleAI: rework movement when no targtes 2022-10-23 11:41:03 +03:00
Andrii Danylchenko
033a585e4b Battle AI 2 turns attacks recalculation 2022-10-23 11:41:03 +03:00
Andrii Danylchenko
a2380ebd37
Merge pull request #1082 from kambala-decapitator/linux-mapeditor-icon
[Linux] add proper desktop entry for the map editor
2022-10-23 11:40:41 +03:00
Andrii Danylchenko
11790c7c02
Merge pull request #1083 from vcmi/fix-android
Move version definition into a separate cmake file
2022-10-23 10:39:25 +03:00