3754 Commits

Author	SHA1	Message	Date
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	89c29206f1	Internal classes of mapHandler are now in global namespace	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
Andrii Danylchenko	9f55666931	rework netpacks to avoid double typeinfo	2023-02-13 20:26:39 +02:00
SoundSSGood	0f93b0991c	Regression fixed	2023-02-13 15:16:42 +02:00
SoundSSGood	8504102c53	Merge branch 'vcmi:develop' into contitutient-swap	2023-02-13 09:51:42 +02:00
Andrii Danylchenko	e6b21ed298	Merge pull request #1574 from SoundSSGood/contitutient-move ... combined art move	2023-02-13 08:30:35 +02:00
SoundSSGood	2976739c97	some refactoring	2023-02-12 21:27:37 +02:00
Dydzio	de5138c854	Basic separation of adventure map & general tabs	2023-02-12 19:25:59 +01:00
SoundSSGood	34a0dbc0b6	misc slots. fixed combined arts moving	2023-02-12 20:13:26 +02: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
Konstantin	3cf303f1c7	vcmi/client: make ColorRGBA constexpr ... 1. Replace overflowing int3 to ColorRGBA, which is more semantically correct 2. Make ColorRGBA constexpr, to make sure than hardcoded colors can be initialized in compile time	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	4a0a82ceb4	Merge pull request #1553 from IvanSavenko/sdl_cleanup ... SDL usage cleanup	2023-02-08 18:14:15 +02:00
Ivan Savenko	ab8b407294	Style cleanup	2023-02-08 13:56:09 +02:00
Dydzio	a4cc386a5a	Apply suggestions from code review ... Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>	2023-02-05 20:24:36 +01:00
nordsoft	fd6987ea0a	Fix alternative actions button redraw	2023-02-05 03:29:50 +04: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	ae9f040abf	removed unused method	2023-02-03 11:42:27 +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	aab082fd2e	Remove remaining access to SDL_Events	2023-02-03 11:39:40 +02:00
Ivan Savenko	594b7614cf	Fix CI build	2023-02-03 11:39:40 +02:00
Ivan Savenko	cfcaf5cbb6	renamed keyDown -> keyPressed	2023-02-03 11:39:40 +02:00
Ivan Savenko	b1821d4442	Removed some SDL access from non-SDL code	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	860fe43131	Merged two mouse button enums	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
Ivan Savenko	58cfddccaa	Merge pull request #1546 from rilian-la-te/dead-code-removal ... Remove SDL usage from VCMI library	2023-02-03 11:28:29 +02:00
Ivan Savenko	64faa13b6d	Merge pull request #1487 from IvanSavenko/battle_actions_refactoring ... Battle actions refactoring	2023-02-03 11:28:14 +02:00
Konstantin	88ef83db53	client: remove SDL_BYTEORDER usage ... Make use of CMake endian checking in this places too.	2023-02-03 00:37:37 +03:00
Dydzio	e7a774c465	Improve creature numbers handling in castle interface bottom left part	2023-02-02 20:54:47 +01:00
Dydzio	2ef33d54ab	Merge branch 'develop' into battle-queue-improvement	2023-02-02 18:26:31 +01:00
Dydzio	5a08ec04fe	Initial split of BattleOptionsWindow	2023-02-02 17:17:16 +01:00
Ivan Savenko	2ac997d8a9	Fix "holding" animation speed	2023-02-02 14:37:34 +02:00
Ivan Savenko	731f7b0578	Fix opening spellbook via clicking on hero	2023-02-02 14:37:16 +02:00
Ivan Savenko	1e09c39c0e	Fix battle cursor after attack command	2023-02-02 14:36:58 +02:00
Ivan Savenko	3c8a0b9e70	Add missing text	2023-02-02 13:43:20 +02:00
Ivan Savenko	9678296875	Hero interaction is now battle action	2023-02-02 13:43:19 +02:00
Ivan Savenko	d3c85a19cb	Merged CClickableHex class into BattleFieldController	2023-02-02 13:35:57 +02:00
Ivan Savenko	c3b79c786b	Spellcasters UI now shares handling with hero spellcasting	2023-02-02 13:25:55 +02:00
Ivan Savenko	f150ced14c	All spellcasters should work correctly now	2023-02-02 13:25:55 +02:00
Ivan Savenko	55a58596bc	Mostly finished refactoring of BattleActionsController ... TODO: test actions TODO: test casters TODO: fix random casters	2023-02-02 13:25:55 +02:00
Ivan Savenko	a2035122e1	Removed makingTurn variable	2023-02-02 13:25:55 +02:00
Ivan Savenko	4d62bf22f2	Removed no longer used code	2023-02-02 13:25:55 +02:00
Dydzio	d04c53e7e0	Merge branch 'develop' into settings-rework	2023-02-02 11:55:13 +01:00
Ivan Savenko	34772ef830	Fixed includes	2023-02-01 21:45:06 +02:00
Ivan Savenko	108a42e4ba	Reorganized includes for new layout. New class - IImageLoader	2023-02-01 20:42:06 +02:00
Ivan Savenko	84dfcacafd	Updated CMakeLists and file headers	2023-02-01 16:42:03 +02:00
Ivan Savenko	4d8d886317	Move all created files into better locations	2023-02-01 16:28:48 +02:00
Ivan Savenko	ae968d1865	Remove duplicated code from new files	2023-02-01 16:12:01 +02:00
Ivan Savenko	5cc0de2fc6	Finish CAnimation split	2023-02-01 16:04:14 +02:00
Ivan Savenko	f6fa7f1ae0	temp rename	2023-02-01 16:03:48 +02:00
Ivan Savenko	54a95efc4d	split CFadeAnimation into separate file	2023-02-01 16:03:17 +02:00
Ivan Savenko	3a88e7ce07	split CDefFile into separate file	2023-02-01 16:02:33 +02:00
Ivan Savenko	eef5876069	split SDLImageLoader into separate file	2023-02-01 16:01:47 +02:00
Ivan Savenko	d593b88713	split SDLImage into separate file	2023-02-01 16:00:32 +02:00
Ivan Savenko	f5cd6a9abe	split IImage into separate file	2023-02-01 15:59:52 +02:00
Ivan Savenko	dfbcfb7b3c	Remove duplicated code from new files	2023-02-01 15:56:44 +02:00
Ivan Savenko	3f1b1095e2	Finish split of cursors files	2023-02-01 15:50:36 +02:00
Ivan Savenko	769d4b3bfb	temporary rename	2023-02-01 15:50:12 +02:00
Ivan Savenko	bdc2d0c920	Split CursorSoftware into a new file	2023-02-01 15:48:59 +02:00
Ivan Savenko	418fd1491b	Split CursorHardware into a new file	2023-02-01 15:48:06 +02:00
Ivan Savenko	67e7731752	Split ICursor into a new file	2023-02-01 15:45:22 +02:00
Ivan Savenko	bfec00b022	Remove duplicated code in new files	2023-02-01 15:42:21 +02:00
Ivan Savenko	0ac411b5a0	Finalize split of Fonts.h/cpp	2023-02-01 15:38:24 +02:00
Ivan Savenko	3da4c9bb25	Moved CBitmapHanFont to a separate file	2023-02-01 15:36:38 +02:00
Ivan Savenko	aab7e0a5ed	Moved CTrueTypeFont to a separate file	2023-02-01 15:35:52 +02:00
Ivan Savenko	1884c409f9	Moved CBitmapFont to a separate file	2023-02-01 15:34:50 +02:00
Ivan Savenko	730b8e3fc2	Moved IFont to a separate file	2023-02-01 15:33:51 +02:00
Ivan Savenko	bfea28b2b5	Remove duplicated code from changed files	2023-02-01 15:24:43 +02:00
Ivan Savenko	18adcdda14	Finish CAdvmapInterface split	2023-02-01 15:17:57 +02:00
Ivan Savenko	6fd1b9927c	Restore CAdvMapInterface	2023-02-01 15:17:20 +02:00
Ivan Savenko	37d6d21e73	Moved CResDataBar into a separate file	2023-02-01 15:17:14 +02:00
Ivan Savenko	aaf981a6dc	Restore CAdvMapInterface	2023-02-01 15:16:07 +02:00
Ivan Savenko	540921b96d	Moved CAdventureOptions into a separate file	2023-02-01 15:15:52 +02:00
Ivan Savenko	1078c4acb6	Restore CAdvMapInterface	2023-02-01 15:14:52 +02:00
Ivan Savenko	5e0c90dc8a	Moved CTerrainRect into a separate file	2023-02-01 15:13:07 +02:00
Ivan Savenko	9366506e2c	Finalized split of AdventureMapClasses	2023-02-01 14:01:48 +02:00
Ivan Savenko	900cc55ed5	Merge branches 'split_cadvmappanel', 'split_cingameconsole', 'split_clist', 'split_cminimap' and 'split_cinfobar' into client_files_layout_rearrangement	2023-02-01 13:56:22 +02:00
Ivan Savenko	ef236be2da	Created separate file for CInfoBar	2023-02-01 13:55:56 +02:00
Ivan Savenko	d0c6627cdb	Created separate file for CList	2023-02-01 13:50:13 +02:00
Ivan Savenko	27f2e4fd33	Created separate file for CMinimap	2023-02-01 13:49:31 +02:00
Ivan Savenko	87498287f5	Created separate file for CAdvMapPanel	2023-02-01 13:48:26 +02:00
Ivan Savenko	134b40363f	Created separate file for CInGameConsole	2023-02-01 13:47:05 +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
Ivan Savenko	c3a2dee45a	Code cleanup	2023-01-31 15:00:46 +02:00
Ivan Savenko	fc60a7aff0	Removed redundant include	2023-01-31 01:28:11 +02:00
Ivan Savenko	bf343126c4	Fix Hero animation speed in battles	2023-01-31 00:42:50 +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
Ivan Savenko	42df5626d9	Added Color class to replace SDL_Color	2023-01-30 00:12:43 +02:00
Andrey Filipenkov	07dc2e1c48	Merge pull request #1496 from kambala-decapitator/resurrect-message ... show resurrect message in the battle log	2023-01-29 22:18:32 +03:00
Konstantin	080d4b13dd	vcmi: suppress warning on IOS ... Let CI passes on develop.	2023-01-29 21:30:37 +03:00
Dydzio	1898b8218c	Merge remote-tracking branch 'origin/develop' into settings-rework	2023-01-29 17:36:56 +01:00
Dydzio	e3578d0bc8	Extract options stuff to separate file	2023-01-29 17:36:33 +01:00
Ivan Savenko	57ee9a9bf3	Merge vcmi/beta into vcmi/develop	2023-01-29 18:21:55 +02:00
Dydzio	0fdfd8bdcb	Configurable interface for game settings, change sound/music sliders	2023-01-29 16:49:47 +01:00
Ivan Savenko	3749074a4d	Renamed speed setting name to force-reset it to new scale	2023-01-28 16:49:35 +02:00
Ivan Savenko	9d1a075806	Fix battle speed selector in settings	2023-01-28 14:00:49 +02:00
Ivan Savenko	d34efaeb81	All battle effects now use time-based timings	2023-01-28 13:19:35 +02:00
Ivan Savenko	bdde9f831a	Fixed timings of building construction to match H3	2023-01-28 13:19:35 +02:00
Ivan Savenko	09413c61b8	Changed timing of building fade-in to match H3	2023-01-28 13:19:35 +02:00
Ivan Savenko	f1647cc3bb	Animated spellcasting cursor now has same speed as in H3	2023-01-28 13:19:35 +02:00
Ivan Savenko	3acee297be	CShowableAnim is now time-based with timing matching H3	2023-01-28 13:19:35 +02:00
Ivan Savenko	a9fefffc65	Video playback is now time-based, using video file timings	2023-01-28 13:19:35 +02:00
Ivan Savenko	7bbaae75a2	Merge pull request #1508 from kambala-decapitator/shipyard-regression ... attempt to show shipyard dialog only when a hero is selected	2023-01-28 02:04:10 +02:00
Ivan Savenko	50a0fc4fb2	Removed pointer to current SDL_Event from GuiHandler	2023-01-27 23:17:40 +02:00
Ivan Savenko	4d1c338503	Merge pull request #1498 from rilian-la-te/conan-v2 ... Conan as MXE replacement	2023-01-27 23:14:37 +02:00
Ivan Savenko	6c472339ce	Refactoring of ObjectClassesHandler	2023-01-26 23:26:49 +02:00
Konstantin	cf56f7ccce	vcmi: remove unused-but-set-variables	2023-01-26 23:49:00 +03:00
Andrey Filipenkov	612b5e2746	attempt to show shipyard dialog only when a hero is selected ... fixes regression from a4e8255cbc	2023-01-25 20:49:37 +03:00
Andrey Filipenkov	7e78e0abdc	Merge pull request #1493 from kambala-decapitator/ios-spacebar ... [iOS] use pinch gesture as Spacebar hotkey instead of Tab	2023-01-25 18:32:40 +03:00
Andrey Filipenkov	a2ac189e03	fix typo	2023-01-25 18:13:11 +03:00
Andrey Filipenkov	54537fc02c	Merge pull request #1478 from kambala-decapitator/units-huge-numbers ... limit displayed units number to 4 digits	2023-01-25 17:47:08 +03:00
Andrey Filipenkov	b2d2c7a2dc	Merge pull request #1501 from kambala-decapitator/townportal-doubleclick ... handle double-click in Town Portal dialog	2023-01-25 17:42:15 +03:00
Andrey Filipenkov	18c52f05ca	Merge pull request #1506 from kambala-decapitator/cmake-zip-ipa ... generate ipa file with CPack directly	2023-01-25 17:41:10 +03:00
Konstantin	a7bd7232ce	CGuiHandler: fix false positive dangling pointer ... Making this an auto variable fixes compilation with Werror.	2023-01-25 17:14:41 +03:00
Dydzio	68be7643f1	Remove redundant method - code review suggestion	2023-01-25 13:06:13 +01:00
Ivan Savenko	52ab0f9b5b	Merge pull request #1446 from dydzio0614/movement-points-show ... Implement movement points info on ALT hold + tile mouse hover	2023-01-25 12:30:34 +02:00
Andrii Danylchenko	1a7ec728d9	Merge pull request #1484 from kambala-decapitator/shipyard-fixes ... Shipyard dialog fixes	2023-01-25 10:42:04 +02:00
Andrii Danylchenko	3cef3c10be	Merge pull request #1489 from dydzio0614/console-crash-fix ... Improve handling of empty text in console, remove unused includes	2023-01-25 10:40:47 +02:00
Andrii Danylchenko	4cfc93d2da	Somehow it works but JNI signatures were incorrect	2023-01-25 08:59:59 +02:00
Andrey Filipenkov	035851bb38	add max version condition to Xcode workaround	2023-01-24 20:18:09 +03:00