Tomasz Zieliński e105b23a37 Merge remote-tracking branch 'origin/develop' into fix_rmg_teams ...

# Conflicts:
#	Mods/vcmi/config/vcmi/rmg/heroes3/newcomers.JSON
#	Mods/vcmi/config/vcmi/rmg/heroes3/southOfHell.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/2sm0k.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/2sm2i(2).JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/3sb0b.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/3sb0c.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/5sb0a.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/5sb0b.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/7sb0b.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/7sb0c.JSON
#	client/lobby/RandomMapTab.cpp

2023-10-30 20:08:13 +01:00

..

config/vcmi

Merge remote-tracking branch 'origin/develop' into fix_rmg_teams

2023-10-30 20:08:13 +01:00

Data

Merge branch 'josch/dos2unix' into develop

2023-10-22 18:39:03 +03:00

Sounds

Add sound notification for timer

2023-08-17 01:10:03 +04:00

Sprites

Improvements to type safety of Identifier class

2023-10-04 18:05:23 +03:00

mod.json

add vietnamese

2023-09-23 10:59:38 +07:00