1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
vcmi/mapeditor
Tomasz Zieliński e105b23a37 Merge remote-tracking branch 'origin/develop' into fix_rmg_teams
# Conflicts:
#	Mods/vcmi/config/vcmi/rmg/heroes3/newcomers.JSON
#	Mods/vcmi/config/vcmi/rmg/heroes3/southOfHell.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/2sm0k.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/2sm2i(2).JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/3sb0b.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/3sb0c.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/5sb0a.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/5sb0b.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/7sb0b.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/7sb0c.JSON
#	client/lobby/RandomMapTab.cpp
2023-10-30 20:08:13 +01:00
..
icons Add line and fill brushes 2023-10-14 02:58:13 +02:00
inspector mapeditor/inspector/inspector.cpp: Directly assign to the "std::optional", without dereferencing it. 2023-10-28 10:16:33 +00:00
mapsettings Fix translations in map editor / fix crash on game end 2023-10-05 23:34:29 +02:00
resourceExtractor Always use ResourcePath for referencing images and animations 2023-09-04 18:22:34 +03:00
translation some spelling fixes 2023-10-18 01:41:02 +02:00
Animation.cpp Add portraits delegate 2023-10-13 20:15:29 +02:00
Animation.h Fix animations in editor which use copy-pasted code from client 2023-06-20 19:37:27 +03:00
BitmapHandler.cpp Always use ResourcePath for referencing images and animations 2023-09-04 18:22:34 +03:00
BitmapHandler.h mapeditor: use vcmi_endian.h 2023-02-03 00:39:44 +03:00
CMakeLists.txt Add portraits delegate 2023-10-13 20:15:29 +02:00
generatorprogress.cpp Code review changes 2022-09-25 00:55:05 +04:00
generatorprogress.h Code review changes 2022-09-25 00:55:05 +04:00
generatorprogress.ui Squashing editor 2022-09-18 03:23:17 +04:00
graphics.cpp Merge pull request #2757 from IvanSavenko/filesystem_refactor 2023-09-07 10:51:02 +03:00
graphics.h Add portraits delegate 2023-10-13 20:15:29 +02:00
jsonutils.cpp Reorganization of boost filesystem usage 2023-07-28 19:12:04 +03:00
jsonutils.h Map editor can be built during single-app build 2022-12-05 22:28:01 +02:00
launcherdirs.cpp Squashing editor 2022-09-18 03:23:17 +04:00
launcherdirs.h Squashing editor 2022-09-18 03:23:17 +04:00
main.cpp Apply suggestions from code review 2022-10-08 22:55:15 +04:00
mainwindow.cpp #1912 trap, exception on adding duplicating hero 2023-10-29 11:03:37 +02:00
mainwindow.h Add line and fill brushes 2023-10-14 02:58:13 +02:00
mainwindow.ui Fixes for map editor 2023-10-24 23:58:26 +02:00
mapcontroller.cpp Redesign map editor rendering 2023-10-20 01:25:06 +02:00
mapcontroller.h Convertion finished 2023-10-01 13:32:35 +02:00
mapeditor.ico Squashing editor 2022-09-18 03:23:17 +04:00
mapeditor.rc Squashing editor 2022-09-18 03:23:17 +04:00
maphandler.cpp Redesign map editor rendering 2023-10-20 01:25:06 +02:00
maphandler.h Redesign map editor rendering 2023-10-20 01:25:06 +02:00
mapview.cpp Fixes for map editor 2023-10-24 23:58:26 +02:00
mapview.h Add line and fill brushes 2023-10-14 02:58:13 +02:00
objectbrowser.cpp Add more object search flexibility 2023-10-14 03:16:17 +02:00
objectbrowser.h Renamed Terrain.h/cpp -> TerrainHandler.h/cpp 2023-01-10 00:01:35 +02:00
playerparams.cpp Improvements to type safety of Identifier class 2023-10-04 18:05:23 +03:00
playerparams.h Town picker in player settings implemented 2023-09-11 20:37:26 +02:00
playerparams.ui Object picker implemented 2023-09-11 20:37:26 +02:00
playersettings.cpp Remove excessive CMap.h includes 2023-05-31 23:18:38 +03:00
playersettings.h Code polishing 2022-10-13 01:51:55 +04:00
playersettings.ui Allow single player on map and fix player params initialization 2023-04-02 14:31:57 +04:00
scenelayer.cpp Redesign map editor rendering 2023-10-20 01:25:06 +02:00
scenelayer.h Add object lock and zoom functinoality 2023-10-13 11:07:17 +02:00
StdInc.cpp convert line endings from CRLF (Windows) to LF (Linux/Unix) 2023-10-19 16:23:21 +02:00
StdInc.h convert line endings from CRLF (Windows) to LF (Linux/Unix) 2023-10-19 16:23:21 +02:00
validator.cpp Proper mod compatibility check system 2023-09-21 04:31:08 +02:00
validator.h Remove excessive CMap.h includes 2023-05-31 23:18:38 +03:00
validator.ui Squashing editor 2022-09-18 03:23:17 +04:00
vcmieditor.desktop add Linux icons for the map editor 2022-10-22 23:03:01 +03:00
windownewmap.cpp Works more or less 2023-10-28 20:30:38 +02:00
windownewmap.h Support teams in map editor 2023-04-30 12:49:45 +04:00
windownewmap.ui Support teams in map editor 2023-04-30 12:49:45 +04:00