games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity
7,662 Commits 19 Branches 62 Tags 112 MiB
8f331dce31
Commit Graph

7662 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Orlov
8f331dce31 Feature: Lodestar Grail should work. 2020-12-10 04:05:37 +03:00
Alexander Shishkin
eb011e59c4
Merge pull request #663 from Baltix/patch-1 
Disable tests to fix building deb packages
 2020-11-12 15:41:04 +03:00
Mantas Kriaučiūnas
7daff67e03
Disable tests to fix building deb packages 
See commit 84fc8770e9
 2020-11-12 13:59:06 +02:00
Alexander Shishkin
1f0f58a111
Merge pull request #662 from ShubusCorporation/do_fix_morale 
Fix: Morale bonus should be shown correctly
 2020-11-12 03:20:16 +03:00
Dmitry Orlov
39de2f6435 Fix: Morale bonus should be shown correctly 2020-11-11 22:43:40 +03:00
Alexander Shishkin
9ca9c809c6
Merge pull request #660 from ShubusCorporation/shc_rmg_issue 
Mod system improvement: Patch 2
 2020-10-26 09:26:14 +03:00
Alexander Shishkin
dfeb801425
Merge pull request #661 from jambolo/bug/fix-0003154 
Fixed potential race condition
 2020-10-26 01:02:59 +03:00
John Bolton
bb58d349cb Fixed potential race condition 2020-10-24 23:38:39 -07:00
Dmitry Orlov
d6a4767865 Mod system improvement: Patch 2 2020-10-25 01:04:34 +03:00
Dmitry Orlov
3cb0dfb143 Fix: RMG issues: 1) hota 2) assertions 2020-10-25 01:03:32 +03:00
Alexander Shishkin
c0a5d1ccf0
Merge pull request #659 from ShubusCorporation/shc_special_buildings_2 
Mod system improvement: Special buildings should work in modders towns. Part II.
 2020-10-20 17:29:15 +03:00
Dmitry Orlov
b25baf66be Fix level up crashes: 1) Crash on double level up. 2) Crash on custom class level up. 2020-10-19 22:39:57 +03:00
Dmitry Orlov
643cc00db6 Mod system improvement: Special buildings should work in the modders towns. Part II 2020-10-19 22:38:06 +03:00
Alexander Shishkin
ff7fd2077a
Merge pull request #658 from ShubusCorporation/shc_test_centered 
Fix: Issue #3151 - text centralization
 2020-10-16 08:33:37 +03:00
Alexander Shishkin
830b3f1dc7
Merge pull request #657 from ShubusCorporation/shc_special_buildings_I_patch 
Special buildings support : Patch 1
 2020-10-16 06:20:43 +03:00
Dmitry Orlov
e7665ba5de Fix: Issue #3151 - text centralization 2020-10-16 06:08:59 +03:00
Dmitry Orlov
934c4e511d Special buildings support : Patch 1 2020-10-15 15:03:01 +03:00
Alexander Shishkin
12a4cee092
Merge pull request #652 from ShubusCorporation/shc_special_buildings_support 
Mod system improvement Part I : Special buildings should work in  modders towns
 2020-10-12 00:19:18 +03:00
Dmitry Orlov
195fb8ff41 Mod system improvement Part I : Fix content losing after deserialization 2020-10-10 00:31:23 +03:00
Dmitry Orlov
bf07cd0ad9 Mod system improvement Part I : Old saves support & MSVS build fix 2020-10-07 15:12:32 +03:00
Dmitry Orlov
6a7296fbe9 Mod system improvement Part I : Fix redefined content handler assertion 2020-10-07 12:35:12 +03:00
Dmitry Orlov
f4816b0824 Mod system improvement Part I : Special buildings should work in the modders towns 2020-10-07 12:35:11 +03:00
Alexander Shishkin
124b2a7613
Merge pull request #655 from jambolo/bug/fix-0003143 
Fixed lots of warnings.
 2020-10-06 11:44:54 +03:00
John Bolton
c61bae4060 Fixed RETURN_IF_BATTLE(). Undid disabled warnings. Fixed indentation. 2020-10-05 16:28:28 -07:00
John Bolton
aee51ecc27
Update lib/CCreatureHandler.cpp 
Undid change to type.

Co-authored-by: Alexander Shishkin <alexvins@users.noreply.github.com>
 2020-10-05 16:15:52 -07:00
John Bolton
1722d15276
Update client/windows/CCreatureWindow.h 
Removed leftover debugging code.

Co-authored-by: Alexander Shishkin <alexvins@users.noreply.github.com>
 2020-10-05 16:13:13 -07:00
Alexander Shishkin
4a5070d5ea
Merge pull request #656 from xtouqh/fbsd1 
FreeBSD: need libexecinfo for backtrace()
 2020-10-05 22:56:53 +03:00
xtouqh
0095db4a30 FreeBSD: need libexecinfo for backtrace() 2020-10-05 17:57:31 +03:00
John Bolton
d7e82c1087 Fixed a bad fix. Fixed more warnings. 
These warnings have not been fixed because the are legitimate and/or I don't know how to fix them:

test\googletest\googletest\include\gtest/gtest-printers.h(888,43): warning C4996: 'std::tr1': warning STL4002: The non-Standard std::tr1 namespace and TR1-only machinery are deprecated and will be REMOVED.
lib\serializer\JsonSerializeFormat.h(523,26): warning C4244: 'argument': conversion from 'type1' to 'type2', possible loss of data
include\boost/iostreams/positioning.hpp(96,15): warning C4996: 'std::fpos<_Mbstatet>::seekpos': warning STL4019: The member std::fpos::seekpos() is non-Standard, ...
source\lib\filesystem\FileStream.h(39,69): warning C4910: 'boost::iostreams::stream<FileBuf,std::char_traits<char>,std::allocator<char>>': '__declspec(dllexport)' and 'extern' are incompatible on an explicit instantiation
include\boost/optional/optional.hpp(274,53): warning C4244: 'argument': conversion from 'T' to 'T', possible loss of data
client\widgets\../gui/SDL_Extensions.h(112,14): warning C4244: 'initializing': conversion from 'type1' to 'type2', possible loss of data
client\CServerHandler.cpp(421,24): warning C4834: discarding return value of function with 'nodiscard' attribute (see https://bugs.vcmi.eu/view.php?id=3144)
client\CVideoHandler.cpp(130,25): warning C4996: 'AVStream::codec': was declared deprecated
 2020-10-04 16:26:45 -07:00
John Bolton
a05ae78e67 Fixed lots of warnings. 
Disabled the following (for MSVC only) that couldn't (or shouldn't) be fixed.

4003: not enough actual parameters for macro 'identifier'
4250: 'class1' : inherits 'class2::member' via dominance
4251: 'type' : class 'type1' needs to have dll-interface to be used by clients of class 'type2'
4275: non dll-interface class 'type1' used as base for dll-interface class 'type2'
 2020-10-04 02:20:18 -07:00
elk aide
ff471af3de Add rules to fix debian build 2020-10-03 01:25:52 +03:00
Alexander Shishkin
0d0f1cea2b
Merge pull request #653 from jambolo/bug/fix_0003142 
Fixed incorrect usage of const std::shared_ptr. Resolves 0003142.
 2020-10-01 11:59:26 +03:00
John Bolton
6d8f1e4530 Fixed incorrect usage of const std::shared_ptr. Resolves 0003142. 
Replaced const TBonusListPtr with TConstBonusListPtr where necessary
Replaced const std::shared_ptr<T> with std::shared_ptr<const T> where necessary.
Removed superfluous use of const.
Replaced const std::shared_ptr<T> with const std::shared_ptr<T> & in function parameters and ranged for-loops.
 2020-09-30 22:56:28 -07:00
Alexander Shishkin
a54626459d
Merge pull request #651 from snizovtsev/develop 
lib: fix CPathfinder build error on GCC 10.2
 2020-09-30 16:53:20 +03:00
Sergey Nizovtsev
c7f76e8e0f lib: fix CPathfinder build error on GCC 10.2 
CPathfinder constructs boost::fibbonacci_heap handle manually using
private primitives. This stopped working with newer GCC and boost.
Replace this with proper handle_type from container's public typedef.
 2020-09-30 00:28:07 +03:00
Alexander Shishkin
1161967e34
Merge pull request #650 from ShubusCorporation/shc_fix_mana_vortex 
Minor fix: Apply Monday bonuses to heroes who have slept overnight
 2020-09-28 17:51:36 +03:00
Dmitry Orlov
ae3b8e4916 Travis errors & warnings fix 2020-09-28 16:39:55 +03:00
Dmitry Orlov
38fd05f655 Minor fix: apply Monday bonuses to heroes who have slept overnight 2020-09-28 01:32:33 +03:00
Alexander Shishkin
fbb272bb27
Merge pull request #649 from ShubusCorporation/shc_mapgen_issue 
Fix: Random map generator crashes when nativeTerrain is not specified in the town mod
 2020-09-24 12:18:12 +03:00
Dmitry Orlov
30426b6a44 Fix: Random map generator crashes when nativeTerrain is not specified in the mod 2020-09-24 10:10:32 +03:00
Alexander Shishkin
15d9c4438c
Merge pull request #647 from ShubusCorporation/shc_fix_pathfinder 
Fix exception while calculating paths
 2020-09-22 13:23:00 +03:00
Dmitry Orlov
5e0023704b Fix PQ issues while calculating paths 2020-09-22 00:19:40 +03:00
Alexander Shishkin
08ce838e04
Merge pull request #645 from Adriankhl/develop-khl 
Fix mingw build and Random Map Generator Option
 2020-09-21 21:15:49 +03:00
Alexander Shishkin
d13834fed2
Merge pull request #648 from LibertyPaul/develop 
Fixed tmp resources destination
 2020-09-21 21:09:35 +03:00
Pavel Yazev
8b71abfac8 Fixed tmp resources destination 2020-09-12 15:34:18 +03:00
laikh
edc1d06f4e Random Map Generator Option: Allow having more computer only players than human/computer players 
Remove unused variable humanPlayersCount and function getHumanOnlyPlayerCount()
 2020-07-07 19:45:53 +08:00
laikh
90e2ab58a8 Include header SDL_Compat.h in AdventureMapClasses.cpp 2020-07-05 21:10:29 +08:00
laikh
92e3eb38e7 Fix bcrypt dependency for MINGW build 2020-07-05 21:10:29 +08:00
Alexander Shishkin
8c77f0488c
Merge pull request #644 from nullkiller/optimize-a-few-bonus-requests 
hacks to optimize a few bonus requests
 2020-07-05 05:39:40 +03:00
Andrii Danylchenko
d782ee39df hacks to optimize a few bonus requests 2020-07-04 17:52:22 +03:00