1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Commit Graph

17643 Commits

Author SHA1 Message Date
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
9ba7e227ec Merge pull request #4801 from Laserlicht/fix_mp3
fix for defect mp3
2024-10-23 22:21:23 +03:00
0c8a529876 Merge pull request #4797 from GeorgeK1ng/develop
Updated Czech translation
2024-10-23 22:20:52 +03:00
246ee0f933 Merge pull request #4803 from XCOM-HUB/patch-6
Update swedish.json
2024-10-23 22:20:22 +03:00
ff1053b0a0 Quality fixes 2024-10-21 23:45:10 +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
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
7e4b268a78 Building dependence of Unicorn Glide in Rampart should include Dendroid Arches 2024-10-18 20:04:00 +08: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
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
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
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
cb6fa74cc4 lower background music while campaign audio plays 2024-10-14 21:02:49 +02:00
6e65eaafbc workaround for assert 2024-10-14 21:01:01 +02:00
94a0de716a Merge pull request #4772 from Laserlicht/mixer_audio_duration
fix: use sdl mixer to get audio duration
2024-10-14 21:51:49 +03:00
abf9d1017e Merge pull request #4705 from Laserlicht/adv_search
map object search
2024-10-14 21:51:41 +03:00
b2da317906 fixes audio playback after using Back button 2024-10-14 20:26:31 +02:00
9ed4dbaeb4 Merge remote-tracking branch 'upstream/develop' into adv_search 2024-10-14 19:52:55 +02:00
129f8e6f34 code review
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-10-14 19:30:03 +02:00
3f59942b04 code review 2024-10-14 19:28:38 +02:00
604e3b5c67 Merge pull request #4763 from IvanSavenko/herohandler_split
Split CHeroHandler.cpp/.h into 1 file per class
2024-10-14 19:05:48 +03:00
2c14b8fa98 Merge pull request #4706 from altiereslima/develop
Update Portuguese Translation
2024-10-14 18:33:39 +03:00
69b6e9c167 Count days from 1 instead of 0 in map editor timed event UI 2024-10-14 17:19:34 +02:00
cee3521f57 Merge pull request #4770 from IvanSavenko/prison_fix
Fix for loading hero types / identities
2024-10-14 18:16:53 +03:00
678e6b47f8 Merge pull request #4756 from IvanSavenko/sonar_fixes
Fix some of the new warnings from sonarcloud
2024-10-14 18:16:41 +03:00
856da004d1 Merge pull request #4768 from ToRRent1812/patch-2
Update polish.json
2024-10-14 18:16:27 +03:00