1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Commit Graph

1415 Commits

Author SHA1 Message Date
f9767a3179 Initial implementation for rewardable town building 2023-05-01 00:14:53 +04:00
2adcc89a0d Rewardable town buildings prototype 2023-05-01 00:14:53 +04:00
cc4277748d Fix movement bonus subtype 2023-05-01 00:14:53 +04:00
67e6920e23 Implement markets 2023-05-01 00:14:53 +04:00
30967b2813 Remove excess pointer from market interface 2023-05-01 00:14:53 +04:00
1b4d117790 deeper decoupling 2023-04-30 17:13:07 +04:00
86f5d6de69 vcmi: modernize headers 2023-04-30 13:35:54 +03:00
ac8f390cf8 Dividing rewarbadle objects into separate files 2023-04-30 04:39:31 +04:00
67bfacfcf7 Create of rewardable interface 2023-04-30 03:15:59 +04:00
c39a9cac63 Minor changes 2023-04-30 01:43:02 +04:00
e47bb3f1f9 Separate configuration and object 2023-04-30 00:59:02 +04:00
d985ac90d3 Merge master -> develop 2023-04-28 22:57:25 +03:00
3dde827a9d Merge pull request #2070 from rilian-la-te/make-tests-compile-pass-h3
vcmi: fix test compiling and passing
2023-04-28 22:18:00 +03:00
f6d91cab35 Fix portrait serialization
# Conflicts:
#	lib/mapObjects/CGHeroInstance.cpp
2023-04-28 05:34:59 +04:00
421bbab1cc Split CGTownInstance file 2023-04-28 05:30:49 +04:00
54e4db3819 vcmi: fix abandoned mine resource loading
It was overshadowed by local variable
2023-04-27 20:59:55 +03:00
fb739e7186 Merge beta -> develop 2023-04-26 22:48:08 +03:00
f39f208e05 Merge pull request #1915 from Nordsoft91/vcmi-campaign
VCMI campaigns format
2023-04-23 19:09:59 +04:00
a553a4aa66 Merge pull request #2030 from Nordsoft91/boats 2023-04-22 03:27:00 +04:00
de159df481 Rename boats 2023-04-20 21:20:51 +04:00
9ecf16ca23 Fix minor bugs 2023-04-20 03:20:00 +04:00
5a5aced67e Fixed empty Black Market on game start 2023-04-19 23:11:17 +03:00
4bb4d7e7a5 Merge pull request #1989 from SoundSSGood/refactoring-arts-p1
Artifact related code refactoring part1 (initial)
2023-04-19 15:31:11 +03:00
505a78a638 Merge pull request #2035 from rilian-la-te/native-fix-beta
vcmi: fix terrain penalties
2023-04-19 13:39:54 +03:00
d94ce22e70 vcmi: fix terrain penalties
Fixes #2028
2023-04-19 12:41:54 +03:00
0a28262c15 Merge remote-tracking branch 'upstream/develop' into boats
# Conflicts:
#	AI/VCAI/Pathfinding/AINodeStorage.cpp
2023-04-19 02:22:19 +04:00
008db447e7 Minor changes 2023-04-19 02:11:24 +04:00
22da7a931d Boat as bonus system node 2023-04-19 01:11:51 +04:00
d1dacd45e2 Animations from config 2023-04-19 00:14:15 +04:00
ddcdfb643a Try to enable air/land movement 2023-04-18 17:36:42 +04:00
d83566bc74 Add constructor for boat 2023-04-18 17:27:39 +04:00
ed798b06da Prepare transport enum 2023-04-18 13:04:49 +04:00
7a5775a9f9 vcmi: use std::optional 2023-04-17 00:43:13 +03:00
87647cd02a Do not propose banned skills in witch huts 2023-04-15 17:20:38 +03:00
ea8aeef8c0 Implemeted parsing of HotA Seer Huts 2023-04-15 17:20:38 +03:00
f93335d678 Cleanup and formatting of H3M loader code 2023-04-15 17:20:38 +03:00
3738171b21 Refactoring of H3M loader to make HotA format support easier
- extracted low-level reader from MapFormatH3M class
- added separate structure to define version-specific values
- cleared up some H3M format edge cases
- replaced witch hut skill vector with set
- converted several fields to enum type
2023-04-15 17:20:38 +03:00
9a838598a6 arts refactoring part1 2023-04-15 00:10:39 +03:00
b354f99cc3 Merge pull request #1936 from IvanSavenko/cpp_17_upgrade
Upgrade c++ standard to c++17
2023-04-14 19:21:17 +03:00
44b83b2e11 Merge master -> develop 2023-04-14 16:51:35 +03:00
35ac4d88ac Fix Seer Hut right-click text 2023-04-13 19:06:44 +03:00
506c3d29bc Replaced vstd clamp with std version 2023-04-12 01:03:14 +03:00
dfa2e2a349 Merge beta into develop 2023-04-11 19:37:35 +03:00
ff66592fad Merge pull request #1882 from rilian-la-te/native-terrain-refactor
Native terrain refactor
2023-04-11 02:14:37 +03:00
4bd3cc1679 Update lib/mapObjects/ObjectTemplate.h
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2023-04-10 20:45:41 +02:00
3c87b3934d Do not place object visible tiles over the top of the map. 2023-04-10 19:26:53 +02:00
9371f013e9 Rename outer caster 2023-04-10 20:56:50 +04:00
4da97682be vcmi: remove code duplication for native terrain 2023-04-10 19:28:17 +03:00
fedf7d377c vcmi: remove TFaction
This is a huge change and will break save compatibility
2023-04-10 19:28:16 +03:00
7326980bd4 vcmi: rename WithXXX to IXXXProvider 2023-04-10 19:28:16 +03:00