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,849 Commits 30 Branches 75 Tags
3951bbb39503781f08965a149789f13e69bb1228
Commit Graph
10849 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nordsoft91andGitHub 3951bbb395 Merge pull request #1108 from Nordsoft91/battle-dialog 
[HDMod features] Quick combat
 2023-04-11 21:18:04 +04:00
KonstantinandNordsoft91 9db2e2068e vcmi: fixup crash 2023-04-11 21:17:31 +04:00
Ivan Savenko dfa2e2a349 Merge beta into develop 2023-04-11 19:37:35 +03: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
DjWarmongerandGitHub d9a2621231 Merge pull request #1939 from vcmi/fix_top_of_map_objects 
Merging after positive review.
 2023-04-11 10:40:18 +02:00
Ivan SavenkoandGitHub c9e9d93b60 Merge pull request #1937 from Nordsoft91/launcher-layout 
[1.2] Adjustable layout for launcher
 2023-04-11 11:12:15 +03:00
Ivan SavenkoandGitHub 7d92ef5f86 Merge pull request #1909 from vcmi/avoid-freeze-on-siege-selfblocking 
BattleAI: avoid selfblocking on siege
 2023-04-11 11:11:05 +03:00
Ivan SavenkoandGitHub ef103290fa Merge pull request #1938 from rilian-la-te/fix-orb-of-vulnerability 
config: Orb of Vulnerability should block all resistances from work (Resistance skill, dwarves, unicorns and so on.
 2023-04-11 11:10:33 +03:00
Ivan SavenkoandGitHub 7fcd750d0f Merge pull request #1904 from vcmi/fix_pandora_amounts 
Fix pandora amounts
 2023-04-11 11:10:05 +03:00
Ivan SavenkoandGitHub e25cd7f90f Merge pull request #1934 from IvanSavenko/beta_fixes 
Fixed bugs for 1.2 release
 2023-04-11 11:08:40 +03:00
Ivan SavenkoandGitHub ff66592fad Merge pull request #1882 from rilian-la-te/native-terrain-refactor 
Native terrain refactor
 2023-04-11 02:14:37 +03:00
nordsoft bfc75ccd39 Merge remote-tracking branch 'upstream/develop' into battle-dialog 2023-04-11 02:22:42 +04:00
Konstantin b82374c4a9 config: Orb of Vulnerability should block all resistances 
Just set MAGIC_RESISTANCE and SPELL_RESISTANCE_AURA to 0
by INDEPENDENT_MIN, will work.
 2023-04-10 22:07:22 +03:00
Nordsoft91andGitHub ebd17c9e4a Merge pull request #1928 from Nordsoft91/cast-reward 
Spell cast reward
 2023-04-10 22:49:36 +04:00
DjWarmongerGitHubNordsoft91
 		4bd3cc1679 Update lib/mapObjects/ObjectTemplate.h 
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
 2023-04-10 20:45:41 +02:00
Tomasz Zieliński 3c87b3934d Do not place object visible tiles over the top of the map. 2023-04-10 19:26:53 +02: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
Konstantin 4da97682be vcmi: remove code duplication for native terrain 2023-04-10 19:28:17 +03:00
Konstantin 7b9e281f7d vcmi: bump serialization version 2023-04-10 19:28:16 +03:00
Konstantin fedf7d377c vcmi: remove TFaction 
This is a huge change and will break save compatibility
 2023-04-10 19:28:16 +03:00
Konstantin 452cebfdfd CPropagatorNodeType: replace default constructor 
Parameter constructor did the same
 2023-04-10 19:28:16 +03:00
Konstantin 09cbec7c75 HeroBonus: remove StackOwnerLimiter 
It seems not to be used anywhere
 2023-04-10 19:28:16 +03:00
Konstantin dd196f2aa8 vcmi: slightly rework limiters 
1. Add vector to aggregates
2. Rework CreatureFactionLimiter to FactionLimiter
 2023-04-10 19:28:16 +03:00
Konstantin 7326980bd4 vcmi: rename WithXXX to IXXXProvider 2023-04-10 19:28:16 +03:00
Konstantin bb1a5d9521 vcmi: remove configurable limiters from map 
This limiters should be always initialized with parameters.
Add CREATURES_ONLY limiter to limit bonuses only to creatures
(no heroes).
 2023-04-10 19:28:16 +03:00
Konstantin f8eba58003 vcmi: remove ALL_CREATURES propagator 
Now unneded, because it handled by GLOBAL_EFFECT with
CREATURE_LEVEL_LIMITER (when range set to UINT_MIN and UINT_MAX).
 2023-04-10 19:28:16 +03:00
Konstantin 9f8dcfc736 CCreatureHandler: load old stack exp as global effects 
It is more robust and more logical.
 2023-04-10 19:28:16 +03:00
Konstantin 0f5f4c69ec vcmi: specialize native terrain entity 
Specialize native terrain entity for all object that have
native terrain. Allow creatures to take global bonuses into
account when checking for native terrain.
 2023-04-10 19:28:16 +03:00
Konstantin 6d9859932b vcmi: add native terrain entity 
Add interface which should be used on any object with native terrain

So far, it is faction, hero, creature and battle stack
 2023-04-10 19:28:16 +03:00
Konstantin 1760d2295c HeroBonus: add CreatureLevelLimiter 2023-04-10 19:28:16 +03:00
Konstantin 01f5571342 CGHeroInstance: remove old struct 
Saves where struct is used is incompatible anyway
 2023-04-10 19:28:16 +03:00
Ivan SavenkoandGitHub 2d332f5ce8 Merge pull request #1916 from rilian-la-te/constexpr-id 
vcmi: constexpr IDs
 2023-04-10 18:28:45 +03:00
Ivan SavenkoandGitHub 9ea746a68c Merge pull request #1935 from rilian-la-te/fix-spell-display 
Fix spell display
 2023-04-10 18:28:23 +03:00
Ivan SavenkoandGitHub 42b2be4bbb Merge pull request #1908 from SoundSSGood/art-client-server-fixes 
Artifact related fixes
 2023-04-10 18:26:49 +03:00
MichaelandGitHub 94d339ca22 Android Launcher - Language (#1914) 
* codepage -> language

* Update strings.xml

* change mod repo on android
 2023-04-10 18:24:15 +03:00
nordsoft b9cabef179 Fixes issues related to spell mechanics 2023-04-10 17:08:24 +04:00
Konstantin 2eaecfd1ae ObstacleCasterProxy: beta branch 2023-04-10 15:41:58 +03:00
Konstantin 4f3c826196 vcmi: manaLimit should be spellcaster property 2023-04-10 15:35:21 +03:00
Konstantin 40bea35a26 CHeroWindow: fix picked art mana limit display 2023-04-10 15:35:21 +03:00
Ivan Savenko 07230f3b47 Attempt to fix stack splitting on macos 2023-04-10 14:34:17 +03:00
Ivan Savenko 5046f916d6 Fix filtering of objects by terrain in editor 2023-04-10 14:33:53 +03:00
Ivan Savenko 02c9a3f3d8 Correctly reset UI on aborting Clone/Sacrifice 2023-04-10 14:33:24 +03: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