1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Commit Graph

73 Commits

Author SHA1 Message Date
e72817c866 Added existing HD assets for vcmi mod
Some of our custom assets were actually made in high resolution, and
then - greatly downscaled for use in vcmi.

This PR adds (some of) these assets using recently introduced HD assets
loading support. None of these were upscaled, but rather downscaled from
existing high-resolution version.

Following assets were added:
- vcmi icon for map format - based on our main logo, with no text
- 'defend' icon for stack queue - now also based on our logo, with no
text and sepia effect
- 'wait' icon for stack queue - added only x2 version. Was actually
already present in vcmi mod, but unused.
- icons for creature window (attack/defense/hit points/etc) - it was
based on existing CC0 asset
- 'gear' icon for settings - made from scratch by me.

Will also upload all of these assets in their original resolution to
vcmi-assets repository.
2024-11-22 16:46:48 +00:00
97f1a310df Fix miscellaneous issues discovered by Sonar 2024-08-12 18:26:30 +00:00
136f33f950 quickspell improvements 2024-07-26 20:11:14 +02:00
4533271692 Merge pull request #4312 from IvanSavenko/texthandler_split
Split CGeneralTextHandler file into 1 file per class form
2024-07-21 13:49:14 +03:00
1aa391fdf8 Split CGeneralTextHandler file into 1 file per class form
All text processing code is now located in lib/texts.
No changes other than code being moved around and adjustment of includes

Moved without changes:
Languages.h           -> texts/Languages.h
MetaString.*          -> texts/MetaString.*
TextOperations.*      -> texts/TextOperations.*

Split into parts:
CGeneralTextHandler.* -> texts/CGeneralTextHandler.*
                      -> texts/CLegacyConfigParser.*
                      -> texts/TextLocalizationContainer.*
                      -> texts/TextIdentifier.h
2024-07-20 12:55:17 +00:00
d59a5dad7d Merge pull request #4299 from Laserlicht/input_modi_detection
input mode detection
2024-07-20 12:51:08 +03:00
a8a330f39f Remove unused code and no longer needed caching 2024-07-19 10:08:50 +00:00
ac30f7757b changed naming 2024-07-19 11:41:00 +02:00
26b164b7ca change naming 2024-07-19 03:44:45 +02:00
5dae5ed30e input modi detection 2024-07-19 03:00:19 +02:00
f0435d8b8e small fix 2024-07-17 13:48:00 +02:00
f54b84ead9 use spellbook to select 2024-07-17 13:20:17 +02:00
b8d872aa60 mobile adjustments 2024-07-17 04:24:27 +02:00
1daf6dfad1 make hideable 2024-07-16 23:36:23 +02:00
37b5de689a move to left side 2024-07-16 22:47:40 +02:00
49cb985452 try to fix ci 2024-06-21 21:29:19 +02:00
53a1bf2051 add spell cast 2024-06-21 21:29:19 +02:00
e4dfca9f3d disable correctly 2024-06-21 21:26:10 +02:00
1a8a14a56d selectable fix 2024-06-21 21:26:10 +02:00
989394de53 Selectionwindow 2024-06-21 21:25:14 +02:00
814241e836 converted to window 2024-06-21 21:25:14 +02:00
1f6e0fae7d quickspell draft 2024-06-21 21:25:14 +02:00
b8beb4fb13 Fixes for various minor issues detected by Sonar Cloud 2024-06-01 11:48:30 +00:00
d08c7b7b8f Added VideoWidget to hide implementation details 2024-05-15 17:05:16 +00:00
f596fbc9b3 Apply suggestions from code review
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-05-14 12:44:08 +02:00
e06c09d709 battle log expansion 2024-05-14 02:50:57 +02:00
07d201502e Refactoring of button class to prepare for configurable button 2024-02-29 13:57:25 +02:00
aa2fc4b88a adjustable queue size for embedded queue 2024-02-01 20:38:38 +01:00
7ddc87f4a2 removed unused param; optimized pos 2024-01-29 21:11:18 +01:00
f4bff876d5 make queue interactable 2024-01-07 16:38:37 +01:00
a9005da01e Merge pull request #3366 from Laserlicht/battle_informations
Battle stacks informations
2023-12-28 12:39:26 +02:00
c540dd1183 round_counter 2023-12-23 19:57:19 +01:00
7a541c7a42 implement spells 2023-12-23 14:51:26 +01:00
8c14509d72 spell area 2023-12-23 03:32:42 +01:00
56e1265097 use stacks 2023-12-22 22:26:35 +01:00
72911ec9a3 Army window 2023-12-22 21:26:40 +01:00
a1a5bc28c2 convert line endings from CRLF (Windows) to LF (Linux/Unix)
Mixed line endings cause problems when exporting patches with
git-format-patch and then trying to "git am" a patch with mixed and
non-matching line endings. In such a situation git will fail to apply
the patch.

This commit runs the dos2unix tools on the remaining files with CRLF
(\r\n) line endings to convert them to line-feeds (\n) only.

Files that are Windows specific like *.vcxproj and *.props files were
not converted.

Closes: #3073
2023-10-19 16:23:21 +02:00
7ef9e91741 new approach 2023-10-08 21:19:04 +02:00
43795c39a5 Replaced all usage of SDL_Color outside of render with ColorRGBA 2023-07-31 21:07:30 +03:00
05735a20e1 Fix for hero info window mana points not getting spent on spellcast 2023-07-22 15:32:00 +02:00
48a72f90f7 Add option for persistent hero info window as in HD mod 2023-07-17 23:25:16 +02:00
0be9aff99f Fix battle queue stack highlighting 2023-06-20 19:58:05 +03:00
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
8a31aeb94b Battle animations use tick() for updates 2023-05-14 22:23:00 +03:00
7a5775a9f9 vcmi: use std::optional 2023-04-17 00:43:13 +03:00
ce3028bd73 Intermediate commit 2023-04-06 19:34:07 +04:00
f09897b2b4 Remove unnecessary redraws 2023-03-05 19:51:42 +02:00
7e409df3cb Apply manual changes from code review 2023-02-18 16:35:07 +01:00
fc7d2b9778 Merge remote-tracking branch 'origin/develop' into settings-rework 2023-02-12 11:55:21 +01:00
64faa13b6d Merge pull request #1487 from IvanSavenko/battle_actions_refactoring
Battle actions refactoring
2023-02-03 11:28:14 +02:00