391 Commits

Author	SHA1	Message	Date
Ivan Savenko	243773b6ef	Renamed some adventure map files & classes	2023-05-09 13:10:33 +03:00
Ivan Savenko	fb739e7186	Merge beta -> develop	2023-04-26 22:48:08 +03:00
Ivan Savenko	4ec32e4dcd	Renamed CAdvMapInt to its proper full name	2023-04-20 22:04:24 +03:00
Ivan Savenko	24c6587072	Fixed crash on leaving to main menu from battle in hotseat mode	2023-04-20 19:56:35 +03:00
Konstantin	7a5775a9f9	vcmi: use std::optional	2023-04-17 00:43:13 +03:00
nordsoft	289259f64a	Unblock spectator interface during AI turns	2023-04-14 00:22:47 +04:00
nordsoft	35fa06008b	Revert "Auxiliary commit to revert individual files from fb4db41891e157f4f7d72ee759141754d2df680c" ... This reverts commit 129b15a49c911315789721b7e62b93757819519a.	2023-04-14 00:20:51 +04:00
nordsoft	413870d39a	Revert "Single player spectator" ... This reverts commit b9e5e42647.	2023-04-14 00:18:29 +04:00
nordsoft	b9e5e42647	Single player spectator	2023-04-13 13:12:00 +04:00
nordsoft	fb4db41891	Single player spectator	2023-04-13 02:01:13 +04:00
nordsoft	f005dbbc14	Spectator mode	2023-04-13 00:59:44 +04:00
Nordsoft91	3951bbb395	Merge pull request #1108 from Nordsoft91/battle-dialog ... [HDMod features] Quick combat	2023-04-11 21:18:04 +04:00
nordsoft	39f4bc0072	Reset battle bonuses on client side	2023-04-11 17:25:19 +04:00
Adriankhl	1d6192ca62	Shut down the thread for tactic phase properly	2023-04-08 22:52:46 +04:00
nordsoft	ce3028bd73	Intermediate commit	2023-04-06 19:34:07 +04:00
Ivan Savenko	a3059033f2	Fixes broken client state, e.g. movement. Effectively reverts #1663	2023-03-17 16:00:47 +02:00
Ivan Savenko	383387ef29	Integrated defaultMods into mod system	2023-03-16 17:55:09 +02:00
Konstantin	4c4498b22a	vcmi: modernize rest of lib	2023-03-16 17:55:20 +03:00
Adriankhl	18be7d5261	Remove redundant client access to server save game files and redundant includes	2023-03-13 12:27:13 +01:00
Adriankhl	113527c80c	Fix paths deserialization	2023-03-13 11:04:06 +01:00
Adriankhl	eba4e4dd2c	No longer save/load common game state to/from client file	2023-03-13 10:10:44 +01:00
Adriankhl	f054064322	Load client data (e.g. sleepingHeroes) from local file if possible	2023-03-12 21:54:51 +01:00
Ivan Savenko	cdcd5a29dd	Updated path to renamed directory	2023-03-05 18:02:59 +02:00
Ivan Savenko	ec6f19ea18	Code reorganization, no changes to functionality	2023-03-05 17:48:02 +02:00
Ivan Savenko	4501036a04	Basic version of hero movement on map. Removed old code.	2023-03-05 17:48:02 +02:00
Andrey Filipenkov	c4e7e91850	fix single process build for Android	2023-03-02 12:09:48 +03:00
Andrey Filipenkov	5b1f3bf0db	use JNIEnv object from SDL instead of forwarding from Java for Client	2023-03-02 12:09:47 +03:00
Andrii Danylchenko	9f55666931	rework netpacks to avoid double typeinfo	2023-02-13 20:26:39 +02:00
Ivan Savenko	108a42e4ba	Reorganized includes for new layout. New class - IImageLoader	2023-02-01 20:42:06 +02:00
Ivan Savenko	57ee9a9bf3	Merge vcmi/beta into vcmi/develop	2023-01-29 18:21:55 +02:00
Andrii Danylchenko	4cfc93d2da	Somehow it works but JNI signatures were incorrect	2023-01-25 08:59:59 +02:00
Ivan Savenko	fc0f5a9fb3	Reduced SDL includes	2023-01-20 16:11:43 +02:00
Dydzio	e593b61201	Merge branch 'develop' into client-commands-improvements	2023-01-16 01:13:06 +01:00
Ivan Savenko	246281e62a	Merged vcmi/beta with vcmi/develop	2023-01-15 17:46:42 +02:00
Dydzio	b5a1b178d9	Explicitly call reset on shared_ptr for potential readability boost	2023-01-15 01:18:35 +01:00
Dydzio	cb3fd24ec0	Fixes after merge, move removeGUI to Client class	2023-01-11 17:11:44 +01:00
Andrii Danylchenko	9f9798d3a4	Update android JNI bindings	2023-01-07 09:26:01 +02:00
Ivan Savenko	5d80457eda	Merge with vcmi/develop branch	2022-12-30 00:52:23 +02:00
Ivan Savenko	eb20a4b208	Merge remote-tracking branch 'vcmi/develop' into warnings_fix	2022-12-23 14:40:45 +02:00
Ivan Savenko	c835a84051	Moved all GUI handling from BattleInterface to BattleControlPanel	2022-12-21 17:02:53 +02:00
Ivan Savenko	4d628a8ba1	Fixed several assertion failures on shutting down game	2022-12-16 16:19:57 +02:00
Ivan Savenko	c855823528	Renamed files in client/battle to match new names of classes	2022-12-09 13:38:46 +02:00
Ivan Savenko	3f9a0a855e	Renamed most of classes in client/battle directory to match current code ... style	2022-12-09 13:26:17 +02:00
Ivan Savenko	facf77b3ae	vstd::unique -> std::unique	2022-12-07 23:36:20 +02:00
Ivan Savenko	2855606a88	Enabled & fixed -Woverloaded-virtual warning from gcc/cland ... - fixed almost all instances of overloaded-virtual warning - cleared up inheritance & method overrides in code affected by warning	2022-12-07 21:50:45 +02:00
nordsoft	628abd1428	Fix campaign serialization	2022-10-03 01:48:03 +04:00
nordsoft	3621b05682	Rename variable	2022-09-30 18:28:17 +04:00
nordsoft	8a8716ce8a	Pass loaded game over network too	2022-09-29 21:33:44 +04:00
nordsoft	7ee4fca120	Pass whole gamestate over network	2022-09-28 23:15:05 +04:00
Andrey Filipenkov	7e6ed0583c	disable all scripting code when configuring without scripting modules	2022-09-21 19:31:42 +03:00