1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Commit Graph

361 Commits

Author SHA1 Message Date
nordsoft
043f54698b Fix translations in map editor / fix crash on game end 2023-10-05 23:34:29 +02:00
nordsoft
766f9cf19f Mistake fix 2023-10-05 22:55:24 +02:00
nordsoft
189f790b44 Translations bugfixes 2023-10-05 22:54:28 +02:00
Ivan Savenko
b75a67ef7c
Merge pull request #2973 from IvanSavenko/identifier_explicit_constructor
Improvements to type safety of Identifier class
2023-10-05 00:33:07 +03:00
Fabrice Tiercelin
99221c2d56 Fix Chinese translation 2023-10-04 21:04:06 +02:00
Ivan Savenko
037efdf5fc Improvements to type safety of Identifier class
- Constructor of Identifier from integer is now explicit
- Lobby hero/town selection now uses Identifiers instead of int's
- Removed serialization workaround for hero portraits
- Added dummy objects for custom heroes portraits for ID resolver to use
- HeroInstance now stores portrait ID only in case of custom portrait
- Fixed loading of campaign heroes portraits on RoE maps
2023-10-04 18:05:23 +03:00
nordsoft
65e63bdf69 Fix text duplicating 2023-10-01 14:04:46 +02:00
nordsoft
f6093a84f0 Add newline symbol 2023-10-01 14:00:08 +02:00
nordsoft
7d56b704a2 Fix events/rumors identifiers 2023-10-01 13:38:16 +02:00
nordsoft
9c5725da66 Convertion finished 2023-10-01 13:32:35 +02:00
nordsoft
4e5580f3d9 Fix typo 2023-10-01 02:39:03 +02:00
nordsoft
e9855de101 Layout fixes 2023-10-01 02:35:02 +02:00
nordsoft
cb02e221f3 Couple fixes 2023-09-30 04:33:41 +02:00
nordsoft
3018178956 Remember folder for images as well 2023-09-30 03:44:13 +02:00
nordsoft
53dadc6dc3 Add map converter 2023-09-30 03:42:29 +02:00
nordsoft
70796d232b Full support of maps translations 2023-09-29 00:24:45 +02:00
nordsoft
ae073ee35d Remove unused identifiers 2023-09-28 23:15:36 +02:00
nordsoft
38d12bbe8c Final changes for map editor translations 2023-09-28 22:48:52 +02:00
nordsoft
ab85e724eb Read-only UI logic for translations 2023-09-28 16:20:21 +02:00
nordsoft
db93b8eaa1 UI draft for map translations 2023-09-28 15:29:43 +02:00
nordsoft
dbf3cad796 Register all text IDs in map editor 2023-09-28 14:49:47 +02:00
nordsoft
98fde9ab1d Add string IDs in map editor 2023-09-28 14:38:31 +02:00
nordsoft
60df49236f Inspector widgets set string ID 2023-09-28 14:03:58 +02:00
nordsoft
232b3e8cf6 Compile map editor 2023-09-28 13:28:37 +02:00
nordsoft
486091a915 Heroes switched to text id 2023-09-28 00:00:32 +02:00
nordsoft
0c94a4d891 Town name switched to id 2023-09-27 23:57:05 +02:00
Nordsoft91
c803b57c33
Merge pull request #2889 from Nordsoft91/mod-compatibility-check
Proper mod compatibility check logic
2023-09-26 19:29:46 +02:00
An Vu
b8eba01b7d add Launcher and Map Editor 2023-09-24 21:09:09 +07:00
nordsoft
dce1ac1538 Redesign mod incompatibility message 2023-09-23 00:32:48 +02:00
nordsoft
a05f8339ae Proper mod compatibility check system 2023-09-21 04:31:08 +02:00
Ivan Savenko
a16d47037e Fix build 2023-09-19 19:24:35 +03:00
nordsoft
2960895041 Issues fixed 2023-09-17 22:19:45 +02:00
nordsoft
a517e6ad8e Message split for pandora box 2023-09-17 18:02:24 +02:00
nordsoft
7b22aefb12 Some minor fixes 2023-09-17 13:03:42 +02:00
nordsoft
10d783d8ee Undefined behavior fix 2023-09-16 05:59:16 +02:00
nordsoft
033e7010ca Fix for empty primary skills array 2023-09-16 05:52:23 +02:00
nordsoft
991a755a1f Added new rewardable widget 2023-09-16 05:34:27 +02:00
nordsoft
06f01c3b82 Seerhut works as rewardable object 2023-09-15 10:06:06 +02:00
nordsoft
574047c55c Start making new serialization for rewardables 2023-09-13 09:18:46 +02:00
nordsoft
6a0b26d402 Object picker for victory/loss conditions 2023-09-11 20:37:26 +02:00
nordsoft
1ac886ca71 Refactor abstract settings to have map controller 2023-09-11 20:37:26 +02:00
nordsoft
3024aaae30 Town picker in player settings implemented 2023-09-11 20:37:26 +02:00
nordsoft
727284c05e Bump editor version 2023-09-11 20:37:26 +02:00
nordsoft
19407954ed Object picker implemented 2023-09-11 20:37:26 +02:00
nordsoft
082e1194ff Little refactoring 2023-09-11 20:37:26 +02:00
nordsoft
94c6adb28c Temporary fix for vic/loss conditions string 2023-09-11 20:37:25 +02:00
nordsoft
a89a8019ab Added skills customization 2023-09-11 20:37:25 +02:00
nordsoft
445e39ad20 Improved inspector 2023-09-11 20:37:25 +02:00
nordsoft
d07fbc2204 Improve bool fields in inspector 2023-09-11 20:37:25 +02:00
nordsoft
5136305455 Fix hero type for random hero 2023-09-11 20:37:25 +02:00
nordsoft
e912a2db38 Better army widget 2023-09-11 20:37:25 +02:00
nordsoft
52cbb613ae Use pragma once 2023-09-09 11:03:19 +02:00
nordsoft
320cd6bf16 Add rumors 2023-09-08 17:54:34 +02:00
nordsoft
0148662847 Merge remote-tracking branch 'upstream/develop' into editor-improvements-1.4
# Conflicts:
#	lib/mapObjects/CGObjectInstance.cpp
2023-09-08 03:22:50 +02:00
nordsoft
ad8d7016b6 Resources in time events 2023-09-08 03:21:31 +02:00
nordsoft
446c61cce1 Timed events implemented 2023-09-08 01:43:01 +02:00
nordsoft
e8b9034149 Add event settings ui 2023-09-07 23:57:56 +02:00
nordsoft
9e14d8d170 Refactoring map settings 2023-09-07 20:19:31 +02:00
Ivan Savenko
f39fbe5151
Merge pull request #2757 from IvanSavenko/filesystem_refactor
Filesystem refactor - part 1
2023-09-07 10:51:02 +03:00
nordsoft
9665ac3373 Refactoring map settings 2023-09-05 03:26:38 +04:00
Ivan Savenko
86a7f5f5cd Removed getStr(bool), replaced with similar toString() 2023-09-04 22:21:02 +03:00
Ivan Savenko
0f88b8969b Removed some usages of std string as resource path 2023-09-04 18:22:34 +03:00
Ivan Savenko
8dfdfffd87 Use ResourcePath for audio files 2023-09-04 18:22:34 +03:00
Ivan Savenko
823ffa7a07 Always use ResourcePath for referencing images and animations 2023-09-04 18:22:34 +03:00
nordsoft
50d89dec24 Fix spells issue in map editor 2023-09-04 14:28:45 +04:00
nordsoft
b7a438e8f4 Fix hero initialization form random map 2023-09-04 14:28:45 +04:00
nordsoft
c3663e4e1b Fix neutral objects serializing 2023-09-04 14:28:45 +04:00
nordsoft
8406e3e4cd Fix abandoned map crash 2023-09-04 14:28:45 +04:00
Alexander Wilms
d2f0a80573
Update VCMI icon (#2672)
* Update VCMI icon

Fixes #1993

Sources will be added to https://github.com/vcmi/vcmi-assets

* Use entire canvas height for shield, add remaining icons

* Use a slighty more saturated brown

* Align VCMI letters to pixel grid for 32px icons

* Align VCMI letters to pixel grid for 48px icon

* Align VCMI letters to pixel grid for 64px icon

* Add 96px icon to .ico

* Update Android and iOS icons

* Install 22px icon on Linux

* Update macOS .icns file

* Add more icons

* Update iOS icons

* Add more sizes to .ico files

* Don't use .png inside .ico

* Only include resolutions up to 256px in .ico files

* Center map editor icon
2023-09-01 22:36:32 +03:00
Ivan Savenko
ce20d913e0 Fix checking PlayerColor's for validness 2023-08-27 01:35:38 +03:00
Ivan Savenko
e54287ea5d Converted remaining identifier to new system 2023-08-25 13:38:02 +03:00
Ivan Savenko
62cd8b12d4 Converted several namespace enums to enum class 2023-08-25 13:38:02 +03:00
Ivan Savenko
17d3d663ee Converted creature ID and spell ID to new form 2023-08-25 13:38:02 +03:00
nordsoft
b1bfc2239f Backward compatibility with mods 2023-08-22 00:32:26 +04:00
Ivan Savenko
f13a53c1d9 Merge remote-tracking branch 'vcmi/beta' into develop 2023-08-12 17:28:47 +03:00
Ivan Savenko
e57f8742cd Rename ambiguos 'clear' to 'clearSlots'
A lot of map objects inherit from CCreatureSet and as result - get
clean() method that resets object army
2023-08-07 19:13:02 +03:00
Ivan Savenko
537f9fa048 Merged master into develop 2023-08-03 23:38:32 +03:00
Dydzio
915283e126 Update polish translations 2023-08-02 21:10:09 +02:00
heroesiiifan
a7fab1099c
Mapeditor translation german update 2023-07-30 20:10:38 +00:00
Ivan Savenko
62fddca21e Split massive CModHandler class/file into multiple parts:
- IdentifierStorage is now a separate handler in VLC
- Renamed ModHandler::Incompatibility exception to ModIncompatibility
- Extracted ModScope namespace from ModHandler
- Extracted ModUtilities namespace from ModHandler
- Split CModHandler.cpp on per-class basis
- Replaced some direct members with unique_ptr to reduce header includes
2023-07-30 22:17:47 +03:00
Ivan Savenko
593b82d178 Removed all references to boost::interprocess library 2023-07-30 20:14:57 +03:00
Ivan Savenko
4d08a131d3 Reorganization of boost filesystem usage
- Removed (most of) boost filesystem namespace usings
- Replaced boost::filesystem::fstream with std::fstream and different
constructor that should be available on any plaftorm
2023-07-28 19:12:04 +03:00
Ivan Savenko
21a39f0b01 Removed boost::iostreams in favor of std::stream / boost::filesystem 2023-07-28 19:12:04 +03:00
Ivan Savenko
b52a21f8ee Regenerated map editor translations to include missing strings 2023-07-28 13:42:53 +03:00
Ivan Savenko
4ba6806a69 Added missing string to Editor translation 2023-07-28 13:42:53 +03:00
Michael
d1f50033c6
German update Lanucher & Mapeditor 2023-07-23 15:56:12 +02:00
Tomasz Zieliński
ad5081f9fe Merge remote-tracking branch 'origin/develop' into ban_stuff_on_water_maps 2023-07-19 12:05:30 +02:00
Fabrice Tiercelin
10793956e0 Mod list view translations 2023-07-17 20:08:05 +02:00
Tomasz Zieliński
025b0814c8 + Handled banning spells and artifacts
+ Rename allowedSpell => allowedSpells
2023-07-17 17:21:28 +02:00
Ivan Savenko
9acab48bc3
Merge pull request #2268 from SoundSSGood/CArtifactInstance-rework
CArtifact CArtifactInstance refactoring
2023-07-11 14:36:08 +03:00
Ivan Savenko
695cae30de
Merge pull request #2300 from dydzio0614/update-translations-2
Launcher & map editor polish translations
2023-07-11 14:35:55 +03:00
Fabrice Tiercelin
2c7ee12c7f Missing validation translations 2023-07-08 20:01:44 +02:00
Dydzio
871f59b12f Launcher & map editor translations 2023-07-08 16:15:24 +02:00
Fabrice Tiercelin
8b96f8bab4 French in-game captions 2023-07-07 07:36:44 +02:00
SoundSSGood
9b5f6ec7cf CArtifact getters setters 2023-07-05 15:48:08 +03:00
Fabrice Tiercelin
a0ee0116f7 French map editor 2023-07-01 11:28:49 +02:00
Ivan Savenko
85262cf4f5 Moved CGameState files into a separate directory 2023-06-26 17:15:59 +03:00
Ivan Savenko
738ace99cb Fix animations in editor which use copy-pasted code from client 2023-06-20 19:37:27 +03:00
Ivan Savenko
d51fe62804 Win/loss condition texts use MetaString 2023-06-20 19:37:27 +03:00
Ivan Savenko
c43783db58 Use string ID's instead of raw strings for win/loss conditions 2023-06-20 19:37:27 +03:00