1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-30 23:18:08 +02:00
Commit Graph

9680 Commits

Author SHA1 Message Date
Ivan Savenko
bafe0c42ce
Merge pull request #1293 from IvanSavenko/translate_launcher
Translations support - Launcher
2023-01-17 23:05:14 +02:00
Ivan Savenko
05ac217b0f Merge with vcmi/develop 2023-01-17 23:02:25 +02:00
Ivan Savenko
e436b4425f Serialization version bump 2023-01-17 22:59:32 +02:00
Ivan Savenko
633b9ef3be Native terrain is now required for faction, opt-out with value "none" 2023-01-17 22:59:14 +02:00
Ivan Savenko
707de75ac0 Cleared up formatting 2023-01-17 22:58:22 +02:00
Ivan Savenko
7a92aa0a06 Fixes for compilation with Qt6 2023-01-17 12:49:33 +02:00
Ivan Savenko
b9712b0899 Fix translation search paths on ios 2023-01-16 22:37:19 +02:00
Ivan Savenko
e78d6f9d70 Fix MXE detection check 2023-01-16 21:28:32 +02:00
Andrii Danylchenko
33f92bc4b1
Merge pull request #1438 from dydzio0614/build-speed-adjust
Adjust newly built building appearance and outline blinking speed
2023-01-16 20:27:56 +02:00
Dydzio
c3b254a815 Enum value can be used here as well 2023-01-16 18:26:31 +01:00
Nordsoft91
fba76489e2
Merge pull request #1328 from Nordsoft91/editor-lasso
[MapEditor] Implement lasso brush
2023-01-16 21:05:00 +04:00
Nordsoft91
ea33fed15c
Merge branch 'develop' into editor-lasso 2023-01-16 21:04:44 +04:00
nordsoft
c0c1be2645 Fix invalid host connection 2023-01-16 20:58:19 +04:00
nordsoft
a2581fb942 Fix crash at start 2023-01-16 20:58:19 +04:00
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
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