1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Commit Graph

12279 Commits

Author SHA1 Message Date
Andrii Danylchenko
5083100d3b NKA: fix accessing removed hero and heroExchangeCount 2023-07-31 22:01:11 +03:00
Tomasz Zieliński
db2be3ee05 Anoother unused variable 2023-07-31 22:01:11 +03:00
Tomasz Zieliński
850da65f80 Another build fix 2023-07-31 22:01:11 +03:00
Tomasz Zieliński
88178567b1 Remove unused variable 2023-07-31 22:01:11 +03:00
Tomasz Zieliński
e483f06e0f Remove unused variable 2023-07-31 22:01:11 +03:00
Tomasz Zieliński
5bffea0aac Use new interface 2023-07-31 22:01:11 +03:00
Andrii Danylchenko
69ceee5dd6 NKAI: penalty for extra chains 2023-07-31 22:01:11 +03:00
Andrii Danylchenko
0fd118d3ce NKAI: gold reward 2023-07-31 22:01:11 +03:00
Andrii Danylchenko
6ba74f02bc NKAI: playing around with defence 2023-07-31 22:01:11 +03:00
Andrii Danylchenko
b19ac01bf9 Fuzzy rework, added more defence and gather army routines 2023-07-31 22:01:10 +03:00
Andrii Danylchenko
b1ca663eb6 Fuzzy rework 2023-07-31 22:01:10 +03:00
Andrii Danylchenko
38a98387e4 Temp fix for blocked in garrison ai. 2023-07-31 22:01:10 +03:00
Ivan Savenko
43795c39a5 Replaced all usage of SDL_Color outside of render with ColorRGBA 2023-07-31 21:07:30 +03:00
Ivan Savenko
e484066772
Merge pull request #2450 from heroesiiifan/patch-6
Language update (german) for QT applications
2023-07-31 16:24:07 +03:00
Ivan Savenko
d9e7a8f88a
Merge pull request #2446 from IvanSavenko/bugfixing
(1.3.0) Bugfixing
2023-07-31 16:21:43 +03:00
Ivan Savenko
986c8799a8 Move checkboxes 2 slots above to avoid overflowing below window border 2023-07-31 13:31:44 +03:00
heroesiiifan
e9b46363cc
Launcher translation german update 2023-07-30 20:11:56 +00:00
heroesiiifan
a7fab1099c
Mapeditor translation german update 2023-07-30 20:10:38 +00:00
Ivan Savenko
62fddca21e Split massive CModHandler class/file into multiple parts:
- IdentifierStorage is now a separate handler in VLC
- Renamed ModHandler::Incompatibility exception to ModIncompatibility
- Extracted ModScope namespace from ModHandler
- Extracted ModUtilities namespace from ModHandler
- Split CModHandler.cpp on per-class basis
- Replaced some direct members with unique_ptr to reduce header includes
2023-07-30 22:17:47 +03:00
Ivan Savenko
8ea7e91189 moved mod-related files to new directory 2023-07-30 20:38:32 +03:00
Ivan Savenko
323537e4bd
Merge pull request #2432 from IvanSavenko/remove_boost_interprocess
(develop) Remove boost::interprocess usage
2023-07-30 20:38:01 +03:00
Ivan Savenko
7f72f7a82c Cleanup server connection code a bit 2023-07-30 20:15:32 +03:00
Ivan Savenko
593b82d178 Removed all references to boost::interprocess library 2023-07-30 20:14:57 +03:00
Ivan Savenko
e8ee83574c
Merge pull request #2428 from IvanSavenko/remove_boost_iostreams
(develop) Removed boost::iostreams usage
2023-07-30 20:14:39 +03:00
Ivan Savenko
4c3a02c8c9
Merge pull request #2438 from Laserlicht/patch-3
trigger haptic feedback on button-sound
2023-07-30 20:14:34 +03:00
Ivan Savenko
5d2dd4c633 Show creature popup window on right-click in town fort 2023-07-30 15:29:18 +03:00
Ivan Savenko
397c4c7595 Fix dismissing heroes on map with "Capture town" victory condition 2023-07-30 15:28:56 +03:00
Ivan Savenko
95dd4b3ffb Fix incorrect warnings about missing translations 2023-07-30 13:19:52 +03:00
Ivan Savenko
d86c0a969d Fix conflicting market/town hotkeys 2023-07-30 12:34:34 +03:00
Ivan Savenko
5776e171c4 Fix list of possible resources given by some objects, e.g. windmills 2023-07-30 12:31:35 +03:00
Ivan Savenko
a73146751c Execute cursor changes in main thread on any platform 2023-07-30 12:30:56 +03:00
DjWarmonger
4e044a78ce
Merge pull request #2436 from vcmi/fix-freeze-ai-attacking-dwelling
Fix freeze ai attacking dwelling
2023-07-29 09:22:06 +02:00
Tomasz Zieliński
943e3e888c Merge remote-tracking branch 'origin/beta' into fix-freeze-ai-attacking-dwelling
# Conflicts:
#	server/CGameHandler.cpp
2023-07-29 08:11:27 +02:00
Michael
aaa115cf4b
Button-Sound -> haptic feedback 2023-07-29 00:11:16 +02:00
Ivan Savenko
6c52293dd9
Merge pull request #2425 from IvanSavenko/fix_combat_replay
Attempt to fix combat replay queries
2023-07-29 00:03:44 +03:00
Ivan Savenko
4d08a131d3 Reorganization of boost filesystem usage
- Removed (most of) boost filesystem namespace usings
- Replaced boost::filesystem::fstream with std::fstream and different
constructor that should be available on any plaftorm
2023-07-28 19:12:04 +03:00
Ivan Savenko
21a39f0b01 Removed boost::iostreams in favor of std::stream / boost::filesystem 2023-07-28 19:12:04 +03:00
Ivan Savenko
fbe6c313d9
Merge pull request #2426 from IvanSavenko/version_bump_14
Bump version to 1.4 on develop branch
2023-07-28 19:10:01 +03:00
Ivan Savenko
2fd6df01e5
Merge pull request #2427 from vcmi/beta
Merge beta -> develop
2023-07-28 19:09:47 +03:00
Andrii Danylchenko
8e1dc785eb Wrong player was engaged for 5lvl dwelling 2023-07-28 14:19:12 +03:00
Ivan Savenko
1983078ba9
Merge pull request #2430 from IvanSavenko/update_translations
Update translations
2023-07-28 13:50:20 +03:00
Ivan Savenko
6153c1b203
Merge pull request #2422 from IvanSavenko/hero_pool_fix
Fix errors about "hero has no army" for defeated heroes
2023-07-28 13:43:50 +03:00
Ivan Savenko
b52a21f8ee Regenerated map editor translations to include missing strings 2023-07-28 13:42:53 +03:00
Ivan Savenko
4ba6806a69 Added missing string to Editor translation 2023-07-28 13:42:53 +03:00
Ivan Savenko
8c4e23f2d6 Updated Launcher localization 2023-07-28 13:42:49 +03:00
Ivan Savenko
5caf987894
Merge pull request #2435 from heroesiiifan/patch-4
Vietnamese language support
2023-07-28 13:39:36 +03:00
Ivan Savenko
dd88d39a82
Merge pull request #2419 from dydzio0614/multiplayer-adventure-map-responsiveness
Multiplayer adventure map responsiveness
2023-07-28 13:39:02 +03:00
heroesiiifan
bee59b3c1c
Update Languages.h 2023-07-28 00:48:06 +00:00
heroesiiifan
648f7344c7
Update mod.json 2023-07-28 00:34:28 +00:00
heroesiiifan
ddfeeb152d
Update settings.json 2023-07-28 00:33:42 +00:00