1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-04 09:42:40 +02:00
Commit Graph

9407 Commits

Author SHA1 Message Date
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
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
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
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
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
Ivan Savenko
3fd9a14651 Fix #1401 - Restored accessing creature names via GeneralTextHandler 2023-01-10 12:26:20 +02:00
Ivan Savenko
01811317f9 Remove assert which may not always be true 2023-01-09 23:22:59 +02:00
Ivan Savenko
4b3782b5cf Post-merge fix 2023-01-09 23:22:59 +02:00
Ivan Savenko
1fece0ce18
Merge pull request #1229 from IvanSavenko/battle_improvements
Battle: Fixing bugs & Implementation of missing features
2023-01-09 22:07:13 +02:00
Ivan Savenko
d9aab0a847
Merge pull request #1318 from IvanSavenko/translate_mapeditor
Translate mapeditor
2023-01-09 21:25:09 +02:00
Ivan Savenko
bde988ca43
Merge pull request #1329 from IvanSavenko/translate_game
Translations support - base functionality for main game texts
2023-01-09 20:33:56 +02:00
Ivan Savenko
3e0bb3a7cc Fixed copy-paste error 2023-01-09 19:14:21 +02:00
Ivan Savenko
6379c5f6fa Install additional dll on Windows to get better style for Qt 2023-01-09 18:35:14 +02:00
Ivan Savenko
8f42c86962 Formatting: space -> tabs 2023-01-09 18:34:37 +02:00
Ivan Savenko
84aefc3362 Changed log file format: print timestamp instead of thread ID 2023-01-09 18:34:37 +02:00
Ivan Savenko
2f5ee44cbe Fixes patrol position initialization on H3M load 2023-01-09 18:34:13 +02:00
Ivan Savenko
f155a35378 Fix positioning of UI elements in BattleWindow 2023-01-09 17:25:49 +02:00
Ivan Savenko
c63e79fb28 Fix multi-line texts in combat log 2023-01-09 17:25:18 +02:00
Ivan Savenko
9308319ac7 Added workaround for ~200 ms lag occuring after hero move 2023-01-09 13:05:28 +02:00
Ivan Savenko
8526eba6fa Added checks to music player to detect potential freezes 2023-01-09 13:05:15 +02:00
Ivan Savenko
7e8516f927 Changed Sirens behavior to match H3 logic 2023-01-09 13:04:56 +02:00
SoundSSGood
4005b48360 Regressions fixed 2023-01-08 23:31:12 +02:00
SoundSSGood
c706b4d419 CArtifactsOfHero::artifactMoved updated 2023-01-08 23:31:06 +02:00
SoundSSGood
6b7ce798d0 artifactTransitionPos created 2023-01-08 23:24:13 +02:00
Ivan Savenko
205beb96ed Fix petrification effect 2023-01-08 16:25:47 +02:00
Andrey Filipenkov
48c01157e6 fix typo 2023-01-08 01:33:26 +02:00
Andrey Filipenkov
db98575d10 fix unaligned memory access (UB) on Clang/GCC/MSVC
sample UBSAN report:
client/gui/CAnimation.cpp:329:24: runtime error: load of misaligned address 0x62d0004b094f for type 'const ui32' (aka 'const unsigned int'), which requires 4 byte alignment
2023-01-08 01:33:26 +02:00
Dydzio
b02948d073 Update defaultMods.json 2023-01-08 01:32:42 +02:00