Ivan Savenko
72858cd0d8
Merge pull request #2768 from IvanSavenko/cherry_picked_fixes
...
(1.3.2) Cherry picked fixes
2023-09-08 13:15:34 +03:00
Alexander Wilms
c0f0211098
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-05 23:57:19 +03:00
nordsoft
32eba61af4
Fix compliling
2023-09-04 13:14:11 +04:00
nordsoft
8b91a1315c
Fix compiling
2023-09-04 03:37:55 +04:00
nordsoft
db32c2387e
Fix hero initialization form random map
2023-09-04 02:58:16 +04:00
nordsoft
d113168db4
Fix neutral objects serializing
2023-09-04 01:42:51 +04:00
nordsoft
385202a02a
Fix abandoned map crash
2023-09-04 01:42:51 +04: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
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
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
