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
Johannes 'josch' Schauer
8ead3e3b91
lib/CGeneralTextHandler.cpp: fix misleading indentation
2018-04-19 15:12:18 +02:00
Johannes 'josch' Schauer
95bec98936
lib/rmg/CRmgTemplateZone.cpp: Remove a variable that was introduced in 2016 but never used
2018-04-19 15:07:21 +02:00
Johannes 'josch' Schauer
56fefca806
lib/rmg/CRmgTemplateZone.cpp: Add parenthesis to make operator precedence unambiguous
2018-04-19 15:06:26 +02:00
godric3
d9d01f0b68
Exposed more of existing limiters for modders ( #449 )
...
* Exposed alignment, faction and terrain limiters
* Limiters toString() use now boost:format
2018-04-17 19:59:30 +07:00
karliss
ad2c429d8f
CMake: unittest improvements ( #447 )
...
* Convert TestConfig to proper test environment.
* Copy test data to build directory.
* Get test recognized by ctest, but disable gtest discovery. Allowing ctest to run each test individually isn't currently practical because it is 50 times slower.
2018-04-15 18:02:31 +07:00
Arseniy Shestakov
9da3f48274
Code style: formatting and refactoring of launcher code
2018-04-13 15:23:35 +07:00
AlexVinS
d9d5b7b6e5
[c::b] update projects
2018-04-08 18:37:54 +03:00
Arseniy Shestakov
25dea1a599
Code style: formatting and refactoring of VCAI code
2018-04-08 17:43:20 +07:00
Henning Koehler
2ede3783dd
Settings: savefrequency is now configurable in launcher
...
* Client command-line can modify arbitrary settings now
* Only launcher auto-saves to settings.json
2018-04-08 17:12:29 +07:00
karliss
ce0b4b222d
Fix double free and use of dead reference when saving ( #445 )
2018-04-07 22:21:28 +07:00
Arseniy Shestakov
4af288aee4
Refactoring of main menu related code
...
We need to make sure it's not stay active during gameplay.
Proper fix would require actually removing menu interface from GH, but then GH needs refactoring too.
2018-04-07 18:44:21 +07:00
Alexander Shishkin
5c09f751b3
Gui cleanup3 - UI refactoring to use smart pointers ( #440 )
...
* Changed most gui classes to use shared pointers
* Store and use IImage as shared_ptr
* CSpellWindow redesign
* AdventureMapClasses cleanup
* CLabel: store background as smart pointer
* Store CObjectList items as smart pointers
* Removed destroy function of list item
* Store toggle buttons as smart pointers
* Use CComponent as smart pointer
* Attempt to fix artifact merchant drawing
2018-04-07 18:34:11 +07:00