|
|
35a505288b
|
Fix json value reader
|
2023-05-01 21:49:37 +04:00 |
|
|
|
59bc9326e9
|
Remove excess pointer from market interface
|
2023-05-01 21:49:37 +04:00 |
|
|
|
a654cc2391
|
Removed vstd::advance. Added vstd::next to handle similar cases.
|
2023-05-01 17:58:18 +03:00 |
|
|
|
4aa232a60a
|
Merge pull request #2055 from SoundSSGood/cartifactholder-rework
Artifact related code refactoring part2 (client CArtifactHolder)
|
2023-05-01 02:33:08 +03:00 |
|
|
|
203d0a4f91
|
Merge remote-tracking branch 'upstream/develop' into rewardable-expand
# Conflicts:
# lib/JsonRandom.cpp
|
2023-05-01 02:07:20 +04:00 |
|
|
|
d2e0d6a754
|
Fix none-Of operator for skills
|
2023-05-01 01:35:01 +04:00 |
|
|
|
c7ade44d07
|
Fix skills loading from mods
|
2023-05-01 01:35:01 +04:00 |
|
|
|
6fc3bb6690
|
Attempt to fix msvs build 1
|
2023-05-01 01:15:48 +04:00 |
|
|
|
e9279cfbc4
|
Blocking dialogs supported
|
2023-05-01 00:14:53 +04:00 |
|
|
|
c4242c16ad
|
Compiling code
|
2023-05-01 00:14:53 +04:00 |
|
|
|
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 |
|
|
|
3df0ce229e
|
get rid of building id
|
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 |
|
|
|
dfb078a4d9
|
Fix json value reader
|
2023-05-01 00:14:53 +04:00 |
|
|
|
30967b2813
|
Remove excess pointer from market interface
|
2023-05-01 00:14:53 +04:00 |
|
|
|
5bdd6c5cf5
|
Fix compiling
|
2023-04-30 22:36:25 +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 |
|
|
|
d325051213
|
Some working version, needs corrections still.
|
2023-04-29 11:46:03 +02:00 |
|
|
|
d985ac90d3
|
Merge master -> develop
|
2023-04-28 22:57:25 +03:00 |
|
|
|
346b8a4619
|
Merge pull request #2079 from rilian-la-te/cstack-some-private
vcmi: make some CStack properties private
|
2023-04-28 22:18:20 +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 |
|
|
|
93362eb692
|
Merge pull request #2083 from IvanSavenko/artifact_fix
Fix list of treasures getting overwritten
|
2023-04-28 15:41:38 +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 |
|
|
|
881c434833
|
Fix list of treasures getting overwriteen leading to weird bugs
... such as having Grail in crypts or getting relics as starting
artifact
|
2023-04-27 23:40:56 +03:00 |
|
|
|
54e4db3819
|
vcmi: fix abandoned mine resource loading
It was overshadowed by local variable
|
2023-04-27 20:59:55 +03:00 |
|
|
|
e5f78a8997
|
vcmi: fix tests with latest develop
|
2023-04-27 20:59:55 +03:00 |
|
|
|
c400e83874
|
vcmi: fixup cast in Heal effect
|
2023-04-27 20:59:55 +03:00 |
|
|
|
bcf8ca1268
|
vcmi: fix map format for teams number
|
2023-04-27 20:59:55 +03:00 |
|
|
|
b472c89276
|
vcmi: make some CStack properties private
There is a getters for this properties already available
|
2023-04-27 20:58:49 +03:00 |
|
|
|
fb739e7186
|
Merge beta -> develop
|
2023-04-26 22:48:08 +03:00 |
|
|
|
1bb5077231
|
Renamed getMovementRange to ObtainMovementRange as per request
|
2023-04-26 21:56:20 +04:00 |
|
|
|
e348193f7e
|
Tactics movement is limited to movement range
|
2023-04-26 21:56:20 +04:00 |
|
|
|
c899956e71
|
Fix boat visibility
|
2023-04-26 02:58:11 +04:00 |
|
|
|
3c9599657b
|
Use new artifact interface
|
2023-04-25 16:20:36 +02:00 |
|
|
|
208adf1dd6
|
Don't use boost::format
|
2023-04-25 16:14:09 +02:00 |
|
|
|
48abf46824
|
Merge pull request #2005 from IvanSavenko/advmap_refactor
Refactoring of adventure map interface
|
2023-04-24 17:19:22 +03:00 |
|
|
|
f39f208e05
|
Merge pull request #1915 from Nordsoft91/vcmi-campaign
VCMI campaigns format
|
2023-04-23 19:09:59 +04:00 |
|
|
|
1f4897e841
|
CArtifactSet::getSlotByInstance
|
2023-04-23 14:48:04 +03:00 |
|
|
|
a9a3c456f1
|
Add new files
|
2023-04-23 10:12:53 +02:00 |
|
|
|
bc4d6bb7ee
|
Remove unused code.
|
2023-04-23 10:08:30 +02:00 |
|
|
|
80b5c53815
|
Place quest artifacts after all the treasures are already created.
|
2023-04-23 10:08:16 +02:00 |
|
|
|
1fde8b588b
|
Merge pull request #2025 from vcmi/zone_placement2
No interest or objections - merging.
|
2023-04-22 14:45:53 +02:00 |
|
