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

18468 Commits

Author SHA1 Message Date
Ivan Savenko
7fdddee503
Merge pull request #4978 from IvanSavenko/swap_h3_icons
Fix h3 bug: icons of View Earth and View Air are swapped
2024-11-25 15:29:39 +02:00
Ivan Savenko
a58d48e03d
Merge pull request #4980 from IvanSavenko/hero_randomization_fix
Fix Orrin as starting hero on some maps
2024-11-25 14:28:55 +02:00
Ivan Savenko
c26db41097
Merge pull request #4979 from kambala-decapitator/ios-docs-image
[docs] add referenced image to the repo
2024-11-25 14:00:58 +02:00
Dydzio
f64c6df05c
Merge pull request #4686 from godric3/map_editor_timed_events_objects_removal
Add map editor ui to set objects to remove on timed event
2024-11-25 12:51:25 +01:00
Ivan Savenko
eb14eff13c
Merge pull request #4975 from Laserlicht/third_upgr_8th_dwelling
third upgrade for 8th dwelling
2024-11-25 13:46:36 +02:00
Ivan Savenko
ebf0437f09
Merge pull request #4968 from Laserlicht/fix_window
fix hero window outside of screen
2024-11-25 13:45:45 +02:00
Ivan Savenko
5aa0a0d5b8
Merge pull request #4966 from vcmi/speciall_secondary_skill
Add "special" property for secondary skills
2024-11-25 13:44:59 +02:00
Ivan Savenko
2d18ba6408
Merge pull request #4963 from Laserlicht/randommap_button
fix misaligned button in randommap
2024-11-25 13:42:20 +02:00
Ivan Savenko
72fcf4473a
Merge pull request #4962 from Laserlicht/prism_breath_fix
prism attack fix
2024-11-25 13:41:57 +02:00
Ivan Savenko
7ac9eb4ba6
Merge pull request #4959 from XCOM-HUB/patch-8
Update swedish.ts
2024-11-25 13:41:20 +02:00
Ivan Savenko
98430a67f4
Merge pull request #4957 from IvanSavenko/hd_assets
Added existing HD assets for vcmi mod
2024-11-25 13:40:55 +02:00
Ivan Savenko
d94da01535
Merge pull request #4955 from Laserlicht/popup_fix
fix tavern popup
2024-11-25 13:40:37 +02:00
Ivan Savenko
7d8b753971
Merge pull request #4951 from IvanSavenko/sonar_fix
Fix several new issues detected by SonarCloud
2024-11-25 13:39:56 +02:00
Ivan Savenko
6544f6d6a6
Merge pull request #4944 from IvanSavenko/market_fix
Fixes for configurable markets support
2024-11-25 13:39:20 +02:00
mikeiit
a4db80671a call getPlayerLimit 2024-11-24 19:50:47 -08:00
mikeiit
9cef823330 Revert "max player count update"
This reverts commit f842b5ad91.

Trying another approach
2024-11-24 18:55:35 -08:00
mikeiit
f842b5ad91 max player count update 2024-11-24 17:07:07 -08:00
Ivan Savenko
1116c18af5 Fix Orrin as starting hero on some maps
Fixes a bug that led to Orrin being replaced with a different randomly
selected hero on maps where starting hero is not generated in town, but
pre-placed on map
2024-11-24 20:05:34 +00:00
Andrey Filipenkov
538f844398 [docs] add referenced image to the repo 2024-11-24 22:48:25 +03:00
Ivan Savenko
1b9c6b1763 Add fix for similarly swapped portraits of Wights and Wraiths 2024-11-24 19:47:52 +00:00
Ivan Savenko
2b692c2606 Fix h3 bug: icons of View Earth and View Air are swapped 2024-11-24 19:26:06 +00:00
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