Ivan Savenko
26aeb1dd48
Merge pull request #4616 from Laserlicht/show_level
...
show creature level
2024-09-20 11:50:17 +03:00
Ivan Savenko
2b4342f21d
Merge pull request #4597 from Laserlicht/simplify_ttf
...
simplify usage of ttf font
2024-09-20 11:49:58 +03:00
Maurycy
9e8aad23dd
Update swedish.ts
...
@Fabrice-TIERCELIN
2024-09-20 03:27:34 +02:00
Laserlicht
417fb8d434
avoid warnings if not installed chronicles
2024-09-19 22:14:23 +02:00
Laserlicht
2394809abd
missing default value
2024-09-19 21:36:03 +02:00
Laserlicht
5e3630adae
adjust texts
2024-09-19 20:57:43 +02:00
Laserlicht
a1384bf47f
defending, when not possible to attack invincible
2024-09-19 20:54:50 +02:00
Laserlicht
0c1ef33d5a
text change
2024-09-19 20:03:33 +02:00
Laserlicht
3a6b2d80fa
adjusted monsterLevel text
2024-09-19 19:55:57 +02:00
Ivan Savenko
292f4c8ad2
Do not process pack if it was blocked by a queryReply
...
Regression from earlier PR
2024-09-19 16:45:13 +00:00
Ivan Savenko
bbeaf0ad01
NKAI: Do not visit town on recruiting hero
...
Currently this may lead to a case where player have received a query
(such as levelup query from Battle Academy in Dungeon), but still
attempts to move
2024-09-19 16:44:48 +00:00
Xilmi
7c8f4c423c
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-19 17:35:18 +02:00
Ivan Savenko
3e1968c201
Wait for inactive player in hotseat to answer dialog before starting
...
battle
2024-09-19 15:30:51 +00:00
Ivan Savenko
658c359bc7
Merge pull request #4542 from MichalZr6/update_displayed_path
...
Update displayed hero path when hiring/dismissing creatures that give move penalty
2024-09-19 17:35:49 +03:00
Ivan Savenko
fb28de5beb
Merge pull request #4531 from Laserlicht/mouse_right_drag
...
map drag with right mouse
2024-09-19 16:42:33 +03:00
Ivan Savenko
e3d365262e
Merge pull request #4588 from Laserlicht/intro_video_rework
...
Intro video rework
2024-09-19 16:18:31 +03:00
Ivan Savenko
65355925e9
Merge pull request #4595 from Laserlicht/cast_without_skip
...
Bonus for spell: cast without skip the turn
2024-09-19 16:17:48 +03:00
Ivan Savenko
d4ace69e72
Merge pull request #4622 from kaja47/im-here-to-clean-up-your-bonus-system-code
...
miniscule bonus system cleanup
2024-09-19 16:11:45 +03:00
MichalZr6
a66651cdbb
Trigger workflow
2024-09-19 11:31:08 +02:00
MichalZr6
5f86f5504b
Fix #3286
2024-09-19 09:51:18 +02:00
MichalZr6
7fa965e78b
Fix unintentionally broken line endings to LF in Client.cpp
2024-09-19 09:20:36 +02:00
MichalZr6
e13e72d093
Moved code from NetpacksClient.cpp to Client.cpp
...
Created new function CClient::updatePath that will invalidate paths and update given hero displayed path
2024-09-19 08:43:54 +02:00
MichalZr6
6b4220c510
Add update paths code to netpack visiting methods
2024-09-19 08:43:53 +02:00
Laserlicht
b36c05df1d
INVINCIBLE bonus
2024-09-19 03:14:45 +02:00
Laserlicht
081ba4839c
added town info
2024-09-18 22:39:53 +02:00
Laserlicht
a43475042f
code review
2024-09-18 22:10:25 +02:00
Laserlicht
735af83294
castSpellThisTurn to bool var
2024-09-18 21:24:27 +02:00
K
bda1adbdfd
miniscule bonus system cleanup
...
update comments, remove one never used method, make another method private
2024-09-18 16:41:41 +02:00
Xilmi
27aed74397
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-18 14:52:24 +02:00
Ivan Savenko
e7779a0b90
Merge pull request #4614 from dydzio0614/hero-description-movement-points
...
Add status bar movement points info for own hero on adventure map or hero list
2024-09-18 15:46:51 +03:00
Ivan Savenko
30619c369b
Merge pull request #4615 from dydzio0614/adventure-map-selectionmode-fix
...
Block ability to move on adventure map when holding shift
2024-09-18 15:43:31 +03:00
Ivan Savenko
aa55977de2
Merge pull request #4617 from Laserlicht/asset_gen_missing
...
AssetGenerator: missing assets for generateAll
2024-09-18 15:43:11 +03:00
Ivan Savenko
6541731f63
Merge pull request #4618 from Laserlicht/xbrz_shadow
...
xbrz fixes
2024-09-18 15:35:25 +03:00
Ivan Savenko
7669f6524b
Merge pull request #4606 from wb180/mapeditor_fix
...
Added ability to choose road types in editor RMG options
2024-09-18 15:07:55 +03:00
Evgeniy Meshcheryakov
70ef1d76fd
Update editor/jsonutils with launcher/jsonutils
2024-09-18 14:52:37 +03:00
Ivan Savenko
72819d5fe3
Merge pull request #4608 from godric3/map-editor-fix-event-regressions
...
Map editor fix event regressions
2024-09-18 14:15:58 +03:00
Laserlicht
fd1f1001c5
fix draw color
2024-09-18 00:09:09 +02:00
Laserlicht
c884566c4f
fix xbrz shadow
2024-09-17 23:58:56 +02:00
Laserlicht
c8f8a3fb6d
missing asset for generateAll
2024-09-17 23:03:30 +02:00
Laserlicht
6aa29ac8ee
show creature level
2024-09-17 22:34:09 +02:00
Dydzio
c6edd615ac
Block possibility to move hero if shift-clicking on path end
2024-09-17 21:49:21 +02:00
Dydzio
7979f62f82
Add status bar movement points info for own hero on adventure map or hero list
2024-09-17 21:38:28 +02:00
godric3
514e81406d
extract PlayerColor to QString conversion to helper function
2024-09-17 20:57:05 +02:00
Ivan Savenko
110def5a1e
Merge pull request #4613 from IvanSavenko/cyan_fix
...
Fix creatures with non-cyan background in battle when xbrz is not in use
2024-09-17 21:33:23 +03:00
Ivan Savenko
d0ac6458b9
Merge pull request #4609 from IvanSavenko/building_fixes
...
Building fixes
2024-09-17 17:50:49 +03:00
Ivan Savenko
336c688e11
Merge pull request #4604 from altiereslima/develop
...
Update portuguese.json
2024-09-17 17:50:34 +03:00
Ivan Savenko
43aa4d1504
Merge pull request #4603 from IvanSavenko/levenshtein
...
Implement detection of typos in json using Levenshtein Distance
2024-09-17 17:50:25 +03:00
Ivan Savenko
ec6e3ff0b9
Merge pull request #4602 from smanolloff/fix-conanfile
...
fix error during ios build
2024-09-17 17:50:16 +03:00
Ivan Savenko
b5bacb5c09
Fix creatures with non-cyan background in battle when xbrz is not in use
2024-09-17 14:48:28 +00:00
Xilmi
f38adf4bb6
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-17 16:10:07 +02:00
