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
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
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
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
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
DJWarmonger
cae8acc56a
Clearing up the code as requested by FeniksFire
2018-07-19 20:39:37 +02:00
DJWarmonger
3d59420bb5
Minor optimisations. Also, shoter code.
2018-07-19 17:36:10 +02:00
DjWarmonger
f8a9a0af2b
Merge pull request #455 from nullkiller/deadend-exploration-improvement
...
After actually checking this branch, I absolutely approve it. AI advances quickly and steadily, and that's the point.
2018-07-19 16:37:56 +02:00
Dydzio
e4a9ce3efe
Do not create main menu UI for game restart ( #462 )
2018-07-19 00:58:38 +03:00
Alexander Shishkin
84be667363
Merge pull request #463 from dydzio0614/skel_transformer_fix
...
Fix bone/ghost dragon handling in skeleton transformer
2018-07-19 00:03:32 +03:00
Dydzio
301b70ddd8
Fix bone/ghost dragon handling in skeleton transformer
2018-07-18 20:21:19 +02:00
Alexander Shishkin
4d7e2ea441
Merge pull request #461 from dydzio0614/counterattackfix
...
Fix counterattack wrong mechanics (Re-fix bug 2501)
2018-07-18 18:15:21 +03:00
Dydzio
d5d2c65c4b
Fix counterattack wrong mechanics
2018-07-18 15:52:33 +02:00
Alexander Shishkin
9bd662b2f3
Merge pull request #459 from vcmi/issue2969
...
Fix for isuue 2969
2018-07-17 04:28:59 +03:00
Alexander Shishkin
07ae271e91
Merge pull request #460 from dydzio0614/configfix
...
Restore VCMI client saving settings.json
2018-07-17 04:28:21 +03:00
Dydzio
6174df0a72
Revert only launcher saving to settings.json from PR441
2018-07-16 22:05:42 +02:00
AlexVinS
d6f889f08a
Setup town`s war machine in finalization step
...
* fixes https://bugs.vcmi.eu/view.php?id=2969
2018-07-16 15:16:55 +03:00
Alexander Shishkin
51229e88b2
Merge pull request #458 from dydzio0614/VsUpdate
...
Update VS project files to match vcmi code changes
2018-07-06 22:03:28 +03:00
Dydzio
260981d586
Update project files to match vcmi code changes
2018-07-06 18:52:51 +02:00
Andrii Danylchenko
12a3c7ed33
AI - code styles and remove redundant performance optimization for explore
2018-06-24 13:30:17 +03:00
Andrii Danylchenko
2466489e13
AI - improve exploration, cancel deadends
2018-06-21 22:29:26 +03:00
Alexander Shishkin
8798e6e52b
Merge pull request #453 from nullkiller/develop
...
Android build fix
2018-05-26 18:06:44 +03:00
Andrii Danylchenko
eeb700cc7d
try fix CI
2018-05-26 16:19:23 +03:00
Andrii Danylchenko
dcbcff41dc
apply review comments for CAndroidVMHelper
2018-05-26 14:50:49 +03:00
Andrii Danylchenko
ee033e9c9c
fix android build
2018-05-25 22:57:29 +03:00
Andrii Danylchenko
20161a2449
Ignore visual studio 2015 cache folder
2018-05-24 21:11:55 +03:00
ArseniyShestakov
bbe421f9e1
Merge pull request #452 from karliss/sanitizers2
...
Fix memory and other problems found by address and UB sanitizers.
2018-05-01 14:35:52 +07:00
Karlis Senko
224ea28433
Fix various memory errors related to server and connections.
...
* keep connection when restarting scenario
* wrong double free in Connection
* multiple use after free when stopping server
* double free of StartInfo
2018-05-01 00:04:20 +03:00
Karlis Senko
69330de89c
Avoid integer overflow and conversion related UB.
2018-05-01 00:02:07 +03:00
Karlis Senko
40e6292ed2
Fix memory leaks in launcher.
2018-05-01 00:01:20 +03:00
Karlis Senko
7fb7ceaad7
Prevent out of bounds array access.
2018-04-30 23:59:36 +03:00
ArseniyShestakov
6f6f399911
Merge pull request #451 from josch/develop
...
Remove compilation warnings
2018-04-27 17:29:15 +07:00
Karlis Senko
965b33d16a
Server: add GAMEPLAY_STARTING state ( #450 )
...
Fixes issue 2962.
2018-04-23 00:26:40 +07:00
Johannes 'josch' Schauer
5d487c09fe
client/CPlayerInterface.cpp: initialize observerInDuelMode
2018-04-19 16:13:19 +02:00
Johannes 'josch' Schauer
337f22195c
client/CPlayerInterface.cpp: remove unused variable
2018-04-19 15:26:39 +02:00
Johannes 'josch' Schauer
ed5df13e50
client/battle/CBattleInterface.cpp: uncomment unused variable until soundh->playSound() is implemented
2018-04-19 15:20:26 +02:00
Johannes 'josch' Schauer
a0be483525
server/CVCMIServer.cpp: remove variable that was only set but never used
2018-04-19 15:18:08 +02:00
Johannes 'josch' Schauer
a54e8c88a9
AI/VCAI/VCAI.cpp: Remove unused variable introduced in 2014
2018-04-19 15:15:22 +02:00
