14891 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ivan Savenko	f1a8e78f0b	Merge pull request #3596 from vcmi/fixes_for_water ... Fixes for RMG water	2024-02-11 17:53:46 +02:00
Ivan Savenko	3411a70f8e	Merge pull request #3477 from IvanSavenko/lobby ... [1.5] Networking rework and in-game lobby	2024-02-11 17:53:29 +02:00
Ivan Savenko	7790acae3a	Fix save compatiblity with 1.4	2024-02-11 17:31:30 +02:00
Ivan Savenko	38ba42ef7a	Rename 'c' to 'logicConnection'	2024-02-11 16:26:27 +02:00
Ivan Savenko	f2ecd4cf11	Merge branch 'develop' into 'lobby'	2024-02-11 16:13:13 +02:00
Ivan Savenko	51f24178a3	Merge pull request #3603 from macomarivas/develop ... Updated spanish.json translation	2024-02-11 12:28:01 +02:00
Ivan Savenko	1447f03aa3	Merge pull request #3598 from tytannial/develop ... Update Chinese translation	2024-02-11 12:27:51 +02:00
Ivan Savenko	a3462acac3	Merge pull request #3602 from Laserlicht/campaignExtraButton ... Campaign extra options button	2024-02-11 12:27:14 +02:00
Ivan Savenko	ad602573ff	Merge pull request #3600 from dydzio0614/sod-fly ... Fix SoD fly mechanics	2024-02-11 12:26:20 +02:00
Ivan Savenko	97e9f5a826	Merge pull request #3607 from Alexander-Wilms/redundant-virtual-specifier ... Remove redundant `virtual` specifiers	2024-02-11 12:25:11 +02:00
Alexander Wilms	54b44aa5e8	Re-add virtual that was accidentally removed	2024-02-10 20:46:23 +01:00
Alexander Wilms	522cb571b3	Remove redundant virtual specifiers ... `grep -nr virtual | grep -v googletest | grep override > ../redundant_virtual.txt` ```python import os with open("../redundant_virtual.txt") as f: for line in f: print() line: str = line.strip() print(line) tmp = line.split(":") file = tmp[0].strip() code = tmp[-1].strip() print(file) print(code) new_code = code.replace("virtual ", "", 1) # https://superuser.com/a/802490/578501 command = f"export FIND='{code}' && export REPLACE='{new_code}' && ruby -p -i -e \"gsub(ENV['FIND'], ENV['REPLACE'])\" {file}" os.system(command) ```	2024-02-10 20:46:13 +01:00
Ivan Savenko	1a144fc516	Some progress on private rooms support	2024-02-10 19:02:25 +02:00
Ivan Savenko	4a0dd2da2c	Added option to create new account even if player already have one	2024-02-09 23:02:41 +02:00
Alexander Wilms	a7c29e2a95	CI: Only use json5 Python package for validation ... This simplifies the script and makes the output more readable	2024-02-08 21:13:20 +01:00
Asirome	51756f9889	Updated spanish.json translation	2024-02-08 10:45:24 +01:00
Laserlicht	4e8152f268	reorder gui	2024-02-07 22:04:50 +01:00
Laserlicht	c8b6d6a684	add extra button for campaigns	2024-02-07 21:40:56 +01:00
Dydzio	fd9810adf4	Working SoD version of fly	2024-02-07 19:27:02 +01:00
Tytannial	a6cfacc7e3	Update Chinese Launcher translation	2024-02-07 09:01:55 +08:00
Tytannial	23e1b38c4f	Update Chinese translation	2024-02-07 08:50:40 +08:00
Ivan Savenko	b319d16de6	Merge pull request #3597 from IvanSavenko/bugfixing ... Fixes for map/save loading	2024-02-07 00:16:43 +02:00
Ivan Savenko	c068c92c92	Merge pull request #3201 from Alexander-Wilms/fix-huge-texture-crash ... Fix broken intro and crash when resizing window	2024-02-07 00:16:15 +02:00
Ivan Savenko	4130d5bad1	Merge pull request #3591 from Alexander-Wilms/gitignore ... Add more patterns to .gitignore	2024-02-07 00:15:45 +02:00
Ivan Savenko	18f9d29fd2	Fix typo	2024-02-07 00:15:20 +02:00
Ivan Savenko	9730b24214	Fix typo	2024-02-06 16:36:57 +02:00
Ivan Savenko	77f177adc7	Track last login time for accounts	2024-02-06 16:28:35 +02:00
Ivan Savenko	fd17133da3	Fix editor build	2024-02-06 00:40:26 +02:00
Alexander Wilms	efb021333b	Building_Linux.md: Use cmake -S ../vcmi instead of cmake ../vcmi	2024-02-05 22:32:45 +01:00
Alexander Wilms	a2bd3f5b46	Add more patterns to .gitignore ... These were needed for files created by `cmake ../vcmi && cmake --build .`	2024-02-05 22:32:41 +01:00
Ivan Savenko	1cecaf2bf5	Skip unresolved identifier from list of allowed heroes/artifacts in vmap	2024-02-05 22:26:53 +02:00
Ivan Savenko	a18f9d1e8d	Added workaround for references to old 'torosar ' ID	2024-02-05 21:56:06 +02:00
Ivan Savenko	9e09fe08e1	Fixed duplicated hero check - was used too early, before hero type is ... loaded	2024-02-05 21:55:48 +02:00
Ivan Savenko	87059be67b	Added range checks to values read from h3m. ... Fixes reading of morale/luck values (-3..3) as unsigned leading to overflow.	2024-02-05 21:27:55 +02:00
Ivan Savenko	4af4d1a75e	Remove excessive logging	2024-02-05 21:11:00 +02:00
Ivan Savenko	342e6daebd	Fix copy-paste error	2024-02-05 21:07:50 +02:00
Ivan Savenko	a97d1d9377	Fix crash on broken ENCHANTED bonus	2024-02-05 21:07:01 +02:00
Alexander Wilms	0495c52cf4	Don't call ScreenHandler::onScreenResize() when the window has been (un)maximized to avoid creating a huge texture and crashing	2024-02-05 18:59:55 +01:00
Ivan Savenko	9e5e7d95c3	Workaround for broken save compatibility	2024-02-05 18:46:48 +02:00
Ivan Savenko	b160cf1598	Merge pull request #3579 from kdmcser/develop ... update Chinese translation	2024-02-05 18:44:59 +02:00
Ivan Savenko	156f1d9311	Merge pull request #3589 from Laserlicht/queue_adjust ... adjustable queue size for embedded queue	2024-02-05 18:44:45 +02:00
Ivan Savenko	8cd6832297	Handle errors from global lobby on client	2024-02-04 21:23:21 +02:00
Ivan Savenko	b3c5882e11	Workaround for broken save compatibility	2024-02-04 21:22:51 +02:00
Ivan Savenko	d4bedd8d8d	Fixed handling of match server crash	2024-02-04 19:58:09 +02:00
Andrii Danylchenko	ec5c44bb92	Merge pull request #3594 from vcmi/fix-3550 ... #3550 - fix case when unit is in reachability map but only next turn	2024-02-04 10:07:44 +02:00
Tomasz Zieliński	5c6a146952	Use HoTA values for water treasures	2024-02-04 08:57:02 +01:00
Tomasz Zieliński	af3c6450a7	Update comments	2024-02-04 08:56:45 +01:00
Tomasz Zieliński	7ce3553a6d	Fix race condition when placing object at teh shore	2024-02-04 08:56:21 +01:00
Tomasz Zieliński	6528124c1e	Do not fill water zone with obstacles	2024-02-04 08:55:51 +01:00
Ivan Savenko	7dee24edae	Cleanup	2024-02-03 23:30:16 +02:00