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

15189 Commits

Author SHA1 Message Date
Tomasz Zieliński
6c9d18a85c Allow multiple terrains per biome 2024-04-10 09:40:12 +02:00
Tomasz Zieliński
5c4d1703ca Fix for loading templates from other mods 2024-04-09 22:09:03 +02:00
Tomasz Zieliński
8d9489c368 Fix conflicts with templates loaded from mods 2024-04-09 17:29:33 +02:00
Tomasz Zieliński
bf2c9237b2 Register templates for new objects from mods 2024-04-08 16:39:41 +02:00
Tomasz Zieliński
c7149103ce Compile fix 2024-04-08 15:24:52 +02:00
Tomasz Zieliński
d9a598ad9c Merge remote-tracking branch 'origin/develop' into biome_system 2024-04-08 15:01:17 +02:00
Tomasz Zieliński
c9f8742334 Remove some unused templates, hand-tweak existing ones 2024-04-08 14:56:48 +02:00
Tomasz Zieliński
224e971c4b Unused variable 2024-04-08 14:56:21 +02:00
Tomasz Zieliński
3e3959d360 Move all OH3 objects and obstacle sets to a mod 2024-04-08 12:50:41 +02:00
Ivan Savenko
0a80c6c27b
Merge pull request #3722 from IvanSavenko/stabilization
Fixes for recently reported crashes
2024-04-07 14:07:56 +03:00
Ivan Savenko
4bef4d9277
Merge pull request #3718 from IvanSavenko/lobby_tweaks_3
Few more tweaks for new lobby
2024-04-07 14:07:49 +03:00
Ivan Savenko
8a98de8275
Merge pull request #3723 from thiscris/develop
Small wiki update
2024-04-07 10:46:45 +03:00
Tomasz Zieliński
86cffb3a77 Removed unused variable 2024-04-06 18:12:44 +02:00
thiscris
9bbcb4cf5c Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2024-04-06 15:44:47 +02:00
thiscris
94dd38539b updated minimal mod.json example 2024-04-06 15:44:31 +02:00
Tomasz Zieliński
73ec53a9e0 Fix build 2024-04-06 15:29:15 +02:00
Tomasz Zieliński
b0cff23c37 Cleanup 2024-04-06 15:06:08 +02:00
Ivan Savenko
03786fb63b VCAI will now check whether it actually has enough gold to buy a hero 2024-04-06 15:59:08 +03:00
Ivan Savenko
907438c6f5 Fix crash on attempt to compute movement range for siege tower 2024-04-06 15:59:08 +03:00
Ivan Savenko
2685721bf2 Erdamon now increases both min and max damage, as in H3 2024-04-06 15:59:08 +03:00
Ivan Savenko
1a6aae9363 Fix crash on selecting scenario with "start with strongest hero from
scenario X" starting bonus
2024-04-06 15:59:08 +03:00
Ivan Savenko
2d9e42b623 Do not attempt to show extra options in campaign scenario information
screen
2024-04-06 15:59:08 +03:00
Andrii Danylchenko
1d453a0c9d
Merge pull request #3719 from vcmi/fix-castle-int-closing-by-turntimer
Fix castel interface closing by turn timer
2024-04-06 15:58:54 +03:00
Andrii Danylchenko
59b756b10c
Merge pull request #3720 from vcmi/fix-3691
#3691 - boat attached to hero should not block tiles on its own
2024-04-06 15:58:30 +03:00
Andrii Danylchenko
8efceb110b #3691 - boat attached to hero should not block tiles on its own 2024-04-06 12:30:19 +03:00
Andrii Danylchenko
c7b5d254d7 Fix castel interface closing by turn timer 2024-04-06 11:42:39 +03:00
DjWarmonger
5c40aa8612
Merge pull request #3711 from vcmi/reindex_objects
Reindex objects to show interactive objects on top
2024-04-05 19:43:40 +02:00
Ivan Savenko
2c5e6974dc Do not allow creation of accounts with same name and different case 2024-04-05 18:50:06 +03:00
Ivan Savenko
7c18c8b1da Add comment 2024-04-05 18:50:06 +03:00
Ivan Savenko
ee1aa4ed05 Fix overlaying UI elements when player has no account created 2024-04-05 18:50:06 +03:00
Ivan Savenko
651908d7aa Do not attempt to translate usernames 2024-04-05 18:50:06 +03:00
Ivan Savenko
fa31e9f69b Do not mark channel as unread when receiving chat history 2024-04-05 18:50:06 +03:00
Tomasz Zieliński
305e2bdf2f Load obstacle sets from json in mods 2024-04-05 08:31:05 +02:00
Tomasz Zieliński
b1a5693612 Proof of concept with OH3 obstacles 2024-04-04 21:39:01 +02:00
Tomasz Zieliński
8ed940d538 cleanup 2024-04-03 22:24:19 +02:00
Tomasz Zieliński
9f048888dd Restore previous removeObject 2024-04-03 22:17:36 +02:00
Tomasz Zieliński
12da0196a0 Restrict reindexing to random maps 2024-04-03 20:05:35 +02:00
Tomasz Zieliński
2a213f2276 Reindex objects to show interactive objects on top 2024-04-03 14:48:04 +02:00
DjWarmonger
c2f160326c
Merge pull request #3708 from vcmi/dydzio0614-patch-1
Update year
2024-04-02 20:35:49 +02:00
Dydzio
bd66abe439
Update year 2024-04-02 10:06:46 +02:00
Andrii Danylchenko
fd0dd7441a
Merge pull request #3700 from vcmi/object-graph
NKAI: parallel capture objects
2024-04-01 12:59:08 +03:00
Andrii Danylchenko
728f673763 NKAI: remove static ai field 2024-03-31 21:11:25 +03:00
Ivan Savenko
611b39a150
Merge pull request #3703 from IvanSavenko/lobby_tweaks_2
Few more fixes for recently discovered lobby issues
2024-03-30 11:08:16 +02:00
Ivan Savenko
dd91a99e36 Distinguish "connected but not logged in" from "not connected" state
Possible in case of login failure
2024-03-30 10:26:07 +02:00
Ivan Savenko
699616c984 Removed no longer used fields - data moved to persistent storage 2024-03-30 10:25:17 +02:00
Ivan Savenko
64ff0e0486 Fix handling of 'developmentMode' for lobby-only builds 2024-03-30 10:24:54 +02:00
Ivan Savenko
7bc81101a2 Add logging for when account or match server disconnects 2024-03-30 10:24:13 +02:00
Ivan Savenko
acd2352653
Merge pull request #3699 from IvanSavenko/lobby_tweaks
Minor tweaks for most noticeable issues with new lobby
2024-03-30 00:13:14 +02:00
Andrii Danylchenko
ca7c91e766
Merge pull request #3677 from vcmi/object-graph
Object graph
2024-03-29 20:39:56 +02:00
Andrii Danylchenko
d6f1a5c2b3 NKAI: parallel capture objects 2024-03-29 20:39:03 +02:00