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

17964 Commits

Author SHA1 Message Date
0991f02282 Bonus: prism breath 2024-10-20 22:02:56 +02:00
573bb6abc6 CArtPlace now works with artifact ID 2024-10-20 12:56:54 +03:00
185d036d78 no scrollbar for hotseat title (with ttf fonts) 2024-10-20 03:16:57 +02:00
98b912dab8 optimize layout 2024-10-20 02:26:40 +02:00
94606ba5a3 campaign map description size 2024-10-20 02:13:50 +02:00
28a2fa6790 Quality fixes 2024-10-19 22:43:43 +02:00
681542bd2a Quality fixes 2024-10-19 22:42:18 +02:00
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
2ea2a3150e fix shortcuts with Modifier Key 2024-10-19 15:59:02 +02:00
7a190e4929 fix crash 2024-10-19 15:25:26 +02:00
1df1177506 fix for defect mp3 2024-10-19 13:45:20 +02:00
7dc74f5585 Small fixes
Fixes for new v1.6 strings
2024-10-18 22:42:23 +02:00
19ad4ee0da Small fixes
Fixed for new v1.6 strings
2024-10-18 20:56:07 +02:00
a68522b370 fix 2024-10-18 14:37:18 +02:00
0f41361873 fix edge case 2024-10-18 14:33:29 +02:00
7e4b268a78 Building dependence of Unicorn Glide in Rampart should include Dendroid Arches 2024-10-18 20:04:00 +08:00
538c7ce7b1 Update portuguese.json 2024-10-18 07:24:38 -03:00
f0b7d007a0 video: use global timer; implement frameskip 2024-10-18 10:36:52 +02:00
3ab3132008 Update portuguese.json 2024-10-17 23:51:57 -03:00
cd107c6b4f Merge branch 'vcmi:develop' into develop 2024-10-17 23:47:00 -03:00
d42e77b5a7 Updated Czech translation
Small fixes
2024-10-17 18:34:27 +02:00
6dc6cc4cbf Merge pull request #4786 from GeorgeK1ng/develop
Updated Czech translation
2024-10-17 17:41:30 +03:00
3c56769b2a Update server/battles/BattleProcessor.cpp
Co-authored-by: Dydzio <dydzio0614@users.noreply.github.com>
2024-10-17 15:21:06 +02:00
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
7ddbf492f0 Merge pull request #4789 from Laserlicht/last_map
fix remembering last map
2024-10-17 12:18:52 +02:00
10332547ac Updated Czech translation 2024-10-17 09:42:46 +02:00
59dae43a74 fix remembering last map 2024-10-17 02:12:41 +02:00
9ef6696e78 Updated Czech translation
Translated 2 overlooked lines
2024-10-16 23:54:41 +02:00
8b427c3989 use json format 2024-10-16 22:47:38 +02:00
7c0dec1b5e Small update
Updated Launcher translation
2024-10-16 19:00:13 +02:00
21c83bd3dc Updated Czech translation
Updated Launcher translation
2024-10-16 18:58:26 +02:00
8904701e2e Updated Czech translation
Added newly added "vcmi.heroWindow.fusingArtifact.fusing" translation
2024-10-16 18:55:13 +02:00
c25aef8f48 Merge pull request #4766 from SoundSSGood/fused-artifacts
Fused artifacts
2024-10-16 15:08:20 +03:00
44963f991b Merge pull request #4782 from Olegmods/develop
Ship obstacles fix
2024-10-16 15:08:02 +03:00
6b537319be Updated Czech translation 2024-10-16 12:24:09 +02:00
349f27fa52 Updated Czech translation 2024-10-16 12:17:41 +02:00
54542c54b3 working subtitles 2024-10-16 03:48:14 +02:00
4d46a2084d basic subtitle rendering 2024-10-16 02:36:26 +02:00
5e093d82b7 Update battlefields.json 2024-10-15 23:02:27 +03:00
049c6c539f Revert changes 2024-10-15 23:01:53 +03:00
52e0899d6f Merge pull request #4780 from Laserlicht/text_pos_fix
fix: campaign video scrolling for short texts
2024-10-15 18:01:52 +03:00
e676e78e28 Merge pull request #4778 from Laserlicht/assert_fix
fix: workaround for assert
2024-10-15 18:01:31 +03:00
c4e708831c Merge pull request #4777 from Laserlicht/backround_voice
fix: lower background music while campaign audio plays
2024-10-15 18:01:17 +03:00
da0ec2c607 Merge pull request #4776 from Laserlicht/audio_playback
fix: audio playback after using Back button
2024-10-15 18:00:44 +03:00
60fe8a05b9 Merge pull request #4775 from dydzio0614/map-editor-event-day-fix
Count days from 1 instead of 0 in map editor timed event UI
2024-10-15 18:00:23 +03:00
86d5c05ffa Fused identical artifacts 2024-10-15 16:51:29 +03:00
5f34d3b067 Update obstacles.json 2024-10-15 14:15:43 +03:00
6c4e7f8058 Update obstacles.json 2024-10-15 11:09:14 +03:00
d65938fa17 fix campaign video scrolling for short texts 2024-10-14 23:26:24 +02:00
b379491b96 Update Portuguese Translation (map object search) 2024-10-14 18:24:45 -03:00