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,857 Commits 30 Branches 75 Tags
d99d1509f6bff12b889f32f85e50a79d80d9f0fb
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
nordsoft 5419de3468 Fix getCasterUnitId 2023-04-13 02:18:12 +04:00
nordsoft f005dbbc14 Spectator mode 2023-04-13 00:59:44 +04:00
nordsoft 39f4bc0072 Reset battle bonuses on client side 2023-04-11 17:25:19 +04:00
nordsoft 8e77b833d9 Merge remote-tracking branch 'upstream/develop' into battle-dialog 2023-04-11 15:54:08 +04:00
nordsoft bfc75ccd39 Merge remote-tracking branch 'upstream/develop' into battle-dialog 2023-04-11 02:22:42 +04:00
nordsoft 9371f013e9 Rename outer caster 2023-04-10 20:56:50 +04:00
nordsoft 49255e5a3f Adjustable layout for launcher 2023-04-10 20:33:02 +04:00
nordsoft b9cabef179 Fixes issues related to spell mechanics 2023-04-10 17:08:24 +04:00
nordsoft f550457d23 Added stdinc 2023-04-10 12:17:43 +04:00
nordsoft 1a63f44dab Minor change 2023-04-10 05:53:20 +04:00
nordsoft 464ad63749 Implement behavior 2023-04-10 05:46:45 +04:00
nordsoft c0b90432cb Change callback interface 2023-04-10 05:40:03 +04:00
nordsoft 56b0e900d8 Add outer caster class 2023-04-10 05:39:25 +04:00
nordsoft 7041950ae1 Don't show empty window 2023-04-10 05:06:05 +04:00
nordsoft e440343921 Bypass initial version of spell callback 2023-04-10 04:34:24 +04:00
nordsoft fc310c6e79 Town portal fix 2023-04-10 01:46:37 +04:00
nordsoft 601e7e854f Dimensions door fix 2023-04-10 01:37:46 +04:00
nordsoft 0093a44889 Added abstract method to caster interface 2023-04-10 01:31:41 +04:00
nordsoft 72b2a09f0b Boat summon spell rewritten 2023-04-10 01:06:02 +04:00
nordsoft 69ad62ef58 Fixes from code review 2023-04-09 23:00:20 +04:00
nordsoft a8f31fabd1 Fix bug 2023-04-09 23:00:20 +04:00
nordsoft 67c0d29478 Fix header 2023-04-09 23:00:20 +04:00
nordsoft e7c6f596ee Little code improvement 2023-04-09 23:00:20 +04:00
nordsoft ab7d316c3f Rename fields 2023-04-09 23:00:20 +04:00
nordsoft b40a3a1b14 Banned arts and skills cannot be randomly rewarded 2023-04-09 23:00:20 +04:00
nordsoft 26c3277895 New format for skills selection 2023-04-09 23:00:20 +04:00
nordsoft b7ccc4d649 Revert "Random selection for secondary skills" 
This reverts commit 6e538dab30.
 2023-04-09 23:00:20 +04:00
nordsoft 6c5f3f21a5 Extend loadKey function 2023-04-09 23:00:20 +04:00
nordsoft fe21acb0d0 Revert "Random selection for resources" 
This reverts commit 0e4ff3e2bf.
 2023-04-09 23:00:20 +04:00
nordsoft dce5a924b0 Random selection for secondary skills 2023-04-09 23:00:20 +04:00
nordsoft 53e16c7e22 Random selection for primary skills 2023-04-09 23:00:20 +04:00
nordsoft bb915b0e7e Random selection for resources 2023-04-09 23:00:20 +04:00
nordsoft 50115c3113 Rename variables 2023-04-08 20:56:05 +04:00
nordsoft e4cd167062 Compilation fix 2023-04-08 01:49:59 +04:00
nordsoft 3e6a656e4c Define touchscreen mode at first launch 2023-04-08 01:49:59 +04:00
nordsoft 52b53ab307 Feature and setting implemented 2023-04-08 01:49:59 +04:00
nordsoft b1d06b6141 Complete quick combat feature 2023-04-06 22:49:38 +04:00
nordsoft e85593dbb3 Save & restore mana 2023-04-06 21:19:46 +04:00
nordsoft 3e28b58c80 Fixes 2023-04-06 19:59:22 +04:00
nordsoft ece8a2a41f Merge branch 'battle-dialog' into battle-dialog2 
# Conflicts:
#	AI/BattleAI/BattleAI.h
#	AI/StupidAI/StupidAI.h
#	client/CPlayerInterface.cpp
#	client/CPlayerInterface.h
#	client/Client.cpp
#	client/NetPacksClient.cpp
#	client/battle/CBattleInterface.cpp
#	client/battle/CBattleInterface.h
#	client/battle/CBattleInterfaceClasses.cpp
#	client/battle/CBattleInterfaceClasses.h
#	config/schemas/settings.json
#	lib/CGameInterface.h
#	lib/IGameEventsReceiver.h
#	lib/NetPacks.h
#	lib/NetPacksLib.cpp
#	lib/battle/BattleInfo.cpp
#	server/CGameHandler.cpp
#	server/CQuery.h
 2023-04-06 19:53:52 +04:00
nordsoft ce3028bd73 Intermediate commit 2023-04-06 19:34:07 +04:00
nordsoft b70b4b5c4f Add missing includes 2023-04-02 16:43:32 +04:00
nordsoft 91ef7cbb4f Fix ScopeGuard move behavior 2023-04-02 15:46:56 +04:00
nordsoft d63e32841d Fix divide by zero crash 2023-04-02 15:28:41 +04:00
nordsoft eedd7979aa Allow single player on map and fix player params initialization 2023-04-02 14:31:57 +04:00
nordsoft 1e5362cb07 Fix crash with cutting random town 2023-04-02 14:06:16 +04:00
nordsoft 1451614cf2 Fix erase shortcut 2023-03-06 19:54:13 +04:00
nordsoft cbb3167166 Regression fix 2023-03-05 00:20:47 +04:00
nordsoft f1b348ae87 Suppress warning 2023-02-08 20:09:37 +04:00
nordsoft 06c451c1f5 Fix compiling 2023-02-08 20:09:37 +04:00
nordsoft da8942ccfb Try to fix compilation 2023-02-08 20:09:37 +04:00
nordsoft 44e195c625 Fix compiling according to latest changes 2023-02-08 20:09:37 +04:00
nordsoft fac93bb7d6 Address review comments 2023-02-08 20:09:37 +04:00
nordsoft e0b467e144 Code polishing 2023-02-08 20:09:37 +04:00
nordsoft 447e01aba3 Proper defeat message 2023-02-08 20:09:37 +04:00
nordsoft 5fceb97838 Support few more victory conditions 2023-02-08 20:09:37 +04:00
nordsoft 7f55916a4b Support couple more conditions 2023-02-08 20:09:37 +04:00
nordsoft a3413eefce Some vic/loss conditions for editor 2023-02-08 20:09:37 +04:00
nordsoft 4e21aab76a Continue working on vicloss conditions 2023-02-08 20:09:37 +04:00
nordsoft 4ce68298d1 Starting work on map settings 2023-02-08 20:09:37 +04:00
nordsoft fd6987ea0a Fix alternative actions button redraw 2023-02-05 03:29:50 +04:00
nordsoft c0c1be2645 Fix invalid host connection 2023-01-16 20:58:19 +04:00
nordsoft a2581fb942 Fix crash at start 2023-01-16 20:58:19 +04:00
nordsoft d0b5a023ee Fix bug 2023-01-16 20:58:19 +04:00
nordsoft 1ef9610e30 Remove irrelevant comment 2023-01-16 20:58:19 +04:00
nordsoft da085b0058 Code review tweaks 2023-01-16 20:58:19 +04:00
nordsoft 2cce15efbe Automatic mod conflict resolution 2023-01-16 20:58:19 +04:00
nordsoft a2e358876c Health check fix 2023-01-16 20:58:19 +04:00
nordsoft 14fc1c3f26 Cosmetic changes 2023-01-16 20:58:19 +04:00
nordsoft 8e1d8f835a Implemented support of protocol 4 2023-01-16 20:58:19 +04:00
nordsoft e8845244f7 Fix tactic button 2023-01-03 13:02:54 +04:00
nordsoft 660d25a335 Make control panel configurable 2023-01-03 13:02:54 +04:00
nordsoft 87c47fff1d Business logic of alternative actions 2023-01-03 13:02:54 +04:00
nordsoft 954ea9d5a9 Implement lasso brush 2022-12-28 01:14:10 +04:00
nordsoft e6f459cbe4 Address naming questions 2022-12-27 04:04:09 +04:00
nordsoft 2953b8fe9d Fix android build 2022-12-23 19:12:48 +04:00
nordsoft 339846a307 Add build from beta branch for android 2022-12-23 16:42:32 +04:00
nordsoft 1250f67771 Fix android build 2022-12-23 16:42:32 +04:00
nordsoft 25803b3c3a Disable patch version for releases 2022-12-23 13:26:26 +04:00
nordsoft ad5bf2ac4f Fix msvc build 2022-12-22 02:10:56 +04:00
nordsoft cb76cc54ac Move logging to debug level 2022-12-22 02:08:26 +04:00
nordsoft e245dbaf9d Use kind-of-factory approach for widget builders 2022-12-22 02:05:29 +04:00
nordsoft 8f7025328f Read default template from config, named custom types 2022-12-22 01:37:33 +04:00
nordsoft 7e7071fc95 Merge remote-tracking branch 'upstream/develop' into interface-builder 2022-12-22 01:24:29 +04:00
nordsoft c7f430f051 Added debug lines 2022-12-22 01:13:32 +04:00
nordsoft 521328addd Adding macros for targeted object binding 2022-12-22 00:54:06 +04:00
nordsoft 34b81e8838 Revert VCMIDirs to fix the build 2022-12-21 23:08:53 +04:00
nordsoft 4c15531a05 Fix cmake for macOS build 2022-12-21 23:08:53 +04:00
nordsoft 3a49bc6f8b Fix icons path for macOS if editor started from installed package 2022-12-21 23:03:17 +04:00
nordsoft 4674e240d8 Fix mxe map editor drag'n'drop 2022-12-21 23:02:53 +04:00
nordsoft 12d4204334 Fix closing server on ios 2022-12-19 01:37:38 +04:00
nordsoft dd95d92735 Fix compatibility check 2022-12-17 22:56:33 +04:00
nordsoft d7b0770b71 Remove excessive code 2022-12-17 20:50:33 +04:00
nordsoft 9b76a8000f Making team alignments widget customizable 2022-12-17 20:38:16 +04:00
nordsoft b590e4a0e4 Fixes for multiplyer 2022-12-17 08:38:33 +04:00
nordsoft b1f2c7aed4 Team alignments implemented 2022-12-17 08:19:16 +04:00
nordsoft 4f5fab702e Support roads selection in random map tab 2022-12-17 04:54:37 +04:00
nordsoft d93e844609 Use roads names instead of their filenames 2022-12-17 04:54:01 +04:00
nordsoft 42281f51e8 Revert "Remove uncompleted code" 
This reverts commit 0c41787ca5.
 2022-12-17 03:53:26 +04:00
nordsoft f27a40dd34 Support roads and teams customization in engine 2022-12-17 03:52:40 +04:00