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

7110 Commits

Author SHA1 Message Date
a553a4aa66 Merge pull request #2030 from Nordsoft91/boats 2023-04-22 03:27:00 +04:00
20de44d4a5 Reodered methods in file to group similar code 2023-04-20 22:04:24 +03:00
7db67a3101 int3 now has proper hasher function 2023-04-20 22:04:24 +03:00
f1902ab247 Initial refactoring to encapsulate adventure map 2023-04-20 22:03:28 +03:00
de159df481 Rename boats 2023-04-20 21:20:51 +04:00
de22132cdf Fix loading 2023-04-20 19:46:27 +04:00
db33558abc Load custom campaigns from gzip 2023-04-20 19:22:27 +04:00
be6667acf5 Most questionable workaround 2023-04-20 19:21:37 +04:00
88c436691d Simplify logs 2023-04-20 16:26:06 +02:00
09b493681b More iterations, higher gravity constant for better results. 2023-04-20 16:13:30 +02:00
55d7d7b9b5 Fix coefficients to make dead code actually be used sometimes. 2023-04-20 12:44:32 +02:00
00d7901e59 Add another placement technique - swap two misplaced zones. Don't move same zones in consecutive iterations. 2023-04-20 12:24:57 +02:00
4dc16b9ff7 Adventure map spells are no longer visible on units in battle 2023-04-20 13:16:45 +03:00
9ecf16ca23 Fix minor bugs 2023-04-20 03:20:00 +04:00
4e18a3d579 CSerializer: fix debug assertion
Fix compilation in debug mode
2023-04-20 01:27:15 +04:00
5a5aced67e Fixed empty Black Market on game start 2023-04-19 23:11:17 +03:00
4bb4d7e7a5 Merge pull request #1989 from SoundSSGood/refactoring-arts-p1
Artifact related code refactoring part1 (initial)
2023-04-19 15:31:11 +03:00
505a78a638 Merge pull request #2035 from rilian-la-te/native-fix-beta
vcmi: fix terrain penalties
2023-04-19 13:39:54 +03:00
7c4badc890 CSerializer: fix debug assertion
Fix compilation in debug mode
2023-04-19 13:00:51 +03:00
d94ce22e70 vcmi: fix terrain penalties
Fixes #2028
2023-04-19 12:41:54 +03:00
c34b1cd713 Fix warning-as-errors. 2023-04-19 08:45:23 +02:00
5cf9fbbe02 Fix compiling 2023-04-19 03:11:13 +04:00
f464ca3560 Merge remote-tracking branch 'upstream/develop' into vcmi-campaign
# Conflicts:
#	lib/mapping/CCampaignHandler.cpp
2023-04-19 02:45:49 +04:00
0a28262c15 Merge remote-tracking branch 'upstream/develop' into boats
# Conflicts:
#	AI/VCAI/Pathfinding/AINodeStorage.cpp
2023-04-19 02:22:19 +04:00
008db447e7 Minor changes 2023-04-19 02:11:24 +04:00
22da7a931d Boat as bonus system node 2023-04-19 01:11:51 +04:00
d841655c1d Scale fuzzy edges with map size. 2023-04-18 22:34:26 +02:00
4a79e2ccd9 CSerializer: fix any_cast 2023-04-18 23:29:47 +03:00
d1dacd45e2 Animations from config 2023-04-19 00:14:15 +04:00
15592c3aff Change metric to create more interesting zone shapes. 2023-04-18 22:01:51 +02:00
59a1a19d4a Summon boat for real boats only 2023-04-18 22:21:26 +04:00
39154737a5 Use std::optional instead of boost::optional. 2023-04-18 19:34:54 +02:00
6551585f96 Start with low stifness to let zones pass through each other - typical temperature fall.
(cherry picked from commit 435b9f7881)
2023-04-18 19:21:33 +02:00
8d5cd6d072 Randomize starting positions a bit so zones don't fall exactly on the grid.
(cherry picked from commit 33eb28b570)
2023-04-18 19:21:28 +02:00
fc91152da7 Fixed zones getting actually randomized after construction. Tweaks to algorithm, now it's considerably better.
(cherry picked from commit c13019059f)
2023-04-18 19:21:19 +02:00
2d7a819939 Parameters which work well for Jebus - accessible desert and Blue placed away from Red
(cherry picked from commit 42c6127c79)
2023-04-18 19:21:13 +02:00
494f4eaa3f Simple solution that works - by ChatGPT :)
(cherry picked from commit 7c6e4bc2fe)
2023-04-18 19:21:06 +02:00
a1f094776f Use fixed starting positions for now.
(cherry picked from commit 43c51805f5)
2023-04-18 19:20:57 +02:00
7d2745fda6 Simplified target function comparison.
(cherry picked from commit 809f6344ff)
2023-04-18 19:20:50 +02:00
48c11f661b Fix zone attraction
(cherry picked from commit 164ecaea60)
2023-04-18 19:20:40 +02:00
3f83eaafc4 Fix distance check
(cherry picked from commit 319f289dc4)
2023-04-18 19:20:32 +02:00
64adc9983d - Fixes for corectness
- Space apart starting zones of players

(cherry picked from commit 80be12ac68)
2023-04-18 19:20:23 +02:00
09d50a5e9f First draft that kinda works.
(cherry picked from commit 7dd5a9c15d)
2023-04-18 19:20:12 +02:00
3ff99a1a15 Mechanic for air and land transport 2023-04-18 18:33:28 +04:00
ddcdfb643a Try to enable air/land movement 2023-04-18 17:36:42 +04:00
d83566bc74 Add constructor for boat 2023-04-18 17:27:39 +04:00
ed798b06da Prepare transport enum 2023-04-18 13:04:49 +04:00
ecf8b9934b Further refactoring 2023-04-17 23:19:56 +04:00
a1e8d95028 vcmi: rework CArtHandler 2023-04-17 12:32:47 +03:00
b41481c73b Fix(?) mingw 2023-04-17 05:22:32 +04:00