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

345 Commits

Author SHA1 Message Date
3880ea58b9 Merge branch 'josch/dos2unix' into develop 2023-10-22 18:39:03 +03:00
12b179ef1f Merge pull request #3057 from Laserlicht/rw_hero 2023-10-20 01:42:06 +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
464577be28 new icons 2023-10-17 20:06:35 +02:00
efcf6b71d7 formatting 2023-10-15 12:58:07 +02:00
23e1b0b0d5 radial wheel for hero 2023-10-15 02:43:42 +02:00
9e508fe2c2 interface improvements 2023-10-13 19:56:56 +02:00
ab36692847 Merge pull request #3037 from Laserlicht/missing_res 2023-10-13 10:36:33 +02:00
8a3e58cd5e red is the most liked color 2023-10-10 23:15:40 +02:00
926bf71814 make townhall clickable 2023-10-10 21:02:40 +02:00
25f7bb40d0 new layout 2023-10-09 22:50:07 +02:00
fa9d5e9971 show missing resources 2023-10-09 21:43:43 +02:00
b75a67ef7c Merge pull request #2973 from IvanSavenko/identifier_explicit_constructor
Improvements to type safety of Identifier class
2023-10-05 00:33:07 +03:00
037efdf5fc Improvements to type safety of Identifier class
- Constructor of Identifier from integer is now explicit
- Lobby hero/town selection now uses Identifiers instead of int's
- Removed serialization workaround for hero portraits
- Added dummy objects for custom heroes portraits for ID resolver to use
- HeroInstance now stores portrait ID only in case of custom portrait
- Fixed loading of campaign heroes portraits on RoE maps
2023-10-04 18:05:23 +03:00
39a92cdde3 Add query for dwellings dialog 2023-10-04 17:47:12 +03:00
898733eed7 Added Query to track visit duration for Taverns and Markets 2023-10-04 17:47:12 +03:00
42d9ba6c82 Merge pull request #2877 from IvanSavenko/simturn_fixes
Changes for simturns support
2023-09-20 22:09:25 +03:00
2af7d7c085 Ignore garrison update events of another towns for our castleInt 2023-09-19 19:24:35 +03:00
3d04e9c9ed Cleaned up and fixed ownership checks for market netpack 2023-09-18 17:22:30 +03:00
1d0e696db6 Added RenderHandler that acts as factory for images and animations 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
e54287ea5d Converted remaining identifier to new system 2023-08-25 13:38:02 +03:00
0240ee886d Converted (almost) all namespace enum's to enum classes 2023-08-25 13:38:02 +03:00
f13a53c1d9 Merge remote-tracking branch 'vcmi/beta' into develop 2023-08-12 17:28:47 +03:00
ad2bd897d0 Replace boost::format with MetaString
Looks like some of H3 localizations don't have string replacements for
building / war machine name, resulting in exceptions on formatting
attempt. MetaString handles this case silently.
2023-08-11 18:50:39 +03:00
0dca5c45bd Workaround for potential crash on opening town dwelling with no valid
creatures
2023-08-06 12:46:29 +03:00
537f9fa048 Merged master into develop 2023-08-03 23:38:32 +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
5d2dd4c633 Show creature popup window on right-click in town fort 2023-07-30 15:29:18 +03:00
a494dc4870 Refactoring of CGarrisonInt 2023-07-21 15:47:42 +03:00
9ef959a7f8 Merge pull request #2310 from IvanSavenko/left_click_refactor
Left click input refactor
2023-07-13 13:03:06 +03:00
9acab48bc3 Merge pull request #2268 from SoundSSGood/CArtifactInstance-rework
CArtifact CArtifactInstance refactoring
2023-07-11 14:36:08 +03:00
18db944083 Replaced clickReleased with clickPressed where applicable in H3 2023-07-09 17:48:25 +03:00
ca889a5c2a Replaced clickLeft with clickPressed clickReleased methods 2023-07-08 14:33:04 +03:00
ae8579558d Merge pull request #2282 from IvanSavenko/adventure_map_fixes
Adventure map fixes for 1.3
2023-07-07 14:27:58 +03:00
6414e3b3fc Changed resource cost value label position 2023-07-05 18:43:52 -07:00
9b5f6ec7cf CArtifact getters setters 2023-07-05 15:48:08 +03:00
8b61c0d59b Replaced CIntObject::type bitfield with bool's. Added input blocking. 2023-07-03 19:24:12 +03:00
f6b2f58da9 Use inheritance instead of composition for campaign header 2023-06-26 17:15:59 +03:00
a08fe09517 Added encapsulation for CampaignState class 2023-06-26 17:15:59 +03:00
8420a90aa4 Reorganization of campaigns code 2023-06-26 17:15:59 +03:00
d1e5a347ff Refactoring of campaign handler: rename types and use strong typing 2023-06-26 17:15:59 +03:00
4e7412faa6 Split mouseDragged event from mouseMoved 2023-06-22 22:11:48 +03:00
563d7dd41f Renamed RCLICK -> SHOW_POPUP 2023-06-20 19:58:05 +03:00
d4aa778547 Replaced clickRight event with showPopupWindow/closePopupWindow 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
a4000f2fc8 Removed isActive(int) method since its usages were redundant or wrong 2023-05-20 01:51:49 +03:00
1f513fd280 Extracted event management from GuiHandler and CIntObject 2023-05-20 01:51:49 +03:00
ad3e54e6c0 Reduced usage of topWindow() method 2023-05-16 21:57:45 +03:00
e2ef136003 Renamed "Int" -> "Window" in WindowHandler API 2023-05-16 19:10:22 +03:00