1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-10 22:31:40 +02:00
Commit Graph

17252 Commits

Author SHA1 Message Date
godric3
f4dc2dcd22 add missing serialization of spells in Limiter 2024-09-21 22:40:58 +02:00
godric3
f51ef2de4c remove unused item data for artifact/spell/skill items and fix code style 2024-09-21 22:35:04 +02:00
godric3
e61ef459c6 Add all artifacts/spells/skills to quest widget lists and disable banned
Previous code added at most as many items as were in allowed lists, which caused to skip last items if some were banned.
2024-09-21 21:54:29 +02: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
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
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
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
Ivan Savenko
8b2821456a Show generic dialog if building was already visited 2024-09-16 19:51:10 +00:00
Ivan Savenko
bff2e064fc Wait for queries generated by town building visit to end before visiting
next building
2024-09-16 19:32:39 +00:00
godric3
9baccdeeae map editor: fix event players after conversion to std::set 2024-09-16 20:25:19 +02:00
godric3
8917c753bd adjust town event handling after introducing 8th creature in town 2024-09-16 20:16:36 +02:00
Ivan Savenko
f1386eca34 Merge pull request #4607 from IvanSavenko/swedish_fix
Fixes swedish translation for Launcher
2024-09-16 21:04:23 +03:00
Ivan Savenko
7c495ee1dd Add new translation file to CMakeLists.txt. Update docs. 2024-09-16 16:59:04 +00:00
Evgeniy Meshcheryakov
28fea2e552 Map editor: Add road types to RMG options 2024-09-16 17:35:42 +03:00
Ivan Savenko
d0c5bcfbb6 Merge pull request #4594 from SoundSSGood/client-icons-fix
Client icons path fixed
2024-09-16 15:56:08 +03:00
Evgeniy Meshcheryakov
152f1e0a65 Add editor forms to target_sources, so they become visible in Qt Creator's project tree 2024-09-16 13:31:17 +03:00
altiereslima
34e1a6c198 Map Editor 2024-09-15 20:11:31 -03:00
altiereslima
9c36aabd26 Update portuguese.json 2024-09-15 20:01:05 -03:00
altiereslima
86c43565c0 Update portuguese.json 2024-09-15 19:32:12 -03:00
Ivan Savenko
e09fbe5ea4 Implement detection of typos in json using Levenshtein Distance 2024-09-15 20:14:08 +00:00
Simeon Manolov
cbac4d7ea7 fix error during ios build
`onetbb/2021.10.0` adds a transitive dependency for `hwloc/2.9.1`

The problem is that `hwloc` does not support mobile OS.

```
checking which OS support to include... Unsupported! (aarch64-apple-ios)
configure: WARNING: ***********************************************************
configure: WARNING: *** hwloc does not support this system.
configure: WARNING: *** hwloc will *attempt* to build (but it may not work).
configure: WARNING: *** hwloc run-time results may be reduced to showing just one processor,
configure: WARNING: *** and binding will not be supported.
configure: WARNING: *** You have been warned.
configure: WARNING: *** Pausing to give you time to read this message...
configure: WARNING: ***********************************************************
checking which CPU support to include... unknown
```

...which eventually leads to:

```
ninja: error: '/Users/simo/.conan/data/hwloc/2.9.3/_/_/package/81c684be1f19b5b5aefe294dd826377be1235f07/lib/libhwloc.so', needed by 'appleclang_15.0_cxx17_64_release/libtbbbind_2_5.3.12.dylib', missing and no known rule to make it
onetbb/2021.12.0:
onetbb/2021.12.0: ERROR: Package '9fcc0a90f088a5fd6ea9bf93b3534713b5635296' build failed
```
2024-09-15 17:37:11 +03:00
Ivan Savenko
1d7a89c79b Only visiting heroes can now activate manual rewardable buildings
- This is more clear - in case if building generates queries
- Avoids some edge cases, like what to do if building is single-use and
town has 2 heroes
- In line with hota version of this feature
2024-09-15 10:36:31 +00:00
Ivan Savenko
c2dc88bf06 Fix refusing a reward, for example from Tree of Knowledge 2024-09-15 10:32:29 +00:00
Laserlicht
0aaafc4c8a cast without skip 2024-09-14 15:10:24 +02:00
SoundSSGood
7eda885390 client icons path fixed 2024-09-14 16:03:26 +03:00
Ivan Savenko
7209969d9d Merge pull request #4593 from IvanSavenko/bugfixing
Fixes for issues reported on Discord
2024-09-14 15:46:04 +03:00