1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Commit Graph

1486 Commits

Author SHA1 Message Date
b9b51334eb Award 500 experience for towns conquered during a battle. 2023-09-12 21:30:30 +03:00
ad25bfb4bb Fixed invisible creatures from SUMMON_GUARDIANS bonus 2023-09-06 11:29:28 +03:00
daa8a494fc Merge branch 'release_131' into master 2023-08-17 16:19:20 +03:00
00ac8eb306 Attempt to fix crash on quitApplication on Android 2023-08-15 00:17:59 +03:00
92ce97bbc7 Merge remote-tracking branch 'vcmi/master' into beta 2023-08-12 16:20:06 +03:00
8cbc52364a Merge pull request #2496 from IvanSavenko/saves_in_mods
Allowed loading saves from inside mods
2023-08-12 11:27:15 +03:00
4b307dc0e4 More locks to avoid data races on server 2023-08-11 18:50:39 +03:00
d7cbe4ecde Attempt to fix data raced in battle on server 2023-08-07 17:28:21 +03:00
9bd27c50a0 Allowed loading saves from inside mods 2023-08-06 19:39:55 +03:00
6e7a02702d Fix crash in naval combat 2023-08-04 10:46:04 +03:00
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
8e1dc785eb Wrong player was engaged for 5lvl dwelling 2023-07-28 14:19:12 +03:00
aed8c411fc Minor rework & cleanup of combat replays 2023-07-27 19:25:55 +03:00
e733b55c90 Removed buggy and poorly designed fromString method
Use VLC->modh directly with proper parameters instead
2023-07-25 22:36:45 +03:00
705cdb846d Merge pull request #2403 from IvanSavenko/error_detection_fix
Attempt to fix & improve error reporting
2023-07-25 18:15:28 +03:00
ec8898a0e7 #1965 - treat dwelling defenders as neutrals 2023-07-25 10:13:41 +03:00
21e794268b Attempt to fix & improve error detection:
- use std::fstream instead of boost::iostreams for properly working flush
- removed some catch-all blocks
- reduce catch scope of some try/catch blocks to clearly indicate intent
2023-07-24 18:48:56 +03:00
280085b95d Merge pull request #2308 from IvanSavenko/remove_client_savegame
Remove client savegames
2023-07-19 14:46:46 +03:00
baa865d857 Extracted message-related functionality of CGameHandler to separate file 2023-07-15 21:01:13 +03:00
ec7e046617 Fix hero pool persistency between saves 2023-07-15 19:55:30 +03:00
19ace6a849 Moved hero pool logic to the separate files 2023-07-15 19:55:29 +03:00
afb9bfc180 Revert apparently broken changes from commits 96420bf, 92dcfd1, c4cf2a1 2023-07-11 21:22:24 +02:00
9acab48bc3 Merge pull request #2268 from SoundSSGood/CArtifactInstance-rework
CArtifact CArtifactInstance refactoring
2023-07-11 14:36:08 +03:00
8750aa2c5b Merged server savegame and (broken and unused) client savegame files 2023-07-09 15:30:47 +03:00
9b5f6ec7cf CArtifact getters setters 2023-07-05 15:48:08 +03:00
fd9c7352a0 suggested changes 2023-07-03 22:54:03 +03:00
48eb8ab54f Play sound when receiving message, not just on sending ours 2023-07-03 17:12:31 +03:00
670999d40e BattleResultAccepted fixed 2023-07-01 14:59:16 +03:00
060aecc61c CArtifact refactoring 2023-06-30 19:41:26 +03:00
07c811dd67 CCombinedArtifactInstance refactoring 2023-06-30 19:40:57 +03:00
8420a90aa4 Reorganization of campaigns code 2023-06-26 17:15:59 +03:00
85262cf4f5 Moved CGameState files into a separate directory 2023-06-26 17:15:59 +03:00
08cfbe79cf Added encapsulation for movement points access 2023-06-25 17:42:36 +03:00
f7b27da00e Implemented support for "coast visitable" objects:
- objects marked as coast visitable can be visited from land even when
placed in water
- added isBlockedVisitable and isCoastVisitable method to
CGObjectInstance
- implemented json config for these properties in banks
2023-06-25 17:42:33 +03:00
ce3e150d59 Minor formatting 2023-06-23 13:55:52 +03:00
6a08a96d0c Added createObject call as wrapper around NewObject netpack 2023-06-23 13:42:08 +03:00
d8879f1e53 NewObject pack now receives visitable position instead of h3m position 2023-06-23 13:34:51 +03:00
69dc95c3c8 Merge pull request #2235 from IvanSavenko/hota_h3m_support
Hota h3m support
2023-06-23 13:32:10 +03:00
bd4d2788ed Split pathfinder into multiple smaller files 2023-06-21 13:46:09 +03:00
87fcfa4add Removed excessive pathfinder includes 2023-06-21 12:00:44 +03:00
3913b8e98c Heroes placed on water in map will be automatically given boat 2023-06-20 19:37:27 +03:00
a84666edf6 MetaString can be serialized in json 2023-06-20 19:37:27 +03:00
d51fe62804 Win/loss condition texts use MetaString 2023-06-20 19:37:27 +03:00
56d69e790b Renamed MetaString methods to more logical names 2023-06-20 19:37:27 +03:00
f35b3a0dc3 Replace MetaString operator << with member function 2023-06-20 19:37:27 +03:00
6ed0fbe579 Fix excessive warning - neutral town with Portal is perfectly legal 2023-06-20 19:37:27 +03:00
ece9982ca0 Fix build 2023-06-16 18:11:45 +03:00
6aedb99117 Cleaned up IShipyard interface 2023-06-16 17:59:10 +03:00
adec58f5bf - Set fixed boat type for Tavern / Prison
- Move magical boat offset to static function
2023-06-15 17:53:18 +02:00
351d596bdc Handle water Prisons and Taverns. 2023-06-08 09:17:08 +02:00