games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity
9,818 Commits 19 Branches 62 Tags 112 MiB
64faa13b6d
Commit Graph

9818 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
nordsoft
d0b5a023ee Fix bug 2023-01-16 20:58:19 +04:00
nordsoft
1ef9610e30 Remove irrelevant comment 2023-01-16 20:58:19 +04:00
nordsoft
da085b0058 Code review tweaks 2023-01-16 20:58:19 +04:00
nordsoft
2cce15efbe Automatic mod conflict resolution 2023-01-16 20:58:19 +04:00
nordsoft
a2e358876c Health check fix 2023-01-16 20:58:19 +04:00
nordsoft
14fc1c3f26 Cosmetic changes 2023-01-16 20:58:19 +04:00
nordsoft
8e1d8f835a Implemented support of protocol 4 2023-01-16 20:58:19 +04:00
Dydzio
c886a2a02b Implement movement points info on ALT hold + tile mouse hover 2023-01-16 17:29:33 +01:00
Ivan Savenko
c252837b6a Fix installation of compiled QM files 2023-01-16 18:02:11 +02:00
Andrii Danylchenko
b3f6250f4e
Merge pull request #1439 from dydzio0614/castle-shipyard-animation-fix 
Fix wrong rendering of castle shipyard
 2023-01-16 14:23:37 +02:00
Andrii Danylchenko
2b1511df99 SDL fix 2 finger touch when you remove fingers instantly 2023-01-16 13:39:45 +02:00
Andrii Danylchenko
7ccfcf51e9 Handle 2 fingers gesture as rclick via SDL 2023-01-16 09:46:52 +02:00
Dydzio
e593b61201 Merge branch 'develop' into client-commands-improvements 2023-01-16 01:13:06 +01:00
Dydzio
da39eb789f Fix indent 2023-01-16 00:37:18 +01:00
Dydzio
54e499f5e7 Minor refactoring from code review 2023-01-16 00:33:53 +01:00
Ivan Savenko
96141f010b Merge remote-tracking branch 'vcmi/develop' into translate_launcher 2023-01-15 23:55:49 +02:00
Ivan Savenko
0a858d9a7c
Upgrade msvc to include enet and qt translator (#1436) 
- Updated MSVC prebuilt package
- Fixed build warnings
 2023-01-15 23:55:24 +02:00
Ivan Savenko
434163461e Added logging for translation search 2023-01-15 23:54:27 +02:00
Ivan Savenko
494274ee46 Fix single-app build 2023-01-15 23:53:27 +02:00
Ivan Savenko
fc4121f5ec Rechecked & updated offsets of adventure map cursors 2023-01-15 21:18:34 +02:00
Ivan Savenko
385dda1c5b Clean surface before using it 2023-01-15 21:18:34 +02:00
Ivan Savenko
c6d39da53e MXE compile fix 2023-01-15 21:18:34 +02:00
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