games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-14 10:12:59 +02:00
Code Issues Releases Activity
17,542 Commits 19 Branches 61 Tags 108 MiB
d4d3ddf685
Commit Graph

553 Commits

Author SHA1 Message Date
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
Ivan Savenko
6f743916db Moved CGCreature to a new file 2023-06-20 19:37:27 +03:00
Ivan Savenko
1e9eea30e1 Merge remote-tracking branch 'soundsgood/CArtHandler-rework' into develop 2023-06-05 18:53:17 +03:00
Ivan Savenko
8d278e653f
Merge pull request #2202 from IvanSavenko/map_objects_reorganization 
Map objects code reorganization
 2023-06-05 18:35:05 +03:00
Ivan Savenko
d6a357fd17 Split some map object files into smaller files. Reduced includes usage. 2023-06-02 21:47:37 +03:00
Ivan Savenko
8ea0ecaec1 show/showAll methods now use Canvas instead of SDL_Surface 
- added compatibility method to Canvas to allow SDL_Surface access
- added drawBorder method to Canvas to replace CSDL_Ext method
- added drawColor method to Canvas to replace CSDL_Ext method
- minor changes to Tavern and Trade windows to adapt to new API
 2023-06-02 16:42:18 +03:00
Ivan Savenko
acac42291e Remove excessive CMap.h includes 2023-05-31 23:18:38 +03:00
Ivan Savenko
62595cb039 Split massive CMap.h a bit 2023-05-31 23:01:57 +03:00
Tomasz Zieliński
67c0fbc240 Merge remote-tracking branch 'origin/develop' into parellel_rmg 
# Conflicts:
#	lib/rmg/modificators/WaterProxy.cpp
 2023-05-20 11:59:39 +02:00
Tomasz Zieliński
ccaece9d71 Refactor mapController to use precalculated obstacle set. 2023-05-20 10:57:05 +02:00
Tomasz Zieliński
cf0515dcd3 Moved Modificators to separate folder 2023-05-20 10:17:37 +02:00
Tomasz Zieliński
73d9f5bd0a Parallel RMG works fine for maps without water. 2023-05-19 20:30:15 +02:00
SoundSSGood
1175990724 fixup 2023-05-19 01:55:11 +03:00
Ivan Savenko
a015bf6507 Initial part of dynamically-sized adventure map: 
- removed no longer used CConfigHandler
- remove no longer use resolutions.json
- moved widget management from adventure map to a separate class
- adventure map layout is now loaded from config
 2023-05-09 13:10:33 +03:00
nordsoft
a507a4c1ec Remove deprecated objects from map editor 2023-05-01 21:49:37 +04:00
nordsoft
51a261b449 Auto-adjust size 2023-04-30 12:49:45 +04:00
nordsoft
e8a8e893ee Export grabs whole map 2023-04-30 12:49:45 +04:00
nordsoft
dee235ea19 Implement map export to image 2023-04-30 12:49:45 +04:00
nordsoft
9aaa8c0d89 Fix teams switching 2023-04-30 12:49:45 +04:00
nordsoft
1de9a57a76 Add validation for hero duplicate 2023-04-30 12:49:45 +04:00
nordsoft
bab84309a5 Support teams in map editor 2023-04-30 12:49:45 +04:00
nordsoft
1899dd97c7 Customize colors and teams 2023-04-30 12:49:45 +04:00
Nordsoft91
f39f208e05
Merge pull request #1915 from Nordsoft91/vcmi-campaign 
VCMI campaigns format
 2023-04-23 19:09:59 +04:00
nordsoft
9ecf16ca23 Fix minor bugs 2023-04-20 03:20:00 +04:00
Necr0o0
ee12685748 Fixed #2022 storing event in map editor 
Fixing issue "Event message isn't stored #2022" by adding message in Pandora setProperty ( cause CGEvent inherits CGPandoraBox)
 2023-04-19 17:19:09 +04:00
Ivan Savenko
4bb4d7e7a5
Merge pull request #1989 from SoundSSGood/refactoring-arts-p1 
Artifact related code refactoring part1 (initial)
 2023-04-19 15:31:11 +03:00
nordsoft
80220fda5b Merge remote-tracking branch 'upstream/develop' into vcmi-campaign 
# Conflicts:
#	lib/mapping/CMap.h
 2023-04-17 04:54:57 +04:00
nordsoft
e4c147db16 Add mod management into map editor 2023-04-17 03:01:29 +04:00
Ivan Savenko
3738171b21 Refactoring of H3M loader to make HotA format support easier 
- extracted low-level reader from MapFormatH3M class
- added separate structure to define version-specific values
- cleared up some H3M format edge cases
- replaced witch hut skill vector with set
- converted several fields to enum type
 2023-04-15 17:20:38 +03:00
SoundSSGood
9a838598a6 arts refactoring part1 2023-04-15 00:10:39 +03:00
nordsoft
94c6c0c262 Add hero limit checkbox in map editor 2023-04-12 02:13:53 +04:00
Ivan Savenko
79b7659097 Fix gcc build 2023-04-12 01:04:27 +03:00
Ivan Savenko
63b197b78a Converted attributes to use c++17 functionality 2023-04-12 01:03:14 +03:00
Ivan Savenko
dfa2e2a349 Merge beta into develop 2023-04-11 19:37:35 +03:00
Konstantin
fedf7d377c vcmi: remove TFaction 
This is a huge change and will break save compatibility
 2023-04-10 19:28:16 +03:00
Ivan Savenko
5046f916d6 Fix filtering of objects by terrain in editor 2023-04-10 14:33:53 +03:00
Konstantin
11b237a23c vcmi: massive refactoring v1 2023-04-05 22:33:12 +03:00
Konstantin
22dd97ad18 vcmi: use entilites when possible part 1 2023-04-04 23:02:54 +03:00
Ivan Savenko
6518e04cd6
Merge pull request #1849 from Nordsoft91/editor-1537 
Allow single player on map and fix player params initialization
 2023-04-04 11:25:11 +03:00
Ivan Savenko
c661419897
Merge pull request #1700 from rilian-la-te/resource-array 
Modernize resourceSet.
 2023-04-02 20:12:45 +03:00
nordsoft
eedd7979aa Allow single player on map and fix player params initialization 2023-04-02 14:31:57 +04:00
Konstantin
6d17b9342d ResourceSet: resolve .at troubles 2023-03-31 14:12:38 +03:00
Andrey Filipenkov
8f638e7ca6 [editor] fix Player Settings crash when random town is added to a map 
fixes #1714
 2023-03-20 11:35:19 +03:00
Ivan Savenko
921c5d647e Fix Spanish translation 2023-03-16 18:42:47 +02:00
Ivan Savenko
35aa6914c5
Merge pull request #1659 from macomarivas/spanish_translation 
Spanish translation
 2023-03-16 15:37:23 +02:00
Asirome
87f4a93b6b
spanish map translation 2023-03-15 20:47:53 +01:00
Ivan Savenko
369e925af8 Loading of translation mods is now skipped on language mismatch 2023-03-14 16:02:16 +02:00
Ivan Savenko
b1d2a2e74f Updated translations 2023-03-14 16:02:16 +02:00
Ivan Savenko
0ea73cae7f
Merge pull request #1662 from rilian-la-te/reduce-lexical-cast 
vcmi: reduce boost::lexical_cast usage
 2023-03-10 12:53:21 +02:00
Ivan Savenko
1ab0295bfb
Merge pull request #1630 from Nordsoft91/fix-1605 
Regression fix for roads in map editor
 2023-03-09 15:53:18 +02:00
Konstantin
5366f9190e vcmi: reduce boost::lexical_cast usage 2023-03-09 16:36:46 +03:00
nordsoft
1451614cf2 Fix erase shortcut 2023-03-06 19:54:13 +04:00
Ivan Savenko
7ef5163d9d
Merge pull request #1581 from IvanSavenko/map_render_rewrite 
Adventure Map - rendering rewrite
 2023-03-05 19:51:07 +02:00
Ivan Savenko
387a7b421a Refactoring of new code, multiple functionality changes: 
- Implemented separate Map View contexts for different map modes
- Puzzle map now works
- Enemy movement now works as in H3
- Removed no longer used code
- Implemented missing embark/disembark sounds
- Fixed view focusing on embarking/disembarking
- Fixed focusing on movement near edge of terra incognita
- Fixed sea movement sound
 2023-03-05 18:02:58 +02:00
Ivan Savenko
ca13e7dedf Implemented terrain palette animatiions. Removed old code 2023-03-05 17:48:02 +02:00
Ivan Savenko
4ec13dc5ab Fix object names in editor 2023-03-05 17:30:38 +02:00
nordsoft
cbb3167166 Regression fix 2023-03-05 00:20:47 +04:00
Konstantin
e4f4eb3c1b vcmi/mapeditor: change source strings 2023-02-14 11:22:27 +03:00
Konstantin
61e61420e9 vcmi/mapeditor: update translations 2023-02-14 02:31:14 +03:00
Konstantin
9675213beb vcmi: fix #1454 
This is fix for this issue.
 2023-02-14 02:18:15 +03:00
nordsoft
f1b348ae87 Suppress warning 2023-02-08 20:09:37 +04:00
nordsoft
06c451c1f5 Fix compiling 2023-02-08 20:09:37 +04:00
nordsoft
da8942ccfb Try to fix compilation 2023-02-08 20:09:37 +04:00
nordsoft
44e195c625 Fix compiling according to latest changes 2023-02-08 20:09:37 +04:00
nordsoft
fac93bb7d6 Address review comments 2023-02-08 20:09:37 +04:00
nordsoft
e0b467e144 Code polishing 2023-02-08 20:09:37 +04:00
nordsoft
447e01aba3 Proper defeat message 2023-02-08 20:09:37 +04:00
nordsoft
5fceb97838 Support few more victory conditions 2023-02-08 20:09:37 +04:00
nordsoft
7f55916a4b Support couple more conditions 2023-02-08 20:09:37 +04:00
nordsoft
a3413eefce Some vic/loss conditions for editor 2023-02-08 20:09:37 +04:00
nordsoft
4e21aab76a Continue working on vicloss conditions 2023-02-08 20:09:37 +04:00
nordsoft
4ce68298d1 Starting work on map settings 2023-02-08 20:09:37 +04:00
Ivan Savenko
9c59025db0 Merge master -> develop 2023-02-03 13:26:44 +02:00
Konstantin
4feab69867 mapeditor: use vcmi_endian.h 
There is no need to redefine this functions, let's use shared
implementation
 2023-02-03 00:39:44 +03:00
Ivan Savenko
49c94c1498
Merge pull request #1522 from rilian-la-te/russia 
Russian translation and Qt6 translation update
 2023-02-01 12:26:35 +02:00
Ivan Savenko
0d60b87f3b Fix assignment of hero type on object creation 2023-01-31 23:43:43 +02:00
Ivan Savenko
42df5626d9 Added Color class to replace SDL_Color 2023-01-30 00:12:43 +02:00
Konstantin
47457e61cc mapeditor: russian translation 
This is a complete russian translation of map editor.
 2023-01-29 22:40:15 +03:00
Konstantin
f577b7240b launcher & editor: use qt_add_translations for Qt6 
This will make possible to run update_translations target on
Qt6 build of VCMI
 2023-01-29 22:40:15 +03:00
Ivan Savenko
b13637cdd5 Fix regressions in RMG & map editor 2023-01-26 23:27:26 +02:00
Ivan Savenko
6c472339ce Refactoring of ObjectClassesHandler 2023-01-26 23:26:49 +02:00
Ivan Savenko
47c1803c42 Finalization of refactoring: 
- Entity interface now has getNameTranslated & getNameTextID methods
- Entity interface no longer has getName method
- removed (most) usages of normalizeIndentifier workaround method
- all moddable objects have identifier in form of mod:name
- all moddable object register strings in form of mod.type.name
 2023-01-20 15:18:36 +02:00
Ivan Savenko
05a1d7c6e3 All text for factions/towns/building are passed through translator 2023-01-20 15:18:36 +02:00
Ivan Savenko
388ed88b5d All artifact strings now pass through translator 2023-01-20 15:18:36 +02:00
Ivan Savenko
d2b837b116 All creature-related texts go through translator 2023-01-20 15:18:36 +02:00
Ivan Savenko
fa6f7513e8 All heroes-related strings are passed through translator 2023-01-20 15:18:36 +02:00
Ivan Savenko
e22f6283c2 Secondary skills strings are now passed through translator 2023-01-20 15:18:36 +02:00
Ivan Savenko
5da407e822 All spell texts are now passed through translator 2023-01-20 15:18:36 +02:00
krs
8d407be67f Updated according to Ivan's review. 2023-01-20 15:14:52 +02:00
krs
05971d5bb5 Resource converter changes after review. 2023-01-20 15:14:52 +02:00
krs
774a8e024c Fixed early return in PcxToPng convertor 
Convertor would abort if no regular file found, instead of continuing to next item.
 2023-01-20 15:14:52 +02:00
krs
8f433d345a Refactored resource Convertor to be more easy on the eyes 
Added a little more documentation to functions.
Not using anymore dyrectory_iterator but directory_entry.
Private functions made a little more generic, extracting some parametrers to higher levels.
Export Bitmaps is no longer tied to SPRITES folder.
 2023-01-20 15:14:52 +02:00
Ivan Savenko
c400416058
Merge pull request #1409 from IvanSavenko/translate_terrain 
Refactoring of terrain handlers
 2023-01-18 00:12:31 +02:00
Ivan Savenko
bafe0c42ce
Merge pull request #1293 from IvanSavenko/translate_launcher 
Translations support - Launcher
 2023-01-17 23:05:14 +02:00
Ivan Savenko
05ac217b0f Merge with vcmi/develop 2023-01-17 23:02:25 +02:00
Ivan Savenko
7a92aa0a06 Fixes for compilation with Qt6 2023-01-17 12:49:33 +02:00
Nordsoft91
ea33fed15c
Merge branch 'develop' into editor-lasso 2023-01-16 21:04:44 +04:00
Ivan Savenko
c252837b6a Fix installation of compiled QM files 2023-01-16 18:02:11 +02:00
Ivan Savenko
246281e62a Merged vcmi/beta with vcmi/develop 2023-01-15 17:46:42 +02:00
Andrey Filipenkov
2f14914120 fix Boost deprecation warnings 
warnings introduced in v1.81

# Conflicts:
#	mapeditor/resourceExtractor/ResourceConverter.cpp
 2023-01-15 17:28:09 +02:00
Ivan Savenko
e48bd39b9c Moved road & river handlers into a separate file 2023-01-11 15:17:24 +02:00
Ivan Savenko
c6d62c6297 Added translatable strings for roads & rivers, for use in editor 2023-01-10 00:01:35 +02:00
Ivan Savenko
4f3ea0d1d9 Renamed Terrain.h/cpp -> TerrainHandler.h/cpp 2023-01-10 00:01:35 +02:00
Ivan Savenko
f51b3bca57 use JsonKey or NameTranslated instead of ambiguos Name 2023-01-10 00:01:35 +02:00
Ivan Savenko
7c7ae26e67 Map/Road/River identifiers are now private members 2023-01-10 00:01:35 +02:00
Ivan Savenko
64885bdf6b Better names for terrain parameters. Support for new movement sounds. 2023-01-10 00:01:35 +02:00
Ivan Savenko
e1799379dd Terrain/Road/River handler are now in compileable state 2023-01-10 00:01:35 +02:00
Ivan Savenko
1468f6aded Converted terrainTypeHandler into proper handler class 2023-01-10 00:01:35 +02:00
Ivan Savenko
d9aab0a847
Merge pull request #1318 from IvanSavenko/translate_mapeditor 
Translate mapeditor
 2023-01-09 21:25:09 +02:00
Ivan Savenko
7a8d85e023 Fix formatting 2023-01-07 16:51:03 +02:00
Ivan Savenko
7a35bcc812
Merge pull request #1221 from IvanSavenko/warnings_fix 
Fix remaining compiler warnings
 2022-12-29 21:51:55 +02:00
Ivan Savenko
ad7944bb83 Fix loading of translations 2022-12-29 17:45:32 +02:00
Ivan Savenko
69b29bdac0 Regenerated translations 2022-12-28 12:55:42 +02:00
Ivan Savenko
d56d01a574 Added Polish translation. Thanks, dydzio 2022-12-28 12:53:26 +02:00
nordsoft
954ea9d5a9 Implement lasso brush 2022-12-28 01:14:10 +04:00
Nordsoft91
37d1e1e748
Merge pull request #1277 from Nordsoft91/editor-cutcopypaste 2022-12-27 17:28:39 +04:00
Ivan Savenko
3df3fd2c14 Fix formatting 2022-12-27 12:29:18 +02:00
Ivan Savenko
2ca454b6c2 Added German translation. Thanks, Laserlicht. 2022-12-27 12:24:39 +02:00
nordsoft
e6f459cbe4 Address naming questions 2022-12-27 04:04:09 +04:00
Ivan Savenko
9598809995 Fix leftover code copy 2022-12-26 23:33:48 +02:00
Ivan Savenko
d1eb3ca121 Moved translations->translation for consistency 2022-12-26 23:30:11 +02:00
Ivan Savenko
a3ee8bb47f Mapeditor will load selected translation on start 2022-12-26 23:29:42 +02:00
Ivan Savenko
a58a0c5a0a Added Ukrainian translation & dummies for other languages 2022-12-26 22:56:58 +02:00
Ivan Savenko
48c53d61f0 Removed non-translatable strings 2022-12-26 22:56:26 +02:00
Ivan Savenko
eb20a4b208 Merge remote-tracking branch 'vcmi/develop' into warnings_fix 2022-12-23 14:40:45 +02:00
Ivan Savenko
f073c676f9 Merge 1.1 release into develop 2022-12-23 14:17:18 +02:00
nordsoft
3a49bc6f8b Fix icons path for macOS if editor started from installed package 2022-12-21 23:03:17 +04:00
nordsoft
4674e240d8 Fix mxe map editor drag'n'drop 2022-12-21 23:02:53 +04:00
Andrii Danylchenko
ee55a21fae
Merge pull request #1190 from Nordsoft91/editor-speedup 
Smart invalidation for move/erase/new object [1.2]
 2022-12-15 12:23:28 +02:00
Andrii Danylchenko
8c07ddbae0
Merge pull request #1204 from IvanSavenko/single_process_app_upgrade 
[1.2] Single process app support for platforms other than ios
 2022-12-15 12:22:24 +02:00
Nordsoft91
be6b5fc0e5
Merge pull request #1195 from Nordsoft91/editor-drapndrop 2022-12-09 12:05:56 +04:00
Ivan Savenko
db2a40600d Fixed some of the warnings detected by CI run 2022-12-08 23:20:42 +02:00
Ivan Savenko
facf77b3ae vstd::unique -> std::unique 2022-12-07 23:36:20 +02:00
Ivan Savenko
3219e322ae Fixed all non-silenced gcc/clang warnings 2022-12-07 18:05:47 +02:00
krs
117496cb23 PCX file conversion in Resource Extractor throws exception on IOS (boost::locale stuff) 2022-12-06 00:49:39 +02:00
Ivan Savenko
b8a3bcc8f1 Map editor can be built during single-app build 
Editor remains as separate .exe in such build, but it won't break
compilation
 2022-12-05 22:28:01 +02:00
nordsoft
aa120fa69f Implemented cut copy paste 2022-12-05 01:32:50 +04:00
nordsoft
2e4b4fbebf Increase opacity for new objects 2022-12-04 20:48:30 +04:00
nordsoft
2489a21ced Fix linux build 2022-12-04 20:48:21 +04:00
nordsoft
fb9711186b Hero experinece set property 2022-12-04 16:58:30 +04:00
nordsoft
bd32bd66b3 Fix hero serialization 2022-12-04 16:58:03 +04:00
nordsoft
9d054f0bd5 Fix editor crash 2022-12-04 16:57:46 +04:00
nordsoft
20d1d346bb Rubber band for selection 2022-12-04 15:38:38 +04:00
nordsoft
8dc0682d81 Drag drop works for objects 2022-12-04 15:38:31 +04:00
nordsoft
bc37ceb7f3 Smart invalidation for move/erase/new object 2022-12-03 23:11:40 +04:00
nordsoft
fc6026969f Fix town building inspector 2022-12-03 20:56:05 +04:00
nordsoft
00789cb0d7 Cleanup undo stack for new map 2022-12-03 20:56:05 +04:00
nordsoft
40300972bc Add undo/redo icons 2022-12-03 20:56:05 +04:00
nordsoft
c290153cd0 Fix crash related to unblocked menu item 2022-12-03 20:56:05 +04:00
nordsoft
522cb00edd Fix crash related to zeros stored in settings 2022-12-03 20:56:05 +04:00
Andrii Danylchenko
82179a9cdb
Merge pull request #1176 from IvanSavenko/tower_shooter_icons 
Tower shooter icons fix
 2022-12-01 12:30:24 +02:00
Andrii Danylchenko
ab365fdaef
Merge pull request #1175 from SoundSSGood/refactoring-art 
Refactoring of artifacts code
 2022-12-01 11:13:31 +02:00
nordsoft
e9e8fdecb5 Update icon for underground toggle 2022-11-30 15:33:59 +04:00
nordsoft
4b8403be4b Add icons into search path 2022-11-30 15:22:53 +04:00
nordsoft
3c4d2a4b92 Add icons for map editor toolbal 2022-11-30 02:59:36 +04:00
SoundSSGood
3bf0cfe4fa
Merge branch 'vcmi:develop' into refactoring-art 2022-11-29 22:34:08 +02:00
SoundSSGood
96d8e952c4 attempt to fix the build 2022-11-29 21:45:37 +02:00
Ivan Savenko
c233e57079
Apply suggestions from code review 
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
 2022-11-29 18:24:03 +02:00
Ivan Savenko
861a6849f9 Added possibility to define per-town tower icon for battle queue in siege 2022-11-29 14:47:51 +02:00
krs
82c1bb5c93 ExtractionOptions extractionOptions is no longer global in mainwindow.h 2022-11-27 19:35:11 +02:00
krs
7aa30a5d7a Fixed extractionOptions formatting. 2022-11-27 19:35:11 +02:00
krs
c32cd190f2 ResourceExtractor code moved to a static class. 2022-11-27 19:35:11 +02:00
krs
8377944fd1 ExtractionOptions removed from MainWindow Class 2022-11-27 19:35:11 +02:00
krs
9b3cab1181 IVCMIDirs::userExtractedPath() created 2022-11-27 19:35:11 +02:00
krs
14b031118c exportBitmaps now uses QT libs 2022-11-27 19:35:11 +02:00
krs
ec1a995218 export bitmaps now by default prepends def name to exported PNG 2022-11-27 19:35:11 +02:00
krs
75b4b64b6f Final checks according to review 2022-11-27 19:35:11 +02:00
krs
d516a5f529 More changes following review. 2022-11-27 19:35:10 +02:00
krs
f0b66b6192 Animation.cpp fixes after review 2022-11-27 19:35:10 +02:00
krs
eecaa20693 Resource extractor "enablers" are now command line options 
In VCMI_lib the extractArchives will be passed all the way down the call chain!
 2022-11-27 19:35:10 +02:00
krs
cca1f074bf Convert PCX to PNG, Final touches, everything deactivated. 2022-11-27 19:35:10 +02:00
krs
d1cdd7d59f Reverted changes made in client for Extractor 2022-11-27 19:35:10 +02:00
krs
10ec486251 Extractor moved to Editor 2022-11-27 19:35:10 +02:00
Nordsoft91
640ebcdca4
Update BitmapHandler.cpp 2022-11-19 01:52:21 +04:00
Nordsoft91
fef3b7652b
Update BitmapHandler.cpp 2022-11-19 01:02:18 +04:00
nordsoft
3e7e29c714 Fixes for pcx 2022-11-19 00:09:28 +04:00
nordsoft
0d9f7d15a2 Fix typo 2022-11-19 00:02:08 +04:00
nordsoft
7bac01f10a More fixes on image loader 2022-11-19 00:01:48 +04:00
nordsoft
3a913140fd Fix loading images 2022-11-18 23:26:19 +04:00
Andrii Danylchenko
8b964be71f
Merge pull request #1111 from GermanAizek/develop 
Code refactor and fix condition bug
 2022-11-15 09:23:16 +02:00
lainon
7fdad4e0f6 Code refactor following C++ standard and condition fixes 2022-11-15 03:20:55 +03:00
Sergei Trofimovich
560c528ec8 mapeditor/mainwindow.cpp: use '%s' (not '%b') for string formatter 
mapeditor/mainwindow.cpp: In member function
      'void MainWindow::onSelectionMade(int, bool)':
    mapeditor/mainwindow.cpp:1014:47:
      warning: format '%b' expects argument of type 'unsigned int',
      but argument 3 has type 'const char*' [-Wformat=]
     1014 |                 auto info = QString::asprintf(
         "Selection on layer %d: %b", level, anythingSelected ? "true" : "false");
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         |                                                    |
         |                                                    const char*
 2022-11-05 20:25:51 +00:00
Andrey Filipenkov
7dcd910877 add Linux icons for the map editor 
Co-authored-by: SoundSSGood <87084363+SoundSSGood@users.noreply.github.com>
 2022-10-22 23:03:01 +03:00
Andrey Filipenkov
278e6bedeb [Linux] add proper desktop entry for the map editor 2022-10-22 17:08:55 +03:00
nordsoft
fe942902df Fix road bug 2022-10-17 02:23:26 +04:00
nordsoft
9ead21326a Partially implement seerhuts 2022-10-17 01:16:27 +04:00
nordsoft
d9819d3a20 Attempt to fix compilation 2022-10-16 15:37:01 +04:00
nordsoft
5bac36ba38 Attempt to fix compilation 2022-10-16 14:22:34 +04:00
nordsoft
4b0815d9db Attempt to fix compilation 2022-10-16 13:49:47 +04:00
nordsoft
3de6569dab Fix rewards nullptr bug 2022-10-16 03:42:21 +04:00
nordsoft
cd28a0791b Fix rewards bug 2022-10-16 03:26:19 +04:00
nordsoft
dd463ca95a Add seerhut rewards 2022-10-16 03:20:24 +04:00
nordsoft
36b87689f9 Enable editor for 32bit platform 2022-10-16 00:20:21 +04:00
nordsoft
29b2a81442 Fix compilation 2022-10-13 01:58:49 +04:00
nordsoft
b4a806d7fa Code polishing 2022-10-13 01:51:55 +04:00
nordsoft
d7de9accee Fix code review problems 2022-10-13 01:40:52 +04:00
nordsoft
d3d1306ef0 Address part of feedback 2022-10-09 00:32:02 +04:00
nordsoft
2eb49315f5 Fix terrains/roads/rivers after code synch 2022-10-09 00:11:29 +04:00
nordsoft
6d92a66fea Fix compilation with latest develop 2022-10-08 23:54:45 +04:00
Nordsoft91
23f80c58dc
Apply suggestions from code review 
Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>
 2022-10-08 22:55:15 +04:00
nordsoft
bc84ffe8d6 Code review changes 2022-09-25 00:55:05 +04:00
nordsoft
700e957cdb Some code cleaning up 2022-09-25 00:53:57 +04:00
nordsoft
061ac414e8 Incorporate changes with scripting 2022-09-22 19:22:31 +04:00
nordsoft
6817cfe2bc Some automation 2022-09-20 03:34:07 +04:00
nordsoft
7d58ede8a9 Revert "Auxiliary commit to revert individual files from c08fce4d65313cb862ea404199be323dcd5c3fd2" 
This reverts commit 1e21c0893404a6ec75c2699213cfb6725c21d4de.
 2022-09-20 02:42:12 +04:00
nordsoft
3a2951b329 Fix events visibility 2022-09-20 02:39:26 +04:00
nordsoft
c08fce4d65 Fix map export 2022-09-20 02:38:10 +04:00
nordsoft
097fe2584b Use ptr to identify rmg template 2022-09-19 03:17:39 +04:00
nordsoft
c348c1a053 Revert "Load template name from user settings" 
This reverts commit 73cc606ee2.

# Conflicts:
#	lib/rmg/CRmgTemplateStorage.cpp
#	lib/rmg/CRmgTemplateStorage.h
#	mapeditor/windownewmap.cpp
 2022-09-19 02:46:01 +04:00
nordsoft
3aa19f92a0 Add seed option to rmg 2022-09-19 02:42:38 +04:00
nordsoft
0563828763 Fix hero initialization for random map 2022-09-18 03:44:52 +04:00
nordsoft
0b9f601d2c Squashing editor 2022-09-18 03:23:17 +04:00