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

..

icons

Implement lasso brush

2022-12-28 01:14:10 +04:00

inspector

Fixed #2022 storing event in map editor

2023-04-19 17:19:09 +04:00

resourceExtractor

Updated according to Ivan's review.

2023-01-20 15:14:52 +02:00

translation

Merge pull request #1659 from macomarivas/spanish_translation

2023-03-16 15:37:23 +02:00

Animation.cpp

vcmi: reduce boost::lexical_cast usage

2023-03-09 16:36:46 +03:00

Animation.h

exportBitmaps now uses QT libs

2022-11-27 19:35:11 +02:00

BitmapHandler.cpp

mapeditor: use vcmi_endian.h

2023-02-03 00:39:44 +03:00

BitmapHandler.h

mapeditor: use vcmi_endian.h

2023-02-03 00:39:44 +03:00

CMakeLists.txt

Fix Spanish translation

2023-03-16 18:42:47 +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

…

graphics.cpp

Apply suggestions from code review

2022-11-29 18:24:03 +02:00

graphics.h

Map editor can be built during single-app build

2022-12-05 22:28:01 +02:00

jsonutils.cpp

Map editor can be built during single-app build

2022-12-05 22:28:01 +02:00

jsonutils.h

Map editor can be built during single-app build

2022-12-05 22:28:01 +02:00

launcherdirs.cpp

…

launcherdirs.h

…

main.cpp

Apply suggestions from code review

2022-10-08 22:55:15 +04:00

mainwindow.cpp

Initial part of dynamically-sized adventure map:

2023-05-09 13:10:33 +03:00

mainwindow.h

Implement map export to image

2023-04-30 12:49:45 +04:00

mainwindow.ui

Implement map export to image

2023-04-30 12:49:45 +04:00

mapcontroller.cpp

Refactor mapController to use precalculated obstacle set.

2023-05-20 10:57:05 +02:00

mapcontroller.h

Refactor mapController to use precalculated obstacle set.

2023-05-20 10:57:05 +02:00

mapeditor.ico

…

mapeditor.rc

…

maphandler.cpp

Merge pull request #1630 from Nordsoft91/fix-1605

2023-03-09 15:53:18 +02:00

maphandler.h

Map editor can be built during single-app build

2022-12-05 22:28:01 +02:00

mapsettings.cpp

Merge remote-tracking branch 'upstream/develop' into vcmi-campaign

2023-04-17 04:54:57 +04:00

mapsettings.h

Add mod management into map editor

2023-04-17 03:01:29 +04:00

mapsettings.ui

Add mod management into map editor

2023-04-17 03:01:29 +04:00

mapview.cpp

Implement lasso brush

2022-12-28 01:14:10 +04:00

mapview.h

Merge 1.1 release into develop

2022-12-23 14:17:18 +02:00

objectbrowser.cpp

Moved road & river handlers into a separate file

2023-01-11 15:17:24 +02:00

objectbrowser.h

Renamed Terrain.h/cpp -> TerrainHandler.h/cpp

2023-01-10 00:01:35 +02:00

playerparams.cpp

Customize colors and teams

2023-04-30 12:49:45 +04:00

playerparams.h

Customize colors and teams

2023-04-30 12:49:45 +04:00

playerparams.ui

Auto-adjust size

2023-04-30 12:49:45 +04:00

playersettings.cpp

Customize colors and teams

2023-04-30 12:49:45 +04: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

Merge pull request #1277 from Nordsoft91/editor-cutcopypaste

2022-12-27 17:28:39 +04:00

scenelayer.h

Merge pull request #1277 from Nordsoft91/editor-cutcopypaste

2022-12-27 17:28:39 +04:00

StdInc.cpp

…

StdInc.h

Attempt to fix compilation

2022-10-16 13:49:47 +04:00

validator.cpp

Add validation for hero duplicate

2023-04-30 12:49:45 +04:00

validator.h

Code polishing

2022-10-13 01:51:55 +04:00

validator.ui

…

vcmieditor.desktop

add Linux icons for the map editor

2022-10-22 23:03:01 +03:00

windownewmap.cpp

Fix teams switching

2023-04-30 12:49:45 +04: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