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

141 Commits

Author SHA1 Message Date
c3957c2c2a Moved json files to new directory, split on per-class basis 2024-02-14 13:08:24 +02:00
7359b66f99 Do not use floating point equality checks 2024-02-14 12:07:07 +02:00
6e399eb21a Make some non-const static variables const or constexpr 2024-02-12 13:22:54 +02:00
1f7e53a609 Code style fixes 2024-01-19 21:21:23 +02:00
bd5682ecc3 Merge remote-tracking branch 'vcmi/master' into develop 2024-01-19 13:49:54 +02:00
a1f4fcb78a hide adventuremap 2024-01-18 00:47:18 +01:00
100664e019 Fix compilation error where gcc 12.1.0 (MinGW) errors with "writing 1 byte into a region of size 0" 2024-01-02 01:43:49 +01:00
858ba22a27 Ignore corrupted .def files 2023-10-31 12:11:41 +02:00
3880ea58b9 Merge branch 'josch/dos2unix' into develop 2023-10-22 18:39:03 +03:00
e03f2a9d3a improvements for non quadratic maps 2023-10-21 16:49:50 +02: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
59acf639da client: render: fixed copy-past errror in genFromJson()
Signed-off-by: Maxim Korotkov <korotkov.maxim.s@gmail.com>
2023-09-27 09:05:58 +03:00
a2174dc83f fix window open while sound playing 2023-09-19 11:20:16 +02:00
063c7f3ca0 move function; optional; json static 2023-09-15 15:27:26 +02:00
0a799ecc46 Merge pull request #2740 from Laserlicht/fix_cursor_issue 2023-09-11 22:20:11 +02:00
2cb28178ae code review 2023-09-10 20:52:35 +02:00
e8453916cf Merge remote-tracking branch 'vcmi/beta' into develop 2023-09-08 18:49:06 +03:00
f39fbe5151 Merge pull request #2757 from IvanSavenko/filesystem_refactor
Filesystem refactor - part 1
2023-09-07 10:51:02 +03:00
f30355839f Fix build 2023-09-05 00:55:54 +03:00
86a7f5f5cd Removed getStr(bool), replaced with similar toString() 2023-09-04 22:21:02 +03:00
1d0e696db6 Added RenderHandler that acts as factory for images and animations 2023-09-04 18:22:34 +03:00
9cfcf5ea19 Fix regressions 2023-09-04 18:22:34 +03:00
0f88b8969b Removed some usages of std string as resource path 2023-09-04 18:22:34 +03:00
8dfdfffd87 Use ResourcePath for audio files 2023-09-04 18:22:34 +03:00
6f0108e462 Use ResourcePath for referencing texts and json's 2023-09-04 18:22:34 +03:00
823ffa7a07 Always use ResourcePath for referencing images and animations 2023-09-04 18:22:34 +03:00
20fd0d8901 fix cursor issue 2023-09-02 18:35:32 +02:00
e1e41d1107 Implement TOPCENTER text alignment 2023-08-30 00:35:31 +02:00
40c7ddcaf4 dim adventuremap 2023-08-29 22:22:22 +02:00
ce20d913e0 Fix checking PlayerColor's for validness 2023-08-27 01:35:38 +03:00
f13a53c1d9 Merge remote-tracking branch 'vcmi/beta' into develop 2023-08-12 17:28:47 +03:00
a4ff408c9d Removed unused code 2023-08-06 13:29:57 +03:00
c8ec0d5419 Added caching for creature icons in garrisons
More complete version of caching will be done for 1.4
Fixes freezes on hero movement when hota mod is used
2023-08-05 14:26:54 +03:00
723c674d81 Merge pull request #2447 from IvanSavenko/modding_handler_refactoring
(develop) Modding handler refactoring
2023-08-02 21:26:05 +03:00
43795c39a5 Replaced all usage of SDL_Color outside of render with ColorRGBA 2023-07-31 21:07:30 +03:00
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
8dc009e2c9 Always show correct game resolution in settings, unaffected by scaling 2023-07-15 16:09:44 +03:00
5143ca266d Moved SDL renderer access to ScreenHandler class 2023-07-07 14:29:03 +03:00
85262cf4f5 Moved CGameState files into a separate directory 2023-06-26 17:15:59 +03:00
f0a154037c Attempt to improve def palette detection 2023-06-20 19:37:27 +03:00
caf627a652 Merge pull request #2207 from IvanSavenko/fix_black_color
Fix colors in def palette turning into transparency unconditionally
2023-06-14 15:48:15 +03:00
krs
0ee1866f73 Added SDLImage::doubleFlip() 2023-06-11 18:45:14 +03:00
61a8c53bb6 Fix colors in def palette turning into transparency unconditionally 2023-06-05 23:51:18 +03:00
8d278e653f Merge pull request #2202 from IvanSavenko/map_objects_reorganization
Map objects code reorganization
2023-06-05 18:35:05 +03:00
8e8601f39d Fix build 2023-06-02 21:54:52 +03:00
d6a357fd17 Split some map object files into smaller files. Reduced includes usage. 2023-06-02 21:47:37 +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
d6d679a38c Fix missing broken shadows on hota map objects 2023-05-15 22:22:54 +03:00
e26b18c139 Rename & cleanup of WindowHandler -> ScreenHandler 2023-05-09 13:10:33 +03:00
a0f1bf3928 Implemented user-selectable UI scaling mode 2023-05-09 13:10:33 +03:00