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

484 Commits

Author SHA1 Message Date
413870d39a Revert "Single player spectator"
This reverts commit b9e5e42647.
2023-04-14 00:18:29 +04:00
b9e5e42647 Single player spectator 2023-04-13 13:12:00 +04:00
fb4db41891 Single player spectator 2023-04-13 02:01:13 +04:00
f005dbbc14 Spectator mode 2023-04-13 00:59:44 +04:00
3951bbb395 Merge pull request #1108 from Nordsoft91/battle-dialog
[HDMod features] Quick combat
2023-04-11 21:18:04 +04:00
39f4bc0072 Reset battle bonuses on client side 2023-04-11 17:25:19 +04:00
1d6192ca62 Shut down the thread for tactic phase properly 2023-04-08 22:52:46 +04:00
ce3028bd73 Intermediate commit 2023-04-06 19:34:07 +04:00
a3059033f2 Fixes broken client state, e.g. movement. Effectively reverts #1663 2023-03-17 16:00:47 +02:00
383387ef29 Integrated defaultMods into mod system 2023-03-16 17:55:09 +02:00
4c4498b22a vcmi: modernize rest of lib 2023-03-16 17:55:20 +03:00
18be7d5261 Remove redundant client access to server save game files and redundant includes 2023-03-13 12:27:13 +01:00
113527c80c Fix paths deserialization 2023-03-13 11:04:06 +01:00
eba4e4dd2c No longer save/load common game state to/from client file 2023-03-13 10:10:44 +01:00
f054064322 Load client data (e.g. sleepingHeroes) from local file if possible 2023-03-12 21:54:51 +01:00
cdcd5a29dd Updated path to renamed directory 2023-03-05 18:02:59 +02:00
ec6f19ea18 Code reorganization, no changes to functionality 2023-03-05 17:48:02 +02:00
4501036a04 Basic version of hero movement on map. Removed old code. 2023-03-05 17:48:02 +02:00
c4e7e91850 fix single process build for Android 2023-03-02 12:09:48 +03:00
5b1f3bf0db use JNIEnv object from SDL instead of forwarding from Java for Client 2023-03-02 12:09:47 +03:00
9f55666931 rework netpacks to avoid double typeinfo 2023-02-13 20:26:39 +02:00
108a42e4ba Reorganized includes for new layout. New class - IImageLoader 2023-02-01 20:42:06 +02:00
57ee9a9bf3 Merge vcmi/beta into vcmi/develop 2023-01-29 18:21:55 +02:00
4cfc93d2da Somehow it works but JNI signatures were incorrect 2023-01-25 08:59:59 +02:00
fc0f5a9fb3 Reduced SDL includes 2023-01-20 16:11:43 +02:00
e593b61201 Merge branch 'develop' into client-commands-improvements 2023-01-16 01:13:06 +01:00
246281e62a Merged vcmi/beta with vcmi/develop 2023-01-15 17:46:42 +02:00
b5a1b178d9 Explicitly call reset on shared_ptr for potential readability boost 2023-01-15 01:18:35 +01:00
cb3fd24ec0 Fixes after merge, move removeGUI to Client class 2023-01-11 17:11:44 +01:00
9f9798d3a4 Update android JNI bindings 2023-01-07 09:26:01 +02:00
5d80457eda Merge with vcmi/develop branch 2022-12-30 00:52:23 +02:00
eb20a4b208 Merge remote-tracking branch 'vcmi/develop' into warnings_fix 2022-12-23 14:40:45 +02:00
c835a84051 Moved all GUI handling from BattleInterface to BattleControlPanel 2022-12-21 17:02:53 +02:00
4d628a8ba1 Fixed several assertion failures on shutting down game 2022-12-16 16:19:57 +02:00
c855823528 Renamed files in client/battle to match new names of classes 2022-12-09 13:38:46 +02:00
3f9a0a855e Renamed most of classes in client/battle directory to match current code
style
2022-12-09 13:26:17 +02:00
facf77b3ae vstd::unique -> std::unique 2022-12-07 23:36:20 +02:00
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
628abd1428 Fix campaign serialization 2022-10-03 01:48:03 +04:00
3621b05682 Rename variable 2022-09-30 18:28:17 +04:00
8a8716ce8a Pass loaded game over network too 2022-09-29 21:33:44 +04:00
7ee4fca120 Pass whole gamestate over network 2022-09-28 23:15:05 +04:00
7e6ed0583c disable all scripting code when configuring without scripting modules 2022-09-21 19:31:42 +03:00
aaa07e4d2e New terrain support - part 1 (#755)
Initial support of new terrains
2022-09-11 11:31:26 +03:00
4defbc314a Fix saves when some humans become AI. (PlayerInterface destructor clears LOCPLINT) 2022-03-21 09:38:14 +02:00
30b879ae5d Fixed: duplicated bonusing building. Improved: opposite bonus propagation 2021-09-12 14:30:54 +03:00
25d9ea1ddf Feature: Opposite Side Limiter 2021-09-04 14:15:38 +03:00
ecaa9f5d0b Entities redesign and a few ERM features
* Made most Handlers derived from CHandlerBase and moved service API there.
* Declared existing Entity APIs.
* Added basic script context caching
* Started Lua script module
* Started Lua spell effect API
* Started script state persistence
* Started battle info callback binding
* CommitPackage removed
* Extracted spells::Caster to own header; Expanded Spell API.
* implemented !!MC:S, !!FU:E, !!FU:P, !!MA, !!VR:H, !!VR:C
* !!BU:C, !!BU:E, !!BU:G, !!BU:M implemented
* Allow use of "MC:S@varName@" to declare normal variable (technically v-variable with string key)
* Re-enabled VERM macros.
* !?GM0 added
* !?TM implemented
* Added !!MF:N
* Started !?OB, !!BM, !!HE, !!OW, !!UN
* Added basic support of w-variables
* Added support for ERM indirect variables
* Made !?FU regular trigger
* !!re (ERA loop receiver) implemented
* Fixed ERM receivers with zero args.
2021-02-14 19:05:43 +03:00
a05ae78e67 Fixed lots of warnings.
Disabled the following (for MSVC only) that couldn't (or shouldn't) be fixed.

4003: not enough actual parameters for macro 'identifier'
4250: 'class1' : inherits 'class2::member' via dominance
4251: 'type' : class 'type1' needs to have dll-interface to be used by clients of class 'type2'
4275: non dll-interface class 'type1' used as base for dll-interface class 'type2'
2020-10-04 02:20:18 -07:00
3c5194a232 Add support for the Android App to notify if the server has been closed
When winning the campaign there is a lock that waits for the old server to stop before allowing to continue with restarting the server. While the lock was released on PC builds as the server runs differently on Android this was missed making campaigns always hang the app when you win.

This change adds a new native method that can be called from the Android app to signal that the server has stopped, so the client can continue with requesting a new server and showing the new campaign scenatio screen.

Note: this change alone doesn't fix the bug but it's required for a fix on vcmi-android's side. It doesn't break anything and can be merged before the vcmi-android changes
2020-01-06 16:43:02 +00:00