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

12667 Commits

Author SHA1 Message Date
Ivan Savenko
1f1f978328 Fixed battle replay 2023-09-06 16:03:47 +03:00
Ivan Savenko
8bdddd1324 Fix tests compilation 2023-09-06 16:03:47 +03:00
Ivan Savenko
ef94e7a78a Fix build 2023-09-06 16:03:47 +03:00
Ivan Savenko
9fa7a93fb0 Properly pass battleID in all battle netpack's 2023-09-06 16:03:47 +03:00
Ivan Savenko
747e28947a Fix build 2023-09-06 16:03:47 +03:00
Ivan Savenko
41210c1dbf Client-side support for multiple battles 2023-09-06 16:03:47 +03:00
Ivan Savenko
036df2e0ad Support multiple battles in AI 2023-09-06 16:03:46 +03:00
Ivan Savenko
3a88180494 Separated game and battle callback (server & client only) 2023-09-06 16:03:39 +03:00
Ivan Savenko
fc4dfda00f Added support for concurrent battles to gamestate and server 2023-09-06 16:03:02 +03:00
Ivan Savenko
a21de70516
Merge pull request #2758 from IvanSavenko/identifiers_serialization_fix
Fix serialization of identifers by Json Serializer
2023-09-06 15:21:54 +03:00
Ivan Savenko
1a82280cb2 Fix build 2023-09-05 13:16:08 +03:00
Ivan Savenko
609f25f344 Add sanity check 2023-09-04 22:43:16 +03:00
Ivan Savenko
b6a1a8f0da Json Serializer should now use identifers storage properly 2023-09-04 22:23:20 +03:00
Ivan Savenko
9735fa6d06 Fix regresssion - crash 2023-09-04 22:22:45 +03:00
Ivan Savenko
12c4f8d18c Fixed serialization of PlayerColor in json 2023-09-04 22:22:24 +03:00
Ivan Savenko
86a7f5f5cd Removed getStr(bool), replaced with similar toString() 2023-09-04 22:21:02 +03:00
Ivan Savenko
7e27ac7073 IdentifierStorage is now separate handler in VLC 2023-09-04 18:56:16 +03:00
Ivan Savenko
c8a6cd74cc Additional checks for invalid access to IdentifierStorage 2023-09-04 18:56:16 +03:00
Ivan Savenko
82989e6302 Use pointers in containers to guaranteed fixed address 2023-09-04 18:56:16 +03:00
Ivan Savenko
a30e7ba321 Remove bitmasks of PlayerColor's. Add encode/decode methods 2023-09-04 18:56:16 +03:00
Ivan Savenko
f79492e5b0
Merge pull request #2755 from wb180/fixNKAICompilation
Fix NKAI compilation with NKAI_PATHFINDER_TRACE_LEVEL>=2
2023-09-04 15:29:44 +03:00
Evgeniy Meshcheryakov
ecf9b1aa2f Fix NKAI compilation with NKAI_PATHFINDER_TRACE_LEVEL>=2 2023-09-04 10:08:56 +03:00
Ivan Savenko
e2b5ff13f1
Merge pull request #2746 from wb180/teamsPopup
Show only non-empty teams in teams popup
2023-09-03 22:23:32 +03:00
Ivan Savenko
7ccc8605ac
Merge pull request #2733 from SoundSSGood/empty-bulk-move-fix
Arts bulk move crash fixed
2023-09-03 22:06:57 +03:00
Nordsoft91
2eaed0c983
Merge pull request #2743 from Laserlicht/fix_difficulty_widget
[fix] difficulty widget
2023-09-03 17:57:43 +04:00
Nordsoft91
2057624cbc
Merge pull request #2741 from Laserlicht/folder_order
[fix] folder order
2023-09-03 17:56:56 +04:00
Nordsoft91
244db2da33
Merge pull request #2739 from Gwart/bugfix/#2646-hero-exchange-server-compliant
#2646 add a null check if creature is empty
2023-09-03 11:45:32 +04:00
Evgeniy Meshcheryakov
b6e2c454c0 Show only non-empty teams in teams popup 2023-09-03 08:05:02 +03:00
Michael
53277306cd
add also savegame 2023-09-02 20:39:16 +02:00
Michael
3d08518dac
fix difficulty widget 2023-09-02 19:37:56 +02:00
Michael
e0460a0dec
up should be first 2023-09-02 19:04:06 +02:00
Nordsoft91
9af73c2212
Merge pull request #2723 from Nordsoft91/versions-fix
Launcher & lib versions unification
2023-09-02 19:42:46 +04:00
Nordsoft91
48e6e0228c
Merge pull request #2722 from Nordsoft91/launcher-doubleclick
Launcher mod double click behavior
2023-09-02 19:42:28 +04:00
Gwart
05ba56a873 #2646 add a null check if creature is empty 2023-09-02 16:21:54 +02:00
Nordsoft91
91565225c6
Merge pull request #2728 from Nordsoft91/turn-timer-fix 2023-09-02 16:29:20 +04:00
SoundSSGood
3126875e6a arts bulk move crash fixed 2023-09-02 14:36:57 +03:00
nordsoft
e85eb36bbd Battle timer fix 2023-09-02 13:14:24 +04:00
nordsoft
48fb167fef Fix timer end turn while standing on obstacles/water 2023-09-02 03:27:46 +04:00
nordsoft
0fc6e2b316 rollback query blocking 2023-09-02 03:17:51 +04:00
nordsoft
9cd3b537ad Add turn timer allowed option 2023-09-02 03:17:32 +04:00
Ivan Savenko
cab2bddf7e
Merge pull request #2712 from Laserlicht/dim_map
Dim adventuremap
2023-09-01 22:37:10 +03:00
Alexander Wilms
d2f0a80573
Update VCMI icon (#2672)
* Update VCMI icon

Fixes #1993

Sources will be added to https://github.com/vcmi/vcmi-assets

* Use entire canvas height for shield, add remaining icons

* Use a slighty more saturated brown

* Align VCMI letters to pixel grid for 32px icons

* Align VCMI letters to pixel grid for 48px icon

* Align VCMI letters to pixel grid for 64px icon

* Add 96px icon to .ico

* Update Android and iOS icons

* Install 22px icon on Linux

* Update macOS .icns file

* Add more icons

* Update iOS icons

* Add more sizes to .ico files

* Don't use .png inside .ico

* Only include resolutions up to 256px in .ico files

* Center map editor icon
2023-09-01 22:36:32 +03:00
nordsoft
5875dc6b8f Smarter double-click 2023-09-01 17:40:52 +04:00
nordsoft
8040cafb3d Code review tweaks 2023-09-01 15:17:46 +04:00
nordsoft
15037b782f Fix assert 2023-09-01 04:39:32 +04:00
nordsoft
e9ba1d73d1 Support partial versions 2023-09-01 04:36:53 +04:00
nordsoft
ea7ab9d5ed Migrate launcher to vcmi versions 2023-09-01 04:12:41 +04:00
nordsoft
31956549e6 Double click behavior 2023-09-01 03:29:50 +04:00
Nordsoft91
c45ab07d0b
Merge pull request #2698 from Nordsoft91/turn-timer
Turn timer fixes
2023-09-01 00:31:52 +04:00
Michael
1721fe1ad6
optimize if disabled 2023-08-31 21:03:54 +02:00