1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-20 03:29:32 +02:00

17672 Commits

Author SHA1 Message Date
Ivan Savenko
db913d95e0
Merge pull request #4808 from Laserlicht/prism_breath
Bonus: prism breath
2024-10-28 12:29:41 +02:00
DjWarmonger
59a15c5ff0
Merge pull request #4790 from kodobi/bugfix/fix-incorrect-battlefield-while-attacking-town-without-fort
Fix battle setup for sieges without forts
2024-10-28 08:38:14 +01:00
Ivan Savenko
c2e49bd10a
Merge pull request #4821 from IvanSavenko/flaggable
Basic support for configurable flaggable objects
2024-10-27 21:19:22 +02:00
Ivan Savenko
7132ee560d
Merge pull request #4822 from mikeiit/fix_launcher_automatic_scaling
Hide launcher interface scaling spin box
2024-10-27 21:18:44 +02:00
Ivan Savenko
10b411aa68
Update launcher/settingsView/csettingsview_moc.cpp 2024-10-27 21:17:46 +02:00
Ivan Savenko
2af4c48ab6
Merge pull request #4823 from GeorgeK1ng/develop
Fixed spacing between sentences
2024-10-27 21:16:33 +02:00
Ivan Savenko
2fa0021c28
Merge pull request #4825 from godric3/map-editor-fix-copying-town
Map editor: fix duplicated spells in copy-pasted town
2024-10-27 21:16:23 +02:00
Ivan Savenko
3a4ed1e351
Merge pull request #4826 from godric3/map-editor-use-vcmi-versioning
Don't use separate versioning for map editor
2024-10-27 21:16:08 +02:00
godric3
7e66bd4a90 Don't use separate versioning for map editor 2024-10-26 13:48:12 +02:00
godric3
152962354d Don't paste objects that cannot be placed, show warning only if error occurred 2024-10-26 12:20:13 +02:00
godric3
1246333350 Initialize town's possibleSpells only if hasn't been initialized already(for example when copying existing town) 2024-10-26 12:15:40 +02:00
George King
c927324b19
Fixed spacing between sentences 2024-10-25 22:13:28 +02:00
Ivan Savenko
26fecbf2ca Simplify income calculation in kingdom overview, account for flaggables 2024-10-25 19:08:13 +00:00
Ivan Savenko
7ae5e2b406 Added support for daily income to flaggable objects 2024-10-25 19:01:00 +00:00
Ivan Savenko
93096dc63c Updated documentation 2024-10-25 18:47:19 +00:00
Ivan Savenko
ee59bc4e71 Add bonus description generation for map objects 2024-10-25 18:36:02 +00:00
Mike
2480c4eae7 Minor update 2024-10-25 09:58:57 -07:00
Ivan Savenko
8a5ac73438 Basic support for configurable flaggable objects
Converted CGLighthouse class into FlaggableMapObject

Bonus provided by Lighthouse/Flaggable is now defined in config and is
accessible to mods.
2024-10-25 16:48:10 +00:00
Mike
9bc84b606e Cleanup 2024-10-24 19:28:21 -07:00
Mike
3690e05e40 Draft to hide scaling dropdown as needed 2024-10-24 18:54:39 -07:00
Ivan Savenko
1826b5bbdf
Merge pull request #4802 from Laserlicht/crash_fix
fix crash & shortcut & layout
2024-10-23 22:23:33 +03:00
Ivan Savenko
f13b5da687
Merge pull request #4796 from nickhuang99/develop
Building dependence of Unicorn Glide in Rampart should include Dendro…
2024-10-23 22:22:32 +03:00
Ivan Savenko
9ba7e227ec
Merge pull request #4801 from Laserlicht/fix_mp3
fix for defect mp3
2024-10-23 22:21:23 +03:00
Ivan Savenko
0c8a529876
Merge pull request #4797 from GeorgeK1ng/develop
Updated Czech translation
2024-10-23 22:20:52 +03:00
Ivan Savenko
246ee0f933
Merge pull request #4803 from XCOM-HUB/patch-6
Update swedish.json
2024-10-23 22:20:22 +03:00
George King
ff1053b0a0
Quality fixes 2024-10-21 23:45:10 +02:00
Laserlicht
0991f02282 Bonus: prism breath 2024-10-20 22:02:56 +02:00
Laserlicht
185d036d78 no scrollbar for hotseat title (with ttf fonts) 2024-10-20 03:16:57 +02:00
Laserlicht
98b912dab8 optimize layout 2024-10-20 02:26:40 +02:00
Laserlicht
94606ba5a3 campaign map description size 2024-10-20 02:13:50 +02:00
George King
28a2fa6790
Quality fixes 2024-10-19 22:43:43 +02:00
George King
681542bd2a
Quality fixes 2024-10-19 22:42:18 +02:00
Maurycy
de0463318c
Update swedish.json
Added new code strings and trimmed down some descriptions so that they will fit in the small description box (hopefully).
2024-10-19 16:16:58 +02:00
Laserlicht
2ea2a3150e fix shortcuts with Modifier Key 2024-10-19 15:59:02 +02:00
Laserlicht
7a190e4929 fix crash 2024-10-19 15:25:26 +02:00
Laserlicht
1df1177506 fix for defect mp3 2024-10-19 13:45:20 +02:00
George King
7dc74f5585
Small fixes
Fixes for new v1.6 strings
2024-10-18 22:42:23 +02:00
George King
19ad4ee0da
Small fixes
Fixed for new v1.6 strings
2024-10-18 20:56:07 +02:00
nick huang
7e4b268a78 Building dependence of Unicorn Glide in Rampart should include Dendroid Arches 2024-10-18 20:04:00 +08:00
George King
d42e77b5a7
Updated Czech translation
Small fixes
2024-10-17 18:34:27 +02:00
Ivan Savenko
6dc6cc4cbf
Merge pull request #4786 from GeorgeK1ng/develop
Updated Czech translation
2024-10-17 17:41:30 +03:00
kodobi
3c56769b2a
Update server/battles/BattleProcessor.cpp
Co-authored-by: Dydzio <dydzio0614@users.noreply.github.com>
2024-10-17 15:21:06 +02:00
kodobi
c576438a95 Fix battle setup for sieges without forts
- Update the if statement in BattleProcessor::SetupBattle to allow
  obstacles in battlefields during sieges without forts.
- Ensure towns without forts use the native battlegrounds.
- Refactor variable name from curB to currentBattle for clarity.
2024-10-17 14:54:01 +02:00
DjWarmonger
7ddbf492f0
Merge pull request #4789 from Laserlicht/last_map
fix remembering last map
2024-10-17 12:18:52 +02:00
George King
10332547ac
Updated Czech translation 2024-10-17 09:42:46 +02:00
Laserlicht
59dae43a74
fix remembering last map 2024-10-17 02:12:41 +02:00
George King
9ef6696e78
Updated Czech translation
Translated 2 overlooked lines
2024-10-16 23:54:41 +02:00
George King
7c0dec1b5e
Small update
Updated Launcher translation
2024-10-16 19:00:13 +02:00
George King
21c83bd3dc
Updated Czech translation
Updated Launcher translation
2024-10-16 18:58:26 +02:00
George King
8904701e2e
Updated Czech translation
Added newly added "vcmi.heroWindow.fusingArtifact.fusing" translation
2024-10-16 18:55:13 +02:00