510 Commits

Author	SHA1	Message	Date
Dydzio	c2ef3331ef	Change main settings tabs to toggle group + fix json commas	2023-02-16 21:37:37 +01:00
Dydzio	9101f05835	Fixes for new battle settings	2023-02-15 22:38:41 +01:00
Dydzio	775db89241	Fix battle settings UI labels, add "dont show battle intro" setting	2023-02-15 20:29:29 +01:00
Dydzio	1d153f4ee9	"ForceMovementInfo" support + make other settings tab	2023-02-14 23:45:45 +01:00
Dydzio	be9c71934c	Merge remote-tracking branch 'origin/develop' into settings-rework	2023-02-14 21:00:17 +01:00
Dydzio	fb06aca0bb	Further progress - UI tweaks, new settings etc	2023-02-14 20:30:06 +01:00
Ivan Savenko	91b17bed79	Partial encapsulation of AdvMapInt	2023-02-14 11:18:42 +02:00
Ivan Savenko	e15c7dcd33	Attempt at better encapsulation of CTerrainRect	2023-02-14 11:18:41 +02:00
Ivan Savenko	cc0c3e5bc9	All adventure map components now use shared_ptr	2023-02-14 11:18:41 +02:00
Ivan Savenko	f8c1c46562	removed CAdvMapInt::handleRightClick method	2023-02-14 11:18:41 +02:00
Ivan Savenko	d0f57fed6f	Cleaned up code of Minimap	2023-02-14 11:18:41 +02:00
Dydzio	80a5595d6c	Adding some settings options, minor UI fixes	2023-02-13 23:53:28 +01:00
Dydzio	de5138c854	Basic separation of adventure map & general tabs	2023-02-12 19:25:59 +01:00
Dydzio	58bed920b4	Sort out settings files structure	2023-02-12 17:49:41 +01:00
Dydzio	7430616ada	Move settings to separate subfolder	2023-02-12 17:29:23 +01:00
Konstantin	6d8eac320d	vcmi/client: add missing include to GUIclasses.cpp ... Fix building with clang++ version 15.	2023-02-12 19:11:24 +03:00
Dydzio	34227a0dab	Integrate new settings with battle UI	2023-02-12 15:49:17 +01:00
Dydzio	2f171fcc0e	Merge branch 'develop' into settings-rework	2023-02-12 15:03:33 +01:00
Dydzio	ee186f3839	Conversion of battle settings to configurable interface	2023-02-12 13:51:57 +01:00
Ivan Savenko	c8c38ac922	Merge pull request #1386 from IvanSavenko/resolutions_filter ... Do not allow selecting resolutions not supported by display	2023-02-12 14:33:39 +02:00
Dydzio	319d05b94f	Missing merge conflict stuff	2023-02-12 12:05:12 +01:00
Dydzio	11df79dc2a	Minor formatting	2023-02-12 11:55:39 +01:00
Dydzio	fc7d2b9778	Merge remote-tracking branch 'origin/develop' into settings-rework	2023-02-12 11:55:21 +01:00
Ivan Savenko	ab8b407294	Style cleanup	2023-02-08 13:56:09 +02:00
Ivan Savenko	62151cd20c	Replaced genRect with Rect constructor call	2023-02-03 19:17:59 +02:00
Ivan Savenko	34dcb4127a	Removed text utilities from SDL_Extensions	2023-02-03 18:55:25 +02:00
Ivan Savenko	7c58a46279	Removed some instances of access to screen surface	2023-02-03 18:23:53 +02:00
Ivan Savenko	70c0937972	Moved SDL-specific code to SDL_Extensions	2023-02-03 13:02:05 +02:00
Ivan Savenko	01322aa4c5	Do not allow selecting resolution no supported by display	2023-02-03 12:57:38 +02:00
Ivan Savenko	9833edcf73	Removed using namespace SDL_Ext	2023-02-03 11:39:40 +02:00
Ivan Savenko	d87fb43dcd	Replaced SDL access with VCMI methods	2023-02-03 11:39:40 +02:00
Ivan Savenko	3fef2a5e1f	Moved Colors to a separate file, updated includes	2023-02-03 11:39:40 +02:00
Ivan Savenko	cfcaf5cbb6	renamed keyDown -> keyPressed	2023-02-03 11:39:40 +02:00
Ivan Savenko	e1bd0d2a04	API for custom events no longer requires SDL access	2023-02-03 11:39:40 +02:00
Ivan Savenko	d4fba3787c	Removed usage of SDL_KeyboardEvent from UI code	2023-02-03 11:39:40 +02:00
Ivan Savenko	6669ffd4b3	Moved input-related code from SDL_Extensions to GuiHandler	2023-02-03 11:39:40 +02:00
Ivan Savenko	214fc19e74	CIntObject now receives mouse position as point instead of SDL event	2023-02-03 11:39:39 +02:00
Dydzio	5a08ec04fe	Initial split of BattleOptionsWindow	2023-02-02 17:17:16 +01:00
Dydzio	d04c53e7e0	Merge branch 'develop' into settings-rework	2023-02-02 11:55:13 +01:00
Ivan Savenko	108a42e4ba	Reorganized includes for new layout. New class - IImageLoader	2023-02-01 20:42:06 +02:00
Ivan Savenko	8a9492d129	Moved client files to more suitable locations	2023-02-01 13:09:19 +02:00
Ivan Savenko	0ba74fea73	Merge pull request #1515 from IvanSavenko/time_based_animations ... Time based animations	2023-02-01 12:25:54 +02:00
Dydzio	88744633de	Move buttons from mainOptions to SystemOptionsWindow	2023-01-30 23:26:33 +01:00
Dydzio	cc9d65a341	Make battle settings callable without battle, save last settings tab	2023-01-30 22:15:37 +01:00
Dydzio	9dd692cea4	Initial draft of tabbed settings window	2023-01-30 20:18:59 +01:00
Ivan Savenko	5cc23cc286	Renamed SDL_Pixels -> SDL_PixelAccess due to similar SDL header	2023-01-30 20:06:08 +02:00
Ivan Savenko	9c3030603d	Removed most SDL includes from headers, removed SDL int's	2023-01-30 19:55:32 +02:00
Ivan Savenko	e14290fde0	Removed loading of images from file into SDL_Surface	2023-01-30 18:25:47 +02:00
Ivan Savenko	87218c63c4	CPicture now uses IImage internally	2023-01-30 17:18:59 +02:00
Ivan Savenko	e35a669eeb	Refactoring of CPicture class to improve encapsulation	2023-01-30 13:58:13 +02:00