1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-10 09:50:17 +02:00
Commit Graph

9596 Commits

Author SHA1 Message Date
Ivan Savenko
6985f2e050 Cursor type can now be set in settings.json 2023-01-15 21:18:34 +02:00
Ivan Savenko
26a1c5801b Implemented hardware cursor support 2023-01-15 21:18:34 +02:00
Ivan Savenko
9971bdca1b Existing software cursor logic is now in a separate class 2023-01-15 21:18:34 +02:00
Ivan Savenko
0e8ee929df Renamed CCursorHandler -> CursorHandler 2023-01-15 21:18:34 +02:00
Ivan Savenko
d44e809369 Refactoring of CursorHandler, in preparation for HW cursor routines 2023-01-15 21:18:34 +02:00
Dydzio
7dd7f4af54 Change to time-based frame counting, easier than I though 2023-01-15 19:56:55 +01:00
Dydzio
6572f5697e Fix wrong rendering of castle shipyard 2023-01-15 19:10:40 +01:00
Dydzio
cbddf2d8fb Adjust newly built building appearance and outline blinking speed 2023-01-15 17:22:53 +01:00
Ivan Savenko
246281e62a Merged vcmi/beta with vcmi/develop 2023-01-15 17:46:42 +02:00
Ivan Savenko
bec894c348 Implemented automatic detection of H3 files language/encoding 2023-01-15 17:32:39 +02:00
Dydzio
4fb5548475 Remove unused stuff from code 2023-01-15 17:31:32 +02:00
Dydzio
8b2fc5198e Remove condition that causes unintended behavior 2023-01-15 17:31:32 +02:00
Dydzio
3596d167a7 Adjust code to develop + change place in code where alpha is applied 2023-01-15 17:31:32 +02:00
Dydzio
9e7e649d37 Gradual fade-in of built building 2023-01-15 17:31:32 +02:00
Ivan Savenko
6ea7add4bb
Merge pull request #1394 from SoundSSGood/art-move-fix
Artifact movement refactoring
2023-01-15 17:29:36 +02:00
Andrey Filipenkov
2de48624bc [iOS] fix linking QtCore 2023-01-15 17:28:09 +02:00
Andrey Filipenkov
2f14914120 fix Boost deprecation warnings
warnings introduced in v1.81

# Conflicts:
#	mapeditor/resourceExtractor/ResourceConverter.cpp
2023-01-15 17:28:09 +02:00
Andrey Filipenkov
efbed6000b fix typo 2023-01-15 17:28:09 +02:00
Andrey Filipenkov
b22c651b0f [CI] switch Apple platforms to Xcode 14 2023-01-15 17:28:09 +02:00
Andrey Filipenkov
9d3ad51de4 [Conan][docs] fix examples of using our prebuilt binaries for macOS/iOS 2023-01-15 17:28:09 +02:00
Andrey Filipenkov
0eef2412db [Conan] switch to apple-clang 14 2023-01-15 17:28:09 +02:00
Andrey Filipenkov
453217b4bb [Conan] ignore SDL versions with broken sound 2023-01-15 17:28:09 +02:00
Andrey Filipenkov
427cae2704 [Conan] fix building Boost.Locale with Apple-clang in versions >= 1.81 2023-01-15 17:28:09 +02:00
Andrey Filipenkov
43ef6c075e [Conan] disable bitcode explicitly 2023-01-15 17:28:09 +02:00
Andrey Filipenkov
e855a9db7c [Conan] use profile includes for common parts 2023-01-15 17:28:09 +02:00
Andrii Danylchenko
9f0eb055f9
Merge pull request #1426 from vcmi/android-upgrade-sdl
Update android JNI bindings
2023-01-15 10:36:32 +02:00
Dydzio
4736351e78 Change spaces to tabs in cmakelists 2023-01-15 01:19:47 +01:00
Dydzio
b5a1b178d9 Explicitly call reset on shared_ptr for potential readability boost 2023-01-15 01:18:35 +01:00
Dydzio
06376ca4ef Change ClientCommandManager to become non-static 2023-01-15 01:09:58 +01:00
Ivan Savenko
a46ab835ce Applied review suggestions 2023-01-14 23:01:33 +02:00
Ivan Savenko
ccc6ebee0d Cleared up gate blocking, Force Field can now block gates 2023-01-13 15:44:42 +02:00
Ivan Savenko
526de47ca4 Removed 0.98 compatibility 2023-01-13 13:00:07 +02:00
Ivan Savenko
3be3c871fb Destroyed walls will now remove wall penalty 2023-01-13 01:59:09 +02:00
Ivan Savenko
1d7f004658 Implemented reinforced walls in towns with Castle 2023-01-13 01:09:24 +02:00
Ivan Savenko
500cf7f15d EWallPart & EWallState are now enum class 2023-01-13 00:35:58 +02:00
Ivan Savenko
b86704bece Ballistics mechanics should now match H3 2023-01-12 23:53:29 +02:00
Ivan Savenko
dd3adb7e16 Arrow towers damage algorithm should now match H3 2023-01-12 23:52:03 +02:00
Ivan Savenko
9658ffba99 Allow disabling & deleting local mods other than vcmi mod 2023-01-12 16:29:01 +02:00
Ivan Savenko
e188060480 Fix server shutdown on transferring artifact to commander 2023-01-12 16:27:59 +02:00
Dydzio
91a52ebb8e Add GUI lock 2023-01-11 17:14:10 +01:00
Dydzio
cb3fd24ec0 Fixes after merge, move removeGUI to Client class 2023-01-11 17:11:44 +01:00
Dydzio
aac515f64e Merge 'develop' branch 2023-01-11 16:24:53 +01:00
Ivan Savenko
192e856797 merge with vcmi/develop 2023-01-11 16:47:53 +02:00
Ivan Savenko
e48bd39b9c Moved road & river handlers into a separate file 2023-01-11 15:17:24 +02:00
Ivan Savenko
5e72ef76cf Fix quest texts accessing 2023-01-11 15:10:44 +02:00
Ivan Savenko
76540bd960 Fix tactics buttons positioning 2023-01-11 15:10:30 +02:00
Ivan Savenko
8b6f6f9b93 Fix msvc compile 2023-01-11 13:59:43 +02:00
Ivan Savenko
c6f089c6b1 Removed outdated comment 2023-01-11 13:59:33 +02:00
SoundSSGood
a0568823a9 swap contitutient 2023-01-11 13:17:33 +02:00
Ivan Savenko
9b77215b23 Attempt to fix slowdown in daily buid - revert MXE 2023-01-10 21:19:32 +02:00