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

9040 Commits

Author SHA1 Message Date
Andrii Danylchenko
8b964be71f
Merge pull request #1111 from GermanAizek/develop
Code refactor and fix condition bug
2022-11-15 09:23:16 +02:00
lainon
7fdad4e0f6 Code refactor following C++ standard and condition fixes 2022-11-15 03:20:55 +03:00
Ivan Savenko
729357824b Added common method for secondary skill availability checks 2022-11-14 19:08:49 +02:00
Andrii Danylchenko
b6bcfec329
Merge pull request #1129 from IvanSavenko/new_day_sound_fix
Fixes #825 - do not wait for new week dialog in single-player
2022-11-14 17:45:57 +02:00
Ivan Savenko
e06db2365d Fixes #1096 - do not propose banned skills on levelup
Remove possibility to get banned skill on levelup as "obligatory skill"
if all other such skills have been learned before.

May happen under some conditions, e.g. if hero quickly learns other
magic schools - in witch hut/university, leading to case where banned
skill is the only obligatory skill that can be offered on levelup
2022-11-14 17:16:49 +02:00
Ivan Savenko
4fe8ff9b01 Fixes #825 - do not wait for new week dialog in single-player 2022-11-14 15:53:07 +02:00
Ivan Savenko
153315e8c3 Refactoring of hero movement animation code
Replaced ancient and obscure code that had separate routines for each
possible movement direction with generic version.
Fixes #1088 which apparently was due to bug in one of these routines
2022-11-14 12:32:40 +02:00
Ivan Savenko
c5c2f0ffb9 Added Lua library to Debian dependencies 2022-11-14 12:12:03 +02:00
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
Ivan Savenko
6388b73204 Typo in library name 2022-11-13 20:46:17 +02:00
Ivan Savenko
2f0225600a Update .deb packaging data 2022-11-13 20:46:02 +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
nordsoft
c4c1cd392a Attempt to fix server hosting on ios 2022-11-11 22:21:03 +04:00
nordsoft
56757bb5c2 Pass port from client to server for ios 2022-11-11 18:35:40 +04:00
nordsoft
eeeca5ba8d Add additional logging 2022-11-11 18:00:09 +04: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
nordsoft
d691925b1f Try to do some fixes 2022-11-11 00:02:00 +04: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
nordsoft
9397c836f2 Enable scrolling for buttons 2022-11-10 19:15:18 +04: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
nordsoft
8871c7abbd Attempt to fix ios build 2022-11-10 16:02:11 +04:00
nordsoft
6406157038 Attempt to fix ios build 2022-11-10 14:53:12 +04:00
nordsoft
0ad06af593 Attempt to fix ios build 2022-11-10 14:08:19 +04: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
nordsoft
b3aa87fe10 Attemp to fix ios build 2022-11-10 12:48:17 +04:00
nordsoft
16ab5f9e02 Revert "Attempt to fix ios build"
This reverts commit eab8abef67.
2022-11-10 05:14:19 +04:00
nordsoft
eab8abef67 Attempt to fix ios build 2022-11-10 04:27:26 +04:00
nordsoft
81a0ac2398 Lobby refactoring and changes 2022-11-10 04:20:44 +04:00
nordsoft
ab630d43f1 Implement proper logging 2022-11-10 02:44:34 +04:00
nordsoft
0a522ccb21 Hadle disconnection properly 2022-11-10 02:30:51 +04:00