games/vcmi
1
0 Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity
10,382 Commits 30 Branches 75 Tags
c0c19557af8333340a0a85159fbb23ac7209c2e7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivan Savenko f24ca6fbcf Merge pull request #1699 from rilian-la-te/fix-ignissa 
Rewardable: always initialize numbers
 2023-03-17 22:15:28 +02:00
Ivan Savenko dfd6998a9e Merge pull request #1702 from IvanSavenko/disable_client_state_load 
Disable loading of client save game
 2023-03-17 22:15:18 +02:00
Ivan Savenko e7f8ef7627 Merge pull request #1703 from Adriankhl/fix_auto_fighting 
Prevent crashing when pressing auto-combat button on enemy turn
 2023-03-17 22:15:11 +02:00
Ivan Savenko 95d56d3f2a Merge pull request #1705 from rilian-la-te/convert-scouting 
HeroBonus: add scouting to converter
 2023-03-17 22:14:54 +02:00
Ivan Savenko bb331409cc Merge pull request #1707 from rilian-la-te/fix-commander-jousting 
Fix commander jousting
 2023-03-17 22:14:46 +02:00
Ivan Savenko a3059033f2 Fixes broken client state, e.g. movement. Effectively reverts #1663 2023-03-17 16:00:47 +02:00
Ivan Savenko 02b5edd32d Merge pull request #1653 from IvanSavenko/changelog_update 
Changelog update: Added changes from PR's made in February
 2023-03-16 21:48:59 +02:00
Ivan Savenko 8a6c51a9e6 Fix uninitialized pointer dereference 2023-03-16 20:48:37 +02:00
Ivan Savenko e64aed371b Updated changelog to include new changes 2023-03-16 20:48:18 +02:00
Ivan Savenko d6b3b6ca61 Added changes from PR's made in February 2023-03-16 19:29:25 +02:00
Ivan Savenko ecbbbeda9b Merge pull request #1693 from IvanSavenko/game_settings_overrides 
Game settings overrides
 2023-03-16 19:28:22 +02:00
Ivan Savenko fbb9810c49 Fix regression - uninitialized pointer 2023-03-16 19:25:26 +02:00
Ivan Savenko 921c5d647e Fix Spanish translation 2023-03-16 18:42:47 +02:00
Ivan Savenko 21407b26dd Fix minimap redraw on fow reveal 2023-03-16 18:36:31 +02:00
Ivan Savenko aea2a1e22e Fixed loading of settings from mods 2023-03-16 18:11:36 +02:00
Ivan Savenko 2207c0dfb2 Clear up comments 2023-03-16 18:11:36 +02:00
Ivan Savenko a0e9e01b48 Renamed & reorganized all game mechanics settings names 2023-03-16 18:11:35 +02:00
Ivan Savenko 383387ef29 Integrated defaultMods into mod system 2023-03-16 17:55:09 +02:00
Ivan Savenko 2353137c74 Merge pull request #1586 from rilian-la-te/modernize-rest 
vcmi: modernize rest of lib
 2023-03-16 17:38:20 +02:00
Ivan Savenko 17520b70ce Merge pull request #1518 from rilian-la-te/arcane-intuition 
Skills rework: separate bonus for each skill - part 1
 2023-03-16 16:12:42 +02:00
Ivan Savenko 35aa6914c5 Merge pull request #1659 from macomarivas/spanish_translation 
Spanish translation
 2023-03-16 15:37:23 +02:00
Ivan Savenko 129b5313c5 Merge pull request #1663 from Adriankhl/fix_load_sleeping_heroes 
Fix client data deserialization, such as sleepingHeroes
 2023-03-16 15:05:18 +02:00
Ivan Savenko 865f9f7d2b Merge pull request #1511 from IvanSavenko/launcher_welcome_page 
Add welcome/setup page to Laucher
 2023-03-16 15:04:49 +02:00
Ivan Savenko 962f7ac4de Merge pull request #1682 from IvanSavenko/h3m_text_export 
H3M/H3C text export
 2023-03-16 14:50:57 +02:00
Ivan Savenko 77f92e56ac Merge pull request #1689 from IvanSavenko/map_renderer_fixes 
Map renderer fixes
 2023-03-16 14:48:57 +02:00
Ivan Savenko dc926aac03 Merge pull request #1690 from rilian-la-te/fixup-infobars 
Fix yellow text rendering.
 2023-03-16 14:47:43 +02:00
Ivan Savenko 2a2af34788 Merge pull request #1650 from SoundSSGood/arts-swap-regression-fix 
Arts swap regression fixed
 2023-03-16 14:47:31 +02:00
Ivan Savenko a065fb2e6d Fix scrolling area bounds while in world view mode 2023-03-15 14:47:23 +02:00
Ivan Savenko d3533150b8 Fix misplaced width/height in UI 2023-03-15 12:17:08 +02:00
Ivan Savenko 87eab92290 Fix crash on killing hero in boat & visual artifacts from whirpool 2023-03-15 00:31:51 +02:00
Ivan Savenko 39f2bef1ab Update town visual on capturing 2023-03-15 00:30:58 +02:00
Ivan Savenko 844bf9b9ab Do not play embark/disembar sound during enemy turn 2023-03-15 00:30:19 +02:00
Ivan Savenko f988a67fbf Fix movement animation on revealing FoW 2023-03-15 00:29:12 +02:00
Ivan Savenko f5f303202a Update localization 2023-03-14 22:04:08 +02:00
Ivan Savenko d2152d387f Fix processing of VCMI_Tests map 2023-03-14 21:48:39 +02:00
Ivan Savenko 06e5d37fbd Fixed incorrect error messages from translations 2023-03-14 19:55:08 +02:00
Ivan Savenko f42a894723 Implemented h3c translations 2023-03-14 19:46:15 +02:00
Ivan Savenko a4ef9fd0b8 Added h3m strings generation to 'convert txt' command 2023-03-14 17:54:37 +02:00
Ivan Savenko 62720b1d4e Translations update 2023-03-14 16:02:16 +02:00
Ivan Savenko 369e925af8 Loading of translation mods is now skipped on language mismatch 2023-03-14 16:02:16 +02:00
Ivan Savenko a062e5e425 - Implemented proposition to install translation mod when necessary 2023-03-14 16:02:16 +02:00
Ivan Savenko b1d2a2e74f Updated translations 2023-03-14 16:02:16 +02:00
Ivan Savenko 66df19352f Do not show languages without translations in UI 2023-03-14 16:02:16 +02:00
Ivan Savenko 1ff317058e Implemented install of mods via setup 2023-03-14 16:02:16 +02:00
Ivan Savenko 9c92d97f98 Temporarily (?) removed "Finish" tab from Setup 2023-03-14 16:02:16 +02:00
Ivan Savenko c3d78ba761 Partially implemented Setup Window 2023-03-14 16:02:16 +02:00
Ivan Savenko 6fe319329b Fix language selection 2023-03-14 16:02:16 +02:00
Ivan Savenko dfaceb3a0e Updated translations 2023-03-14 16:02:16 +02:00
Ivan Savenko 70bdb3aeaf Moved language handling code to Languages.h/cpp 2023-03-14 16:02:16 +02:00
Ivan Savenko 54be656871 Initial design for Launcher Welcome screen 2023-03-14 16:02:16 +02:00
Ivan Savenko e1310f88e3 Merge pull request #1675 from rilian-la-te/scholar-infobox 
Fix #1385 and similar
 2023-03-13 12:49:30 +02:00
Ivan Savenko fdfba83186 Merge pull request #1676 from rilian-la-te/fix-week-animation 
vcmi: fix week animation
 2023-03-13 12:48:59 +02:00
Ivan Savenko e764a7255d Merge pull request #1645 from rilian-la-te/infobox-pickups 
Allow rewardables to show its rewards in info bar
 2023-03-12 15:33:15 +02:00
Ivan Savenko 20ef84bd55 Merge pull request #1670 from rilian-la-te/ffmpeg-6.0 
vcmi: fix build and run with ffmpeg 6.0
 2023-03-11 00:19:06 +02:00
Ivan Savenko 0ea73cae7f Merge pull request #1662 from rilian-la-te/reduce-lexical-cast 
vcmi: reduce boost::lexical_cast usage
 2023-03-10 12:53:21 +02:00
Ivan Savenko c4de8a5cd0 Merge pull request #1580 from rilian-la-te/modernize-log-fs-events 
Modernize next part
 2023-03-09 15:53:43 +02:00
Ivan Savenko 1ab0295bfb Merge pull request #1630 from Nordsoft91/fix-1605 
Regression fix for roads in map editor
 2023-03-09 15:53:18 +02:00
Ivan Savenko a503c9d413 Merge pull request #1638 from rilian-la-te/fix-road-river 
vcmi: fix road and river loading
 2023-03-09 15:53:10 +02:00
Ivan Savenko 11dc9228e2 Merge pull request #1635 from SoundSSGood/warmachine-buying-fix 
warmachine buying fix
 2023-03-09 15:52:41 +02:00
Ivan Savenko 9ca576d68c Merge pull request #1643 from Adriankhl/lldb_string 
Fix lldb string inspection for debug build
 2023-03-09 15:52:20 +02:00
Ivan Savenko e7c8782e80 Merge pull request #1660 from krs0/feature/do_not_showVisitable_for_current_hero 
Do not show visitable for current hero
 2023-03-09 15:51:02 +02:00
Ivan Savenko 010c548dc1 Merge pull request #1651 from Adriankhl/fix_sleep_wake 
Fix sleep/wake button icon update
 2023-03-08 19:42:02 +02:00
Ivan Savenko 3f7c0baba1 Merge pull request #1655 from Laserlicht/patch-1 
German translation - synced with english
 2023-03-08 16:42:06 +02:00
Ivan Savenko dc70095333 Merge pull request #1656 from krs0/feature/Rename_showBlocking_to_showBlocked 
Renamed showBlockable to showBlocked
 2023-03-08 12:09:59 +02:00
Ivan Savenko c28f7dd292 Merge pull request #1652 from IvanSavenko/localization_fix 
Localization fix
 2023-03-07 19:41:59 +02:00
Ivan Savenko 76927cf434 Fix selection of current resolution 2023-03-07 15:35:04 +02:00
Ivan Savenko 674711c959 Fix missing texts in RMG mod 2023-03-07 15:28:27 +02:00
Ivan Savenko d7e914d0eb Fix resolution selection menu texts 2023-03-07 15:27:54 +02:00
Ivan Savenko 9e39e8ef11 Merge pull request #1642 from IvanSavenko/map_render_regression_fix 
Map render regression fix
 2023-03-07 01:13:39 +02:00
Ivan Savenko 58cfea02f1 Added option to skip validation of mods 2023-03-07 00:06:58 +02:00
Ivan Savenko db9a296d02 Fix debug renderer 2023-03-07 00:06:58 +02:00
Ivan Savenko f768a5543e Removed deprecated encoding option 2023-03-07 00:06:58 +02:00
Ivan Savenko 499496f9d0 Restored Simplified Chinese support 2023-03-07 00:06:58 +02:00
Ivan Savenko 144ddba97d Replaced AI assertion failure with error in log 2023-03-07 00:06:58 +02:00
Ivan Savenko df4fe33c3a Do not switch InfoBar to hero during another player turn 2023-03-07 00:06:58 +02:00
Ivan Savenko 3d71f8b46d Fix loading of h3m translations 2023-03-07 00:06:58 +02:00
Ivan Savenko b3b7a4eb2c Fix potentially missing message for Tree of Knowledge 2023-03-07 00:06:58 +02:00
Ivan Savenko 0c847c85cc Fix serialization of rewardable objects 2023-03-07 00:06:58 +02:00
Ivan Savenko 5f396af14c Remove excessive logging 2023-03-07 00:06:58 +02:00
Ivan Savenko aeb653c919 Fix typos 2023-03-07 00:06:58 +02:00
Ivan Savenko 0b3c10d990 Fix crash on hovering Market of Time (unfinished H3 object) 2023-03-07 00:06:58 +02:00
Ivan Savenko 1d03900f16 Fix render priority of heroes 2023-03-07 00:06:58 +02:00
Ivan Savenko 322b8e8840 Fix visibility of garrisoned heroes while picking up resources 2023-03-07 00:06:58 +02:00
Ivan Savenko ddb7bcaf42 Merge pull request #1626 from IvanSavenko/setting_ux_improvements 
New settings window ux improvements
 2023-03-07 00:06:31 +02:00
Ivan Savenko c8afef3408 Merge pull request #1636 from rilian-la-te/remove-unused 
vcmi: remove old war machine code
 2023-03-06 00:10:55 +02:00
Ivan Savenko f73a655ac1 Merge pull request #1640 from rilian-la-te/clang-qt6 
vcmi: use qt6 for clang linux build
 2023-03-06 00:10:43 +02:00
Ivan Savenko b7025125d5 Added map swipe option 2023-03-05 23:53:06 +02:00
Ivan Savenko 674c9a9eac Merge pull request #1639 from IvanSavenko/fix_localized_text_files 
Fix loading of non-ASCII text files
 2023-03-05 22:49:29 +02:00
Ivan Savenko df50a17d2a Fix loading of non-ASCII text files 2023-03-05 21:50:38 +02:00
Ivan Savenko 2e69a4769d Implemented framerate limit option (not available in UI) 2023-03-05 21:06:52 +02:00
Ivan Savenko 37b2fb7ff3 Fixed map options to support adventure map rewrite 2023-03-05 20:14:23 +02:00
Ivan Savenko 95440ad540 Minor fixes 2023-03-05 19:55:38 +02:00
Ivan Savenko 7030fa8fe7 Allow changing queue size instantly on option toggle 2023-03-05 19:55:38 +02:00
Ivan Savenko 5f5ba0a54c Fix town-related options 2023-03-05 19:55:38 +02:00
Ivan Savenko 105d988624 Remove debug code 2023-03-05 19:55:38 +02:00
Ivan Savenko 5fb5513572 Attempt to trace crash caused by iterator invalidation 2023-03-05 19:55:38 +02:00
Ivan Savenko d34268d7d5 Split "Show available creatures in town" into two buttons 2023-03-05 19:55:38 +02:00
Ivan Savenko 403730d1a3 Updated Ukrainian localization 2023-03-05 19:55:38 +02:00
Ivan Savenko cbe6a80020 Do not block "Load" button in battle 2023-03-05 19:55:38 +02:00
Ivan Savenko 17dfd3d34a Updated English translation 2023-03-05 19:55:38 +02:00