AlexVinS
bd23c7d909
[c::b] Updated projects
2018-08-05 06:45:07 +03:00
Aleksei Iupinov
7ed318d156
Stop awarding single scenario bonuses in campaigns
2018-08-05 05:42:54 +03:00
DJWarmonger
580fed34bb
Updated CMakeLists.txt
2018-08-04 22:00:28 +02:00
DJWarmonger
f5ba181173
Refactoring: Move SectorMap to separate file
2018-08-04 21:59:30 +02:00
DjWarmonger
f2db64af94
Merge pull request #471 from vcmi/BuildingManager
...
Building manager
2018-08-04 21:07:40 +02:00
DjWarmonger
cde2d73982
Merge pull request #473 from dydzio0614/vspatch
...
Update VCAI VS file
2018-08-04 16:25:14 +02:00
DJWarmonger
976eeb3578
Sweet Jesus
2018-08-04 16:22:24 +02:00
DJWarmonger
4a85559d4b
Merge branch 'develop' of https://github.com/vcmi/vcmi into BuildingManager
...
# Conflicts:
# AI/VCAI/CMakeLists.txt
2018-08-04 16:09:02 +02:00
DJWarmonger
6615870045
Rebase
2018-08-04 15:59:59 +02:00
Dydzio
8a862347c4
Update VCAI VS file
2018-08-04 15:45:22 +02:00
DjWarmonger
b0e1b8c5ec
Merge pull request #465 from vcmi/AIMapObjectEvaluation
...
Okay let's see where this gets us.
2018-08-04 15:07:08 +02:00
DJWarmonger
aa9c6d3716
Cleanup
2018-08-04 13:18:05 +02:00
DJWarmonger
9e34ef5534
AI will not try to sell reserved resources.
2018-08-04 11:51:19 +02:00
DJWarmonger
2aa0a6fe2f
More fixes for trading. Seems to work now.
2018-08-04 10:20:40 +02:00
DJWarmonger
a5ca32ad38
Some checks and log for CollectRes goal.
2018-08-04 09:24:43 +02:00
DjWarmonger
eddaedd13e
Merge pull request #469 from nullkiller/ai-fix-movement-for-blockvis
...
AI: unexpected error in AI logic when take resource on adjasent tile
2018-08-02 17:57:31 +02:00
Andrii Danylchenko
4141e8e7b0
[2982] AI: unexpected error in AI logic when take resource on adjasent tile
2018-08-01 21:49:15 +03:00
Dydzio
22b02ecc78
Use boost::optional "better way"
2018-07-30 15:32:55 +02:00
Dydzio
0786bd915a
remove C++17 insert_or_assign usage
2018-07-30 14:07:39 +02:00
Dydzio
123ca6c417
Update CMakeLists.txt
2018-07-30 01:39:47 +02:00
Dydzio
2288e9b8aa
Merge branch 'develop' into AIMapObjectEvaluation
2018-07-30 01:33:49 +02:00
Dydzio
3e31e67653
Initial AI value labeling for map objects
2018-07-30 01:27:02 +02:00
AlexVinS
ac293fb592
Disabled tests build until linking of tests broken by #467 merge will be fixed
2018-07-29 23:38:43 +03:00
AlexVinS
f17783cfb5
[c::b] Updated projects, applied fixes
2018-07-29 22:07:40 +03:00
Dydzio
393b25eb7f
Minor tweaks/fixes
2018-07-29 19:31:01 +02:00
DjWarmonger
3579651b3c
Merge pull request #467 from vcmi/ResourceManager2
...
Okay let's get this done and move forward.
2018-07-29 17:37:50 +02:00
Dydzio
f906d98fe5
Bugfix...
2018-07-29 16:02:18 +02:00
DJWarmonger
30f99e7cc1
Fix for Travis
2018-07-28 16:02:59 +02:00
DJWarmonger
5cd366dca3
Compile fix
2018-07-28 14:14:24 +02:00
Dydzio
d3e53bea2f
Add aiValue handling for MapObjectsEvaluator
2018-07-28 12:58:18 +02:00
DJWarmonger
70549197b6
Naah, revert my changes.
2018-07-28 09:08:53 +02:00
DJWarmonger
e7cb8d7d17
Fixed GetObj (TRADING_POST) incorrectly set to elementar.
2018-07-28 06:47:37 +02:00
Dydzio
b37ba8e046
Initial version of AI object value config
2018-07-28 00:43:56 +02:00
DJWarmonger
a8696a9957
formatting
2018-07-27 09:22:07 +02:00
DJWarmonger
6abebeeb9f
Fixed non-const reference issue.
2018-07-27 08:10:21 +02:00
DJWarmonger
ea19716fb9
Fix for wander - AI sitting at town will buy troops.
2018-07-27 07:20:08 +02:00
DJWarmonger
301565b315
Updated CMake
2018-07-27 06:44:10 +02:00
Dydzio
df00ced204
Create fuzzy logic map object evaluation fundamentals
2018-07-27 02:28:12 +02:00
Dydzio
27541a72f5
Extract FuzzyHelper distance calculation
2018-07-27 02:21:51 +02:00
DJWarmonger
feb3459bd7
Oops restore.
2018-07-26 21:34:52 +02:00
DJWarmonger
5ce4e784c9
Final tweaks. Not going to add anything more to this PR.
2018-07-26 18:02:15 +02:00
Dydzio
615df6203d
Oprator overload correction...
2018-07-26 16:43:40 +02:00
DJWarmonger
e5b979d4ad
- ResourceManager now returns abstract goal so it can be decomposed many times
2018-07-26 16:15:37 +02:00
DJWarmonger
1450d408a2
Wandering heroes may now travel to town even if it has no army in garrison.
2018-07-26 14:37:39 +02:00
DJWarmonger
b687688f5a
Do not add duplicate objectives to GatherArmy pool (or any other, if it ever exist)
2018-07-26 13:29:46 +02:00
DJWarmonger
273802c92c
I have no idea what I'm doing
2018-07-26 12:14:29 +02:00
Alexander Shishkin
75f8c8b29a
Gui cleanup4 ( #446 )
...
* use smart pointers for almost all widget fields
* use SDL2 texture for cursor
* a lot af small tweaks and formatting
* removed CompImage class, it is actually useless as long as regular SDLImage support margins
* CGuiHandler: use smart pointers for [push|pop]Int
2018-07-25 01:36:48 +03:00
DjWarmonger
7c8b74a806
Merge pull request #466 from dydzio0614/AiDoc
...
Add code comments for VCAI::makeTurnInternal
2018-07-24 16:06:22 +02:00
Dydzio
b6a171f858
Add code comments for VCAI::makeTurnInternal
2018-07-23 20:48:38 +02:00
Dydzio
13cca972d6
Add visual studio file changes in advance
2018-07-23 19:47:07 +02:00