1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Commit Graph

280 Commits

Author SHA1 Message Date
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