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

18497 Commits

Author SHA1 Message Date
Laserlicht
b29d7e8cfd third upgrade for 8th dwelling 2024-11-24 17:57:49 +01:00
Joakim Thorén
c66cf03a8c Adhere to coding guidelines https://github.com/vcmi/vcmi/blob/develop/docs/developers/Coding_Guidelines.md 2024-11-24 17:05:19 +01:00
Joakim Thorén
75ad171285 Remove redundant 'selectedFilePath'. This information is stored in the currently selected widget anyway. 2024-11-24 16:58:43 +01:00
Joakim Thorén
bdaaa0b584 RecentFileDialog widgets are pointers 2024-11-24 16:57:44 +01:00
Joakim Thorén
5747781dda Store "selectedFilePath" internally in RecentFileDialog instead of connecting to dialog internals from outside RecentFileDialog 2024-11-24 16:35:38 +01:00
Joakim Thorén
9b0e6763e7 Oops, accedentially undid reordering of parent argument. 2024-11-24 16:30:44 +01:00
Joakim Thorén
d1e40411dd Connect "actionOpenRecentMore" directly to "on_actionOpenRecent_triggered" 2024-11-24 16:29:34 +01:00
Joakim Thorén
02a656d16f Fix compilation error 2024-11-24 15:24:19 +01:00
Joakim Thorén
2678bf1e05 RecentFileDialog is class instead of struct 2024-11-24 15:23:30 +01:00
Joakim Thorén
e3b520a1f1 Header inclusion style consistency 2024-11-24 15:22:19 +01:00
Joakim Thorén
3304e55346
Rename "filename" to "filePath". Previous name was misleading at best.
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2024-11-24 15:16:17 +01:00
Joakim Thorén
1b9b925ab9
Localized string for "Recently Opened Files"'
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2024-11-24 15:15:38 +01:00
Joakim Thorén
5bff1ec2c1
Update mapeditor/mainwindow.cpp
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2024-11-24 15:14:21 +01:00
kdmcser
005b97194f fix joystick cursor position in xbrz 2024-11-24 14:06:39 +08:00
Laserlicht
6366175a3c fix window 2024-11-23 19:19:07 +01:00
Tomasz Zieliński
9e6cd9b94d Add "special" property for secondary skills 2024-11-23 12:37:30 +01:00
Tomasz Zieliński
6bdb10444f New type of zone - "sealed" 2024-11-23 12:19:25 +01:00
Tomasz Zieliński
e5b151991b Fix duplicated offroad connections 2024-11-23 10:43:14 +01:00
Tomasz Zieliński
c8e3458dfb Handle connections by unique id 2024-11-23 10:07:34 +01:00
Tomasz Zieliński
c8fcc6ffca Fix broken roads to portals or gates by the lower zone border 2024-11-23 08:25:55 +01:00
Laserlicht
5e5a854180 fix misaligned button in randommap 2024-11-23 02:33:25 +01:00
Laserlicht
3c4064e09d prism attack fix 2024-11-23 02:10:01 +01:00
Maurycy
4683b5d52a
Update swedish.ts 2024-11-23 00:19:20 +01:00
Ivan Savenko
a4417f3fc5
Merge pull request #4947 from IvanSavenko/vcmi_mod_fs
Remove custom filesystem for built-in vcmi mod
2024-11-22 19:01:30 +02:00
Ivan Savenko
e72817c866 Added existing HD assets for vcmi mod
Some of our custom assets were actually made in high resolution, and
then - greatly downscaled for use in vcmi.

This PR adds (some of) these assets using recently introduced HD assets
loading support. None of these were upscaled, but rather downscaled from
existing high-resolution version.

Following assets were added:
- vcmi icon for map format - based on our main logo, with no text
- 'defend' icon for stack queue - now also based on our logo, with no
text and sepia effect
- 'wait' icon for stack queue - added only x2 version. Was actually
already present in vcmi mod, but unused.
- icons for creature window (attack/defense/hit points/etc) - it was
based on existing CC0 asset
- 'gear' icon for settings - made from scratch by me.

Will also upload all of these assets in their original resolution to
vcmi-assets repository.
2024-11-22 16:46:48 +00:00
Ivan Savenko
b686a639a1 Remove custom filesystem for built-in vcmi mod
Leftover from ancient times that is no longer necessary.

- VCMI mod now uses same filesystem as all mods, with all files located in Content directory
- Removed definition of custom filesystem from vcmi mod.json
- Moved all png images from Data directory to Sprites
2024-11-22 16:31:32 +00:00
Ivan Savenko
5461a67ceb
Merge pull request #4953 from kdmcser/chinese
update Chinese translation
2024-11-22 18:30:41 +02:00
Ivan Savenko
917289b80f
Merge pull request #4952 from XCOM-HUB/patch-7
Update swedish.json
2024-11-22 18:30:31 +02:00
Ivan Savenko
32afd08f2b
Update Mods/vcmi/config/swedish.json 2024-11-22 17:29:32 +02:00
Tomasz Zieliński
f95bb58433 Implement curved paths for all road node objects 2024-11-22 09:28:37 +01:00
Xilmi
65f2d0c44e Merge remote-tracking branch 'upstream/develop' into develop 2024-11-21 23:14:03 +01:00
Laserlicht
b89db3f044 fix popup 2024-11-21 23:12:27 +01:00
Tomasz Zieliński
9277c5f4e7 Fixed main issue with custom path routing 2024-11-21 22:30:21 +01:00
Tomasz Zieliński
855ab0f0e9 First attempt to enforce curved paths 2024-11-21 22:00:24 +01:00
kdmcser
a10a305df8 update Chinese translation 2024-11-22 02:14:52 +08:00
kdmcser
fdd2290366 update Chinese translation 2024-11-22 01:24:50 +08:00
Maurycy
e00c2b0c6d
Update swedish.json 2024-11-21 16:04:14 +01:00
Ivan Savenko
aef6b0cc00 Fix several new issues detected by SonarCloud 2024-11-20 16:06:38 +00:00
Ivan Savenko
f59834afe1 Fixes for configurable markets support
- string "speech" can now be translated
- removed "title" string, VCMI will now use object name instead
- moved configuration of all "markets" into a separate json file
- added schema for validation of market objects
- removed serialization of translated strings from University
2024-11-20 15:45:13 +00:00
Ivan Savenko
03273ed324
Merge pull request #4943 from IvanSavenko/levelup_fix
Fix possible crash on levelup when hero can only levelup banned skills
2024-11-20 14:38:43 +02:00
Ivan Savenko
a7a9f5d777 Fix possible crash on levelup when hero can only levelup banned skills 2024-11-19 14:39:40 +00:00
Ivan Savenko
80632cdf8b
Merge pull request #4940 from krs0/Fix_missing_shots_ability_for_shooters
Fix missing shots ability for shooters
2024-11-19 13:03:51 +02:00
Ivan Savenko
55f437332b
Merge pull request #4906 from MichalZr6/hill_fort_fixes
Omit unnecessary string registration for HillFort and fix popup window crash for miniHillFort
2024-11-19 13:02:35 +02:00
MichalZr6
f823b8addf Following review 2024-11-19 10:57:20 +01:00
MichalZr6
ab1f1d6d99 Fix crash on miniHillFort popup window 2024-11-19 10:53:16 +01:00
MichalZr6
7e2cad158a HillFort fix 2024-11-19 10:53:16 +01:00
Joakim Thorén
2ed83e53b7 Prompt about unsaved changes when trying to load a map instead of prompting when opening the dialogue. 2024-11-18 23:09:08 +01:00
Joakim Thorén
5e898b9aa8 Fix bug where onSelect was triggered twice on double click in Recently Opened Files 2024-11-18 23:07:16 +01:00
Joakim Thorén
7d53150bdb Open Recent is a submenu with recently opened files and a "More..."-action. 2024-11-18 22:55:46 +01:00
krs
487b5cfaf6 Minor fixes for creature abilities
Added back siege weapon for arrow towers like before the change.
Teleports uses now same name as in HotA
2024-11-18 23:37:53 +02:00