1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-04 09:42:40 +02:00
Commit Graph

7370 Commits

Author SHA1 Message Date
Alexander Shishkin
2c1f3dd742
Merge pull request #523 from nullkiller/fix-buld-boat-for-allied-shipyard
Build boat in allied shipyards is allowed now
2018-11-19 16:39:46 +03:00
Andrii Danylchenko
83531f4355 Rename typo in NetPacksServer.cpp 2018-11-17 21:58:54 +02:00
Andrii Danylchenko
9a36572446 Build boat in allied shipyards is allowed now 2018-11-17 21:58:54 +02:00
Alexander Shishkin
000ca1c823
Merge pull request #520 from nullkiller/freeze-in-gather-troops
AI: GATHER_TROOPS improvements and fixes
2018-11-17 18:46:02 +03:00
Alexander Shishkin
80b2169e0d
Merge pull request #522 from dydzio0614/NewVSFix
Update VS files
2018-11-17 18:44:19 +03:00
Dydzio
c3088e293a Workaround linker bug, set higher optimization by default 2018-11-17 11:34:39 +01:00
Alexander Shishkin
2748650a57
Merge pull request #521 from dydzio0614/BattleMemoryLeak
Fix creature animation callback circular reference
2018-11-15 02:17:20 +03:00
Dydzio
0fd729fd86 Fix creature animation callback circular reference 2018-11-14 23:36:38 +01:00
Andrii Danylchenko
60c5f584a8 AI: GATHER_TROOPS improvements and fixes 2018-11-14 22:10:02 +02:00
AlexVinS
614cde4a55 Fixed two memory leaks 2018-11-14 20:58:37 +03:00
Alexander Shishkin
8e34b1b9a8
Merge pull request #519 from dydzio0614/ObjectRemovalFix
Do not evaluate goals related to removed hero
2018-11-08 05:26:06 +03:00
Dydzio
d5063e53a0 Do not evaluate goals related to removed hero 2018-11-07 21:04:15 +01:00
AlexVinS
5693e72442 fixed crash on quit 2018-11-07 11:11:07 +03:00
AlexVinS
a313cc0127 Fixed https://bugs.vcmi.eu/view.php?id=3017 2018-11-07 10:02:27 +03:00
Alexander Shishkin
ec53f52ca7
Merge pull request #518 from nullkiller/freeze-on-control-own-town-win-condition
AI: fix freeze when AI has a win condition  to control own town
2018-11-07 09:42:25 +03:00
Andrii Danylchenko
9a0b5a0afc AI: fix freeze when AI has a win condition to control own town 2018-11-06 21:45:29 +02:00
Alexander Shishkin
d36f59e1af
Merge pull request #517 from nullkiller/freeze-on-quest-selfkilling
Hero try to execute a quest to kill himself
2018-11-06 03:12:53 +03:00
Andrii Danylchenko
3871ed0085 Hero try to execute a quest to kill himself 2018-11-05 22:24:15 +02:00
Alexander Shishkin
ff75e5e6e8
Merge pull request #516 from nullkiller/freeze-pathfinding
Freeze when try to bypass a few adjacent guards
2018-11-05 10:07:46 +03:00
Andrii Danylchenko
812df63aae Freeze when try to bypass a few adjasent guards 2018-11-04 14:37:29 +02:00
Alexander Shishkin
064130973f
Merge pull request #514 from dydzio0614/HeroAiValueFix
Hero ai value fix
2018-11-03 23:34:03 +03:00
Dydzio
3e6cdb28bc Promote no AI value message to error, shouldn't happen without mods 2018-11-03 13:03:31 +01:00
Dydzio
8ec558a2ae Fix AI value handling for heroes 2018-11-03 12:46:02 +01:00
Alexander Shishkin
2857e60588
Merge pull request #513 from dydzio0614/AiFoWCrash
Allow AI to be aware of invisible heroes deletion
2018-11-03 11:07:38 +03:00
Dydzio
9f3d718e3b Allow AI to be aware of invisible heroes deletion 2018-11-02 16:35:25 +01:00
Alexander Shishkin
845f0fbf5c
Merge pull request #512 from godric3/jsonSchemas
Support for using relative file path in json schema references
2018-11-02 13:07:34 +03:00
Arseniy Shestakov
708705aa96 CGLighthouse: workaround crash on map initialization. Fix issue 3020
Dirty hack here since proper fix would require to break saves
2018-11-01 23:31:23 +03:00
Alexander Shishkin
44e36d4675
Merge pull request #511 from janisozaur/throw-object
Throw std::runtime_exception instead of a pointer to new one
2018-10-31 12:42:04 +03:00
Michał Janiszewski
0ff2e1180d Throw std::runtime_exception instead of a pointer to new one
cf. https://isocpp.org/wiki/faq/exceptions#what-to-throw
2018-10-31 07:27:54 +01:00
Alexander Shishkin
2a282c9a8e
Merge pull request #509 from godric3/bonusDescription
Skill and hero specialty bonus description
2018-10-31 00:59:05 +03:00
Dydzio
90c7daccc5 Fix path (#510) 2018-10-31 00:55:34 +03:00
godric3
8650a8eea8 allow json schema references to use relative file path 2018-10-30 22:30:56 +01:00
godric3
1586868a5d make source id optional in functions converting deprecated specialty bonuses 2018-10-30 20:58:22 +01:00
Alexander Shishkin
e5397c1e23
Merge pull request #504 from janisozaur/shadow-var
Prevent shadowing of global variable in function argument
2018-10-30 06:37:12 +03:00
Alexander Shishkin
3f49b981d5
Merge pull request #503 from janisozaur/include-guards
Add missing include guards
2018-10-30 05:09:16 +03:00
Alexander Shishkin
e26f6ff15f
Merge pull request #505 from janisozaur/catch-by-ref
Catch exceptions by const-ref, not by value
2018-10-30 05:08:30 +03:00
Alexander Shishkin
3d1bb9850b
Merge pull request #506 from janisozaur/shadow-var2
Prevent shadowing of function arguments by local vars
2018-10-30 05:07:40 +03:00
Michał Janiszewski
aa28fc4794 Remove empty branch from LobbyClientConnected::applyOnLobbyScreen (#507)
It was empty ever since introduction in ac66fc7f42

[ci skip]
2018-10-30 04:59:02 +03:00
Alexander Shishkin
a3a38a6120
Merge pull request #502 from vcmi/StatusbarFix
Fix not responding statusbar, issue 3009
2018-10-30 04:56:34 +03:00
godric3
f9ac46576b Add description for bonuses from hero specialty 2018-10-29 21:33:13 +01:00
godric3
c8ba3de821 Change skill bonuses description to use name instead of identifier 2018-10-29 20:53:13 +01:00
Michał Janiszewski
7be9aa4868 Prevent shadowing of function arguments by local vars 2018-10-29 16:56:14 +01:00
Michał Janiszewski
9822a8f2df Catch exceptions by const-ref, not by value 2018-10-29 16:41:54 +01:00
Michał Janiszewski
53d75684ee Prevent shadowing of global variable in function argument 2018-10-29 16:34:03 +01:00
Michał Janiszewski
27953bd758 Add missing include guards 2018-10-29 16:30:50 +01:00
Dydzio
22ce535a2a Fix not responding statusbar 2018-10-29 14:12:07 +01:00
Alexander Shishkin
e814aca29f
Merge pull request #500 from godric3/rmgCrash
Fix crash when generating random map with random number of players
2018-10-29 01:38:10 +03:00
Alexander Shishkin
1753298ee8
Merge pull request #501 from nullkiller/fix-water-tile-pathinfo-lookup
AI pathfinding: fix getPathsToTile for water tiles
2018-10-29 01:36:50 +03:00
Alexander Shishkin
f563712782
fix formatting
Co-Authored-By: godric3 <godric3@users.noreply.github.com>
2018-10-28 16:36:11 +01:00
Andrii Danylchenko
d5b26d9592 AI pathfinding: fix getPathsToTile for water tiles 2018-10-28 15:03:40 +02:00