1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-10 00:43:59 +02:00
Commit Graph

594 Commits

Author SHA1 Message Date
Evgeniy Meshcheryakov
d9d7d0ea0d Map editor: Transparency fix 2024-10-03 11:55:58 +03:00
altiereslima
be20469dc1 Update Portuguese Translation 2024-09-30 22:35:19 -03:00
kdmcser
ceb2426c30 do lupdate and update Chinese tranlation 2024-09-24 22:08:31 +08:00
godric3
1b4a8db4c5 Fix build 2024-09-22 00:11:21 +02:00
godric3
f51ef2de4c remove unused item data for artifact/spell/skill items and fix code style 2024-09-21 22:35:04 +02:00
godric3
e61ef459c6 Add all artifacts/spells/skills to quest widget lists and disable banned
Previous code added at most as many items as were in allowed lists, which caused to skip last items if some were banned.
2024-09-21 21:54:29 +02:00
Ivan Savenko
7669f6524b
Merge pull request #4606 from wb180/mapeditor_fix
Added ability to choose road types in editor RMG options
2024-09-18 15:07:55 +03:00
Evgeniy Meshcheryakov
70ef1d76fd Update editor/jsonutils with launcher/jsonutils 2024-09-18 14:52:37 +03:00
Ivan Savenko
72819d5fe3
Merge pull request #4608 from godric3/map-editor-fix-event-regressions
Map editor fix event regressions
2024-09-18 14:15:58 +03:00
godric3
514e81406d extract PlayerColor to QString conversion to helper function 2024-09-17 20:57:05 +02:00
godric3
9baccdeeae map editor: fix event players after conversion to std::set 2024-09-16 20:25:19 +02:00
godric3
8917c753bd adjust town event handling after introducing 8th creature in town 2024-09-16 20:16:36 +02:00
Evgeniy Meshcheryakov
28fea2e552 Map editor: Add road types to RMG options 2024-09-16 17:35:42 +03:00
Evgeniy Meshcheryakov
152f1e0a65 Add editor forms to target_sources, so they become visible in Qt Creator's project tree 2024-09-16 13:31:17 +03:00
altiereslima
34e1a6c198 Map Editor 2024-09-15 20:11:31 -03:00
Evgeniy Meshcheryakov
ecf83757ff Placeholders fix in map validation 2024-09-13 15:02:09 +03:00
Ivan Savenko
d98c6f2e28
Merge pull request #4572 from Fabrice-TIERCELIN/french_update
Update the French translation
2024-09-12 14:16:27 +03:00
Fabrice TIERCELIN
1fdbaf943f Update the French translation 2024-09-10 08:55:10 +02:00
Ivan Savenko
a58e209cbd
Merge pull request #4490 from godric3/fix-campaign-hero-placeholder
Fix campaign hero placeholder
2024-09-09 23:39:20 +03:00
Ivan Savenko
fc89a564fd
Merge pull request #4525 from altiereslima/develop
Update Portuguese Translation
2024-09-05 17:15:23 +03:00
Ivan Savenko
042d3c0265
Merge branch 'develop' into develop 2024-09-05 15:08:21 +03:00
SoundSSGood
30fa2846aa ArtifactUtils::createArtifact ArtifactUtils::createNewArtifactInstance unified 2024-09-04 21:25:55 +03:00
kdmcser
1212fce62c update Chinese translation 2024-08-31 02:31:52 +08:00
kdmcser
d7a504dd86 Regenerated translations 2024-08-31 02:20:07 +08:00
altiereslima
9a7fb79865 Update portuguese.ts 2024-08-27 23:18:37 -03:00
Ivan Savenko
11e8b04ac5
Merge pull request #4463 from SoundSSGood/IMarket-refactoring
IMarket refactoring
2024-08-26 22:48:23 +03:00
Ivan Savenko
a819c3fc29
Merge pull request #4482 from MichalZr6/mapeditor_fixes
Mapeditor refactor, fixes and additional validation checks
2024-08-24 16:18:53 +03:00
godric3
71ec25a4a5 make sonar happier 2024-08-24 13:34:22 +02:00
MichalZr6
0be5a1a2ad Code review followup with additional refactor
Changes following review
2024-08-23 10:43:48 +02:00
MichalZr6
5684db1953 Addressed review feedback
Additional changes after incorporating PlayerColor in `Validator::Validate()`
2024-08-23 09:43:40 +02:00
MichalZr6
a82ce2f96a Fix negative QColor values 2024-08-23 09:43:40 +02:00
godric3
cda66c4196 attempt to fix hero placeholder while reading h3m 2024-08-22 17:09:23 +02:00
godric3
786be6f253 map-editor: add hero placeholder with heroType defined to reservedCampaignHeroes on map save 2024-08-22 16:53:43 +02:00
SoundSSGood
58bb2b58e3 IMarket suggestions
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-08-20 18:49:48 +03:00
kdmcser
a0023e8cdd update Chinese translation 2024-08-19 12:56:45 +08:00
Ivan Savenko
5523e08cb7 Players affected by event is now stored as std::set instead of bitmask 2024-08-14 14:13:49 +00:00
Ivan Savenko
38311244a4
Merge pull request #4402 from Laserlicht/8th_creature
support for 8th creature (Factory)
2024-08-14 17:04:32 +03:00
Ivan Savenko
170330109f
Merge pull request #4415 from godric3/map-editor-validate-spells
map editor: check hero and town spells during mod assessment
2024-08-12 17:20:01 +03:00
godric3
78aa376d50 introduce getModScope into AObjectTypeHandler 2024-08-12 13:58:03 +02:00
godric3
c34956e912 introduce getModScope method toEntity class and subclasses 2024-08-10 16:08:04 +02:00
godric3
18e96171de map editor: check hero and town spells during mod assessment 2024-08-07 21:29:21 +02:00
Laserlicht
1a06a2cc44 basic 8th creature support 2024-08-05 21:15:47 +02:00
godric3
e782d3984f fix some sonarcloud issues 2024-08-01 23:31:06 +02:00
godric3
27f83449f2 PR review fixes:
- change return of `getBuildingVariantsFromModel` to `QVariantList`
- change while to do-while where it makes sense
- moved constants outside of methods
- made building and resources name non editable
2024-08-01 22:36:01 +02:00
godric3
3fb3fef16b use range constructor or QVariantList::fromStdList based on Qt version 2024-07-29 19:03:17 +02:00
godric3
2b9461ed6e use custom roles instead of Qt::UserRole 2024-07-28 22:58:06 +02:00
godric3
d540ee1887 extract magic numbers to constants 2024-07-28 22:57:44 +02:00
godric3
67ab43526f reduce code duplication 2024-07-28 16:28:21 +02:00
godric3
3d3f388fb8 rename TownEvent to TownEventDialog 2024-07-28 16:28:21 +02:00
godric3
fa3fef8a0f change town events to vector + use getDefaultAllowed for spells 2024-07-28 16:28:21 +02:00
godric3
c212b1bf36 map editor: update translation + polish translation 2024-07-28 16:28:21 +02:00
godric3
5578346dac map editor: Allow to customize town events 2024-07-28 16:28:21 +02:00
godric3
7aca2efb35 map editor: Allow to customize town spells 2024-07-28 16:28:21 +02:00
godric3
db1a780030 map editor: fix unchecking when there is more then one child biulding 2024-07-28 16:28:21 +02:00
godric3
5c3c6d4baa map editor: Add bulk actions for buildings in TownBulidingsWidget 2024-07-28 16:28:21 +02:00
godric3
4d1c8bb1b7 map editor: auto update checkboxes of base/upgrade buildings in TownBulidingsWidget 2024-07-28 16:28:21 +02:00
Ivan Savenko
4aa73b40c9 Split CTownHandler into smaller chunks 2024-07-21 18:21:48 +00:00
Ivan Savenko
1aa391fdf8 Split CGeneralTextHandler file into 1 file per class form
All text processing code is now located in lib/texts.
No changes other than code being moved around and adjustment of includes

Moved without changes:
Languages.h           -> texts/Languages.h
MetaString.*          -> texts/MetaString.*
TextOperations.*      -> texts/TextOperations.*

Split into parts:
CGeneralTextHandler.* -> texts/CGeneralTextHandler.*
                      -> texts/CLegacyConfigParser.*
                      -> texts/TextLocalizationContainer.*
                      -> texts/TextIdentifier.h
2024-07-20 12:55:17 +00:00
Ivan Savenko
dc27e8eccb
Merge pull request #4097 from IvanSavenko/render_refactor_2
[1.6] Render refactor
2024-07-19 16:07:54 +03:00
Ivan Savenko
e2af6c0f92
Merge pull request #4295 from Alexander-Wilms/translation-error-messages
Less noise when switching languages in launcher
2024-07-19 15:44:54 +03:00
Ivan Savenko
fd726523a2 Remove creations of custom animations in runtime 2024-07-19 10:08:50 +00:00
Ivan Savenko
2020d96070
Merge pull request #4071 from IvanSavenko/fix_rng_syncronization
[1.6] Fix potential desync if client uses different stdlib with different random number generators
2024-07-19 13:08:09 +03:00
Alexander Wilms
187b7b0517 Show debug message instead of warning if no .qm file for selected language exists 2024-07-18 20:44:24 +02:00
Alexander Wilms
6599db4461 Less noise when switching languages in launcher
* Check if .qm file exists
* Don't call installTranslator() for English

Fixes #4277
2024-07-18 20:44:24 +02:00
Ivan Savenko
d02251f6a8
Merge pull request #4263 from Alexander-Wilms/json-error
JsonParser::parse(): Print file name if there were errors while parsing
2024-07-18 21:28:44 +03:00
Ivan Savenko
662254155a Merge branch 'vcmi/master' into 'vcmi/develop' 2024-07-17 13:57:36 +00:00
Alexander Wilms
434371195d JsonNode constructors: Take fileName as argument
* Don't print JSON in JsonParser::parse() in case of errors
2024-07-17 13:50:59 +02:00
Ivan Savenko
63bcf7d83c Replaced most of usages of CRandomGenerator with vstd::RNG in library 2024-07-16 13:13:07 +00:00
Ivan Savenko
3134d8383c
Merge pull request #4207 from Laserlicht/map_format_additional
[1.6] Map format additional infos
2024-07-16 12:15:58 +03:00
altiereslima
39516b275e Update Portuguese Translation 2024-07-11 19:11:54 -03:00
Ivan Savenko
6b8f94e6e7 Merge remote-tracking branch 'vcmi/master' into develop 2024-07-11 17:43:44 +00:00
Dydzio
0ce96269f2 Update polish translation for launcher and map editor 2024-07-09 21:53:55 +02:00
Ivan Savenko
a98787be43 Regenerated translations 2024-07-09 14:03:50 +00:00
Ivan Savenko
b1a902809e
Merge pull request #4232 from cewbdex/cz-work
Translate cz
2024-07-09 17:02:05 +03:00
Ivan Savenko
af54342792
Merge pull request #4194 from kdmcser/beta
update Chinese translation
2024-07-09 17:01:53 +03:00
Kryštof Černý
e5e5ccb61a mapeditor cz translation work 2024-07-06 16:06:20 +02:00
Gigas002
b328a423a4
Update mapeditor/CMakeLists.txt
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-07-03 14:46:15 +00:00
Laserlicht
0dd36d3c4b
replace deprecated functions 2024-06-29 14:55:56 +02:00
Laserlicht
aa506e33b9 calendar 2024-06-29 14:24:40 +02:00
Laserlicht
caaec71b9f fix 2024-06-29 14:14:21 +02:00
Laserlicht
018127b236 set values for map editor and rmg 2024-06-29 14:01:25 +02:00
Laserlicht
02bd52041b extend map format 2024-06-29 13:13:59 +02:00
gigas002
71025f1aad Remove renamed icons 2024-06-29 00:55:25 +09:00
gigas002
6dcb41ca98 Embed mapeditor resources 2024-06-29 00:53:01 +09:00
Alexander Wilms
31e1d39f92 Fix issues introduced by fixing typos 2024-06-27 08:38:04 +00:00
kdmcser
7cb6194462 update Chinese translation 2024-06-26 22:26:37 +08:00
Alexander Wilms
02e429e973 Fix typos using https://github.com/crate-ci/typos
Changes were reviewed manually
2024-06-24 03:47:19 +02:00
Ivan Savenko
3bea383b59 Merge branch 'vcmi/beta' into 'vcmi/develop' 2024-06-21 12:58:36 +00:00
altiereslima
edf10d8174 Update Portuguese Translation (#4121)
* Update Portuguese Translation
2024-06-19 20:00:25 +00:00
altiereslima
c8aeee764b
Update Portuguese Translation (#4121)
* Update Portuguese Translation
2024-06-19 21:28:46 +03:00
Andrey Filipenkov
b5cc3e8dc6 [editor] fix crash on quit with an opened map 2024-06-13 21:35:30 +03:00
Andrey Filipenkov
9438c5f9f7 code style 2024-06-13 21:35:30 +03:00
Ivan Savenko
3bb7e0fd84
Merge pull request #4091 from Gigas002/mapeditor-embed-resources
Embed translations and icons for mapeditor
2024-06-11 22:23:47 +03:00
Ivan Savenko
b4c6906471 Merge branch 'vcmi/beta' into 'vcmi/develop' 2024-06-11 19:22:23 +00:00
Laserlicht
a7d5f97a80
update german 2024-06-10 21:54:37 +02:00
Ivan Savenko
67a92cf332 Regenerated Qt translations for map editor and launcher 2024-06-10 15:24:53 +00:00
Ivan Savenko
b76c58c0b0 Changed settings location for Qt apps to be in line with main game 2024-06-08 15:31:40 +00:00
gigas002
410ef23a49 Make translation directory before building the mapeditor 2024-06-06 20:33:41 +09:00
gigas002
c8aa8bb18d Fix qt5 mapeditor build 2024-06-06 07:24:49 +00:00
gigas002
2f19133638 Icons renaming refactoring 2024-06-06 02:04:36 +00:00