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
9,046 Commits 30 Branches 75 Tags
4cfc93d2da700b9da33693a0dc7a73b2190af4b8
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrii Danylchenko 4cfc93d2da Somehow it works but JNI signatures were incorrect 2023-01-25 08:59:59 +02:00
Andrii Danylchenko 883b08e2c1 Merge pull request #1461 from vcmi/sdl-relative-pointer 
SDL relative pointer for android
 2023-01-20 11:43:11 +02:00
Andrii Danylchenko 9a765e5f67 Remove not supported method, allow relative mode for iOS 2023-01-19 08:26:35 +02:00
Andrii Danylchenko 6c843bce0b SDL relative pointer for android 2023-01-18 10:38:55 +02:00
Andrii Danylchenko 226668c428 Merge pull request #1453 from vcmi/android-fix-input-position-for-keyboard 
Fix android UI shift when keyboard appears
 2023-01-18 09:23:46 +02:00
Andrii Danylchenko 174624d791 Merge pull request #1434 from vcmi/sdl-2-finger-touch 
Handle 2 fingers gesture as rclick via SDL
 2023-01-17 19:01:20 +02:00
Andrii Danylchenko 8f35bf8866 Fix android UI shift when keyboard appears 2023-01-17 16:44:46 +02:00
Andrii Danylchenko c24b89fe06 2 finger rclick block adwmap scrolling and disable for iOS 2023-01-17 16:22:44 +02:00
Andrii Danylchenko 2b1511df99 SDL fix 2 finger touch when you remove fingers instantly 2023-01-16 13:39:45 +02:00
Andrii Danylchenko 7ccfcf51e9 Handle 2 fingers gesture as rclick via SDL 2023-01-16 09:46:52 +02:00
Andrii Danylchenko 9f0eb055f9 Merge pull request #1426 from vcmi/android-upgrade-sdl 
Update android JNI bindings
 2023-01-15 10:36:32 +02:00
Andrii Danylchenko 9f9798d3a4 Update android JNI bindings 2023-01-07 09:26:01 +02:00
Andrii Danylchenko d1dc545f53 Merge pull request #1314 from vcmi/optimze-connection-write 
[1.1] Socket buffered write. Write full cpack at once
 2022-12-27 19:08:43 +02:00
Andrii Danylchenko a954cc08fb Made intermediate class to hide some implementation details from header. 2022-12-27 12:55:31 +02:00
Andrii Danylchenko c271f9187f Connection buffered read cpack. 2022-12-26 21:49:53 +02:00
Andrii Danylchenko cb13064a62 Socket buffered write. Write full cpack at once 2022-12-26 20:17:53 +02:00
Andrii Danylchenko 33602c879d #1286 - use iOS flow for Android resolutions management 2022-12-25 13:39:27 +02:00
Andrii Danylchenko b6ca3f83c1 Merge pull request #1245 from IvanSavenko/artifact_assembly_fix 
Artifact assembly fix
 2022-12-19 10:24:29 +02:00
Andrii Danylchenko 91dc34465e Merge pull request #1232 from vcmi/fix-ai-turn-end-on-defeat 
#1228 - prevent second AI activation on AI defeat due to wrong EndTur…
 2022-12-17 10:50:37 +02:00
Andrii Danylchenko 56bf8ec2c4 #1228 - prevent second AI activation on AI defeat due to wrong EndTurn packet 2022-12-14 22:13:26 +02:00
Andrii Danylchenko bd7f78b8d5 Merge pull request #1222 from vcmi/nkai-pathfinder-fix 
Nkai pathfinder fix
 2022-12-12 14:37:37 +02:00
Andrii Danylchenko 01980f4310 Small optimization of NKAI pathfinder 2022-12-10 22:08:16 +02:00
Andrii Danylchenko 59c3962e9c BattleAI: fix camera obscura 2022-12-10 22:08:16 +02:00
Andrii Danylchenko 0016b77192 Merge pull request #1218 from IvanSavenko/pathfinder_fix 
[1.1] Do not allow attacking from inaccessible tiles
 2022-12-10 15:19:55 +02:00
Andrii Danylchenko 061a4ef2d8 Merge pull request #1215 from IvanSavenko/tower_icon_fix 
Do not show destroyed towers in battle results window
 2022-12-07 17:35:34 +02:00
Andrii Danylchenko 89f0cc66e8 Merge pull request #1213 from IvanSavenko/clone_fix 
Fix crash on casting clone on modded creature
 2022-12-07 17:34:52 +02:00
Andrii Danylchenko fb1a6b734f Merge pull request #1208 from Nordsoft91/battle-retreat-euristic 
Absolute threshold for retreat decision
 2022-12-07 09:17:02 +02:00
Andrii Danylchenko 4b19d37988 Merge pull request #1214 from IvanSavenko/enlightenment_fix 
Library of Enlightenment fix
 2022-12-07 09:14:06 +02:00
Andrii Danylchenko cb1ef1490c Merge pull request #1207 from Nordsoft91/fix-1206 
Throw an exception if empty zone is generated
 2022-12-06 14:36:56 +02:00
Andrii Danylchenko 34cd856f53 Merge pull request #1197 from IvanSavenko/hero_positioning_fix 
Adjust positions of heroes in towns earlier
 2022-12-05 14:47:44 +02:00
Andrii Danylchenko 40e55e2788 Merge pull request #1196 from IvanSavenko/hero_positioning_fix 
Fixes incorrect positioning of heroes on spawn/release from prison
 2022-12-05 10:35:24 +02:00
Andrii Danylchenko 35e8b794cd Merge pull request #1194 from Nordsoft91/editor-crash 
Fix hero-related problems in editor [1.1]
 2022-12-04 18:19:41 +02:00
Andrii Danylchenko b26c874446 Merge pull request #1185 from Nordsoft91/editor-crash 
Fix editor crashes [1.1]
 2022-12-04 09:39:28 +02:00
Andrii Danylchenko f8165bfceb Merge pull request #1191 from vcmi/fix-1186 
#1186 - disable status bar with other advmap controls
 2022-12-04 08:57:24 +02:00
Andrii Danylchenko a72d1270cd #1186 - disable status bar with other advmap controls 2022-12-03 21:32:47 +02:00
Andrii Danylchenko 3a30d8fb13 Merge pull request #1182 from IvanSavenko/ragdoll_fix 
HoMM3 bug workaround: fixes missing slot on artifact merchant background image
 2022-12-03 13:25:00 +02:00
Andrii Danylchenko b50b86ca55 Merge pull request #1183 from IvanSavenko/artifact_fix 
Fixed access violation in artifacts code and potentially non-finisheable battles
 2022-12-03 13:21:48 +02:00
Andrii Danylchenko 47b7c618a9 Merge pull request #1181 from IvanSavenko/version_bump1.1.0 
[beta] Version bump of Linux packaging to 1.1.0
 2022-12-02 14:51:51 +02:00
Andrii Danylchenko 162b3017ce allow building beta branch 2022-12-02 13:16:22 +02:00
Andrii Danylchenko fd21f9ead2 Merge pull request #1180 from vcmi/beta 
allow uploading beta to build server
 2022-12-02 11:47:19 +02:00
Andrii Danylchenko c7510cb8ae allow uploading beta to build server 2022-12-02 09:23:06 +02:00
Andrii Danylchenko d9c4b28ccc Merge pull request #1177 from IvanSavenko/fix_mod_identifiers 
Fix mod identifiers registration & incorrect mod validation
 2022-12-02 09:20:49 +02:00
Andrii Danylchenko 82179a9cdb Merge pull request #1176 from IvanSavenko/tower_shooter_icons 
Tower shooter icons fix
 2022-12-01 12:30:24 +02:00
Andrii Danylchenko ab365fdaef Merge pull request #1175 from SoundSSGood/refactoring-art 
Refactoring of artifacts code
 2022-12-01 11:13:31 +02:00
Andrii Danylchenko 6015e160cf Merge pull request #1178 from Nordsoft91/editor-icons 
Add icons for map editor toolbal
 2022-11-30 14:43:37 +02:00
Andrii Danylchenko a6b92fc152 Merge pull request #1153 from vcmi/click-to-send-message 
Clickable status bar to send messages with on mobile
 2022-11-29 09:28:34 +02:00
Andrii Danylchenko d6ca8017bf Clickable status bar to send messages with on mobile 2022-11-29 08:05:54 +02:00
Andrii Danylchenko 3b072b80d5 Merge pull request #1168 from Nordsoft91/fix-obstacles-generation 
Fix obstacles generation
 2022-11-27 09:56:11 +02:00
Andrii Danylchenko dfee2eda68 Merge pull request #1148 from SoundSSGood/ask-assemble 
Feature to assemble/disassemble arts in backpack
 2022-11-27 09:48:57 +02:00
Andrii Danylchenko f04bd02df1 Merge pull request #1163 from Nordsoft91/fix-camp-multiclick 
Prevent multiple clicking for start campaign
 2022-11-27 09:25:05 +02:00
Andrii Danylchenko 0ccb706782 Merge pull request #1155 from Nordsoft91/fix-camp-919 
Fix for #919
 2022-11-25 11:43:25 +02:00
Andrii Danylchenko 23c5aa95c6 Merge pull request #1159 from Nordsoft91/fix-mods-update 
Fix mods updating
 2022-11-25 10:02:48 +02:00
Andrii Danylchenko 59063a310b Merge pull request #1160 from Nordsoft91/dwelling-accumulate 
Change default value for DWELLINGS_ACCUMULATE_CREATURES
 2022-11-25 10:01:34 +02:00
Andrii Danylchenko eed9de2ff5 Merge pull request #1154 from IvanSavenko/music_player_fixes 
Minor improvements & fixes to music player
 2022-11-23 15:20:20 +02:00
Andrii Danylchenko e31beafa17 #1100 - fix visiting allied dwellings 2022-11-23 02:40:56 +04:00
Andrii Danylchenko 7ae35b95a3 Merge pull request #1149 from Nordsoft91/fix-crash-3234 
Fix #3234
 2022-11-19 12:40:43 +02:00
Andrii Danylchenko e0aa26e599 Merge pull request #1142 from vcmi/lobby 
Support multi-language in online lobby
 2022-11-15 22:09:47 +04:00
Andrii Danylchenko 6974d4ea53 Merge pull request #1130 from IvanSavenko/banned_skills_fix 
Fixes #1096 - do not propose banned skills on levelup
 2022-11-15 09:32:12 +02:00
Andrii Danylchenko 8b964be71f Merge pull request #1111 from GermanAizek/develop 
Code refactor and fix condition bug
 2022-11-15 09:23:16 +02:00
Andrii Danylchenko b6bcfec329 Merge pull request #1129 from IvanSavenko/new_day_sound_fix 
Fixes #825 - do not wait for new week dialog in single-player
 2022-11-14 17:45:57 +02:00
Andrii Danylchenko 86972d7164 Merge pull request #1112 from SoundSSGood/bulk-move-swap-artifacts-rev2 
Bulk move and swap artifacts rev2
 2022-11-14 08:31:48 +02:00
Andrii Danylchenko 38f36fa720 Merge pull request #1127 from IvanSavenko/resume_music 
Fix #985 - resume town & terrain themes
 2022-11-13 21:18:46 +02:00
Andrii Danylchenko e4f3d2a685 Merge pull request #1121 from vcmi/nk-fix-hung 
#1102 - NKAI: one more freeze - no mains with strong army
 2022-11-13 09:56:39 +02:00
Andrii Danylchenko 41825e8c92 Merge pull request #1125 from GermanAizek/fix-3144 
Fix [3144]
 2022-11-13 09:00:03 +02:00
Andrii Danylchenko 3676152644 #1102 - NKAI: one more freeze - no mains with strong army 2022-11-10 21:12:08 +02:00
Andrii Danylchenko c5cf0e4086 Merge pull request #1103 from Nordsoft91/autobattle-bugfix 
Preventing multiple AI from being created
 2022-11-10 15:18:24 +02:00
Andrii Danylchenko 1ca2283a90 Merge pull request #1105 from krs0/feature/#1071__In_latest_night_builds_there_are_problems_with_schema_obstacle.json_and_file_obstacles.json 
Problems with schema obstacle.json and file obstacles.json #1071
 2022-11-10 11:53:08 +02:00
Andrii Danylchenko 5f92a0760f Merge pull request #1113 from vcmi/nk-fix-hung 
NKAI: a few crash/hang fixes
 2022-11-10 11:48:17 +02:00
Andrii Danylchenko 5222ea8c25 Merge pull request #1110 from Nordsoft91/whereshouldbeattached 
#1754 Fix crash with objects belonging players without state
 2022-11-10 11:43:50 +02:00
Andrii Danylchenko 502ad59169 Merge pull request #1117 from vcmi/readme-patch 
Add downloads badge
 2022-11-10 11:42:22 +02:00
Andrii Danylchenko 55914290ca Merge pull request #1109 from trofi/fix-format-string 
mapeditor/mainwindow.cpp: use '%s' (not '%b') for string formatter
 2022-11-07 14:06:56 +02:00
Andrii Danylchenko 233b850daf NKAI: a few crash/hang fixes 2022-11-07 13:58:20 +02:00
Andrii Danylchenko ae1d2c50e2 Merge pull request #1099 from kambala-decapitator/disable-tests 
disable tests by default
 2022-11-03 14:01:25 +02:00
Andrii Danylchenko 6c31b50e73 Merge pull request #1094 from Nordsoft91/autobattle-bugfix 
[965] Fix for auto-battle crash
 2022-11-03 08:17:30 +02:00
Andrii Danylchenko 418aabcd94 Merge pull request #1095 from kambala-decapitator/ci-fix-running-conan 
[CI] fix running Conan
 2022-11-02 12:34:22 +02:00
Andrii Danylchenko 80ce205d94 Merge pull request #1093 from Nordsoft91/port-override 
Write port override
 2022-10-31 07:21:01 +02:00
Andrii Danylchenko 8fc38c617f Merge pull request #1086 from vcmi/fix-mantis-2934 
Mantis-2934: fix conditions to upgrade town in h3m format parser
 2022-10-25 11:52:22 +03:00
Andrii Danylchenko 7618bc7425 Mantis-2934: fix conditions to upgrade town in h3m format parser 2022-10-23 16:40:07 +03:00
Andrii Danylchenko afc0cc1c15 Merge pull request #1067 from vcmi/battle-ai-improvements 
Battle ai improvements
 2022-10-23 11:41:29 +03:00
Andrii Danylchenko ebf4854801 Battle AI: add some comments + refactoring 2022-10-23 11:41:03 +03:00
Andrii Danylchenko 601ced3749 BattleAI: rework movement when no targtes 2022-10-23 11:41:03 +03:00
Andrii Danylchenko 033a585e4b Battle AI 2 turns attacks recalculation 2022-10-23 11:41:03 +03:00
Andrii Danylchenko a2380ebd37 Merge pull request #1082 from kambala-decapitator/linux-mapeditor-icon 
[Linux] add proper desktop entry for the map editor
 2022-10-23 11:40:41 +03:00
Andrii Danylchenko 11790c7c02 Merge pull request #1083 from vcmi/fix-android 
Move version definition into a separate cmake file
 2022-10-23 10:39:25 +03:00
Andrii Danylchenko 3a9493130c Merge pull request #1081 from kambala-decapitator/macos-bundle-ID 
[macOS] improve Info.plist
 2022-10-23 10:39:05 +03:00
Andrii Danylchenko 6ef480971d Move version definition into a separate cmake file 2022-10-22 20:48:38 +03:00
Andrii Danylchenko b43e0ff9e4 Merge pull request #972 from vcmi/cpp-map-editor 
Cpp map editor
 2022-10-22 12:42:27 +03:00
Andrii Danylchenko c2cc801f60 Merge pull request #1073 from kambala-decapitator/ios-conan 
[Conan] add iOS support, bump dependencies, improvements
 2022-10-22 12:40:48 +03:00
Andrii Danylchenko bae4750e93 Merge pull request #1078 from Nordsoft91/advspell-mech-fix 
[1072] Fix advmap spell mechanics
 2022-10-22 12:30:34 +03:00
Andrii Danylchenko 91dc94c66b Merge pull request #1079 from Nordsoft91/fix-screenshots-param 
Fix screenshots loading
 2022-10-22 12:30:15 +03:00
Andrii Danylchenko c32d44190e Merge pull request #1075 from Nordsoft91/town-entrance-fix 
[1069] Fix bug related to town entrance
 2022-10-19 13:42:33 +03:00
Andrii Danylchenko 288f36c0c3 Merge pull request #1052 from Nordsoft91/mp-disconnection 
MP handle disconnection
 2022-10-19 09:56:18 +03:00
Andrii Danylchenko 43db37bf45 Merge pull request #1068 from vcmi/nk-retreat 
NKAI retreat
 2022-10-16 11:57:28 +03:00
Andrii Danylchenko e9c725181c NKAI: fix retreat logic 2022-10-15 15:15:12 +03:00
Andrii Danylchenko 153cccdf46 NKAI: hire retreated hero 2022-10-14 12:00:56 +03:00
Andrii Danylchenko 82a9f82e1c BattleAI: retreat 2022-10-14 12:00:56 +03:00
Andrii Danylchenko e2b373a784 Merge pull request #1066 from vcmi/fix-random-hero-initial-pos 
#1065 - fix random hero initial position
 2022-10-14 11:57:43 +03:00
Andrii Danylchenko 6cbaa40e29 #1065 - fix random hero initial position 2022-10-13 11:58:32 +03:00
Andrii Danylchenko 360f079bb7 Merge pull request #1017 from vcmi/fix-mine-templates 
Fix incorrect templates for mines in HoTA
 2022-10-09 11:25:59 +03:00
Andrii Danylchenko 238dabe060 Merge pull request #1055 from kambala-decapitator/version-from-cmakelists 
define app version only in CMakeLists
 2022-10-08 09:55:59 +03:00