Andrii Danylchenko
86972d7164
Merge pull request #1112 from SoundSSGood/bulk-move-swap-artifacts-rev2
...
Bulk move and swap artifacts rev2
2022-11-14 08:31:48 +02:00
Andrii Danylchenko
38f36fa720
Merge pull request #1127 from IvanSavenko/resume_music
...
Fix #985 - resume town & terrain themes
2022-11-13 21:18:46 +02:00
SoundSSGood
98bf6931a1
cosmetic correction
2022-11-13 19:01:28 +02:00
SoundSSGood
57ab13c820
cosmetic correction
2022-11-13 17:09:48 +02:00
SoundSSGood
f9738f0d0b
nullptr checks
2022-11-13 16:28:26 +02:00
SoundSSGood
aef87dd482
Apply suggested cosmetic changes
2022-11-13 15:28:09 +02:00
Ivan Savenko
2324148187
Fix compilation using older SDL library
2022-11-13 14:59:28 +02:00
Ivan Savenko
38b8fc0af8
Formatting: space -> tabs
2022-11-13 14:24:15 +02:00
Ivan Savenko
4af9bc2461
Music: remember playback position of music tracks
...
Town & terrain themes will now resume from previously stopped position
instead of playing from start, as it was in original game.
Fixes #965
2022-11-13 14:05:51 +02:00
Andrii Danylchenko
e4f3d2a685
Merge pull request #1121 from vcmi/nk-fix-hung
...
#1102 - NKAI: one more freeze - no mains with strong army
2022-11-13 09:56:39 +02:00
Andrii Danylchenko
41825e8c92
Merge pull request #1125 from GermanAizek/fix-3144
...
Fix [3144]
2022-11-13 09:00:03 +02:00
lainon
79bc82af63
Fix [3144]
2022-11-13 05:35:16 +03:00
SoundSSGood
84841a5f0a
BulkMoveArtifacts::applyGs reworked
2022-11-12 19:44:34 +02:00
SoundSSGood
3142f32cbb
Fix for callback return. More code optimization
2022-11-11 01:28:04 +02:00
SoundSSGood
9647758812
Apply suggested changes next part
2022-11-10 23:24:41 +02:00
Andrii Danylchenko
3676152644
#1102 - NKAI: one more freeze - no mains with strong army
2022-11-10 21:12:08 +02:00
SoundSSGood
6e5932c016
Apply suggested changes next part
2022-11-10 21:02:06 +02:00
SoundSSGood
30db38c0fe
Unified CGameHandler::bulkMoveArtifacts and CGameHandler::bulkSwapArtifacts to one
2022-11-10 20:11:26 +02:00
SoundSSGood
ad47a7573c
Code style. Typo. Code clean up.
2022-11-10 18:29:39 +02:00
SoundSSGood
b9087e2d63
Apply suggestions from code review
...
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2022-11-10 17:45:54 +02:00
SoundSSGood
f2afd9e831
Update server/CGameHandler.cpp
...
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2022-11-10 17:37:50 +02:00
Andrii Danylchenko
c5cf0e4086
Merge pull request #1103 from Nordsoft91/autobattle-bugfix
...
Preventing multiple AI from being created
2022-11-10 15:18:24 +02:00
Andrii Danylchenko
1ca2283a90
Merge pull request #1105 from krs0/feature/#1071__In_latest_night_builds_there_are_problems_with_schema_obstacle.json_and_file_obstacles.json
...
Problems with schema obstacle.json and file obstacles.json #1071
2022-11-10 11:53:08 +02:00
Andrii Danylchenko
5f92a0760f
Merge pull request #1113 from vcmi/nk-fix-hung
...
NKAI: a few crash/hang fixes
2022-11-10 11:48:17 +02:00
Andrii Danylchenko
5222ea8c25
Merge pull request #1110 from Nordsoft91/whereshouldbeattached
...
#1754 Fix crash with objects belonging players without state
2022-11-10 11:43:50 +02:00
Andrii Danylchenko
502ad59169
Merge pull request #1117 from vcmi/readme-patch
...
Add downloads badge
2022-11-10 11:42:22 +02:00
Nordsoft91
e5809ac9f7
Add downloads badge
2022-11-08 18:31:09 +04:00
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
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
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
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
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
