1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Commit Graph

10027 Commits

Author SHA1 Message Date
Ivan Savenko
27f2e4fd33 Created separate file for CMinimap 2023-02-01 13:49:31 +02:00
Ivan Savenko
87498287f5 Created separate file for CAdvMapPanel 2023-02-01 13:48:26 +02:00
Ivan Savenko
134b40363f Created separate file for CInGameConsole 2023-02-01 13:47:05 +02:00
Ivan Savenko
8a9492d129 Moved client files to more suitable locations 2023-02-01 13:09:19 +02:00
Ivan Savenko
49c94c1498
Merge pull request #1522 from rilian-la-te/russia
Russian translation and Qt6 translation update
2023-02-01 12:26:35 +02:00
Ivan Savenko
0ba74fea73
Merge pull request #1515 from IvanSavenko/time_based_animations
Time based animations
2023-02-01 12:25:54 +02:00
Ivan Savenko
885fad87f9
Merge pull request #1527 from IvanSavenko/sdl_abstraction_iteration
SDL abstraction layer iteration
2023-02-01 12:25:41 +02:00
Ivan Savenko
552b5bc458
Merge pull request #1533 from IvanSavenko/mapeditor_fix_heroes
Fix assignment of hero type on object creation
2023-02-01 12:25:17 +02:00
Ivan Savenko
0d60b87f3b Fix assignment of hero type on object creation 2023-01-31 23:43:43 +02:00
Ivan Savenko
466a5ee400
Merge pull request #1531 from IvanSavenko/remove_mxe
Remove mxe
2023-01-31 21:24:39 +02:00
Ivan Savenko
26d9731277
Merge pull request #1530 from IvanSavenko/changelog-1.1.1
[beta] Added changelog for 1.1.1
2023-01-31 19:55:34 +02:00
Ivan Savenko
0c3b75597c
Update ChangeLog 2023-01-31 19:52:26 +02:00
Ivan Savenko
2f31033dba Fix typo 2023-01-31 19:48:24 +02:00
Ivan Savenko
c72fb1bcfe Added conan+mingw info to readme 2023-01-31 19:38:01 +02:00
Ivan Savenko
13dde2c4f3 Removed old info from readme 2023-01-31 18:50:22 +02:00
Ivan Savenko
8e13ed74d7 CMake version bump to 3.16, removed MXE workarounds 2023-01-31 18:48:14 +02:00
Ivan Savenko
e938a9bb6c Removed non-preset build from CI config 2023-01-31 18:14:17 +02:00
Ivan Savenko
a9669578fc Remove MXE action from CI 2023-01-31 18:13:51 +02:00
Ivan Savenko
5d6a16efd8
Updated 1.1.1 changelog
Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>
2023-01-31 16:39:43 +02:00
Ivan Savenko
c097b6e8b9 Added changelog for 1.1.1 2023-01-31 15:40:53 +02:00
Ivan Savenko
c3a2dee45a Code cleanup 2023-01-31 15:00:46 +02:00
Ivan Savenko
c5508d33fc
Merge pull request #1514 from IvanSavenko/rewardable_fixes
Minor fixes to rewardable objects
2023-01-31 12:47:24 +02:00
Ivan Savenko
971816004f
Merge pull request #1509 from IvanSavenko/launcher_settings_refresh
Launcher layout changes
2023-01-31 12:46:48 +02:00
Ivan Savenko
fc60a7aff0 Removed redundant include 2023-01-31 01:28:11 +02:00
Ivan Savenko
bf343126c4 Fix Hero animation speed in battles 2023-01-31 00:42:50 +02:00
Dydzio
88744633de Move buttons from mainOptions to SystemOptionsWindow 2023-01-30 23:26:33 +01:00
Dydzio
cc9d65a341 Make battle settings callable without battle, save last settings tab 2023-01-30 22:15:37 +01:00
DjWarmonger
e9c36a91a4
Merge pull request #1525 from IvanSavenko/prison_fix
Yep, Prison ID is special as Prison is `CGHeroInstance` in disguise.
2023-01-30 21:22:15 +01:00
Dydzio
9dd692cea4 Initial draft of tabbed settings window 2023-01-30 20:18:59 +01:00
Ivan Savenko
5cc23cc286 Renamed SDL_Pixels -> SDL_PixelAccess due to similar SDL header 2023-01-30 20:06:08 +02:00
Ivan Savenko
9c3030603d Removed most SDL includes from headers, removed SDL int's 2023-01-30 19:55:32 +02:00
Ivan Savenko
57df0a6995 Fix crash on hovering prison 2023-01-30 19:00:51 +02:00
Ivan Savenko
e14290fde0 Removed loading of images from file into SDL_Surface 2023-01-30 18:25:47 +02:00
Ivan Savenko
87218c63c4 CPicture now uses IImage internally 2023-01-30 17:18:59 +02:00
Ivan Savenko
e35a669eeb Refactoring of CPicture class to improve encapsulation 2023-01-30 13:58:13 +02:00
Ivan Savenko
42df5626d9 Added Color class to replace SDL_Color 2023-01-30 00:12:43 +02:00
Ivan Savenko
8439477751 Added icons to mod action buttons 2023-01-29 22:04:01 +02:00
Ivan Savenko
3da50e83be Re-imported icons with higher size to avoid upscaling artifacts 2023-01-29 22:04:01 +02:00
Ivan Savenko
4fc96a09cb Simplified internal layout of Mod List, no visible changes 2023-01-29 22:04:01 +02:00
Ivan Savenko
e87a157b32 Adjustments to Mods screen layout in Launcher 2023-01-29 22:04:01 +02:00
Ivan Savenko
8cdc9985d2 Small redesign of Settings tab in Launcher 2023-01-29 22:04:01 +02:00
Konstantin
47457e61cc mapeditor: russian translation
This is a complete russian translation of map editor.
2023-01-29 22:40:15 +03:00
Konstantin
f577b7240b launcher & editor: use qt_add_translations for Qt6
This will make possible to run update_translations target on
Qt6 build of VCMI
2023-01-29 22:40:15 +03:00
Konstantin
848e858312 launcher: russian translation
This is mostly finished russian translation
2023-01-29 22:40:15 +03:00
Andrey Filipenkov
07dc2e1c48
Merge pull request #1496 from kambala-decapitator/resurrect-message
show resurrect message in the battle log
2023-01-29 22:18:32 +03:00
Andrey Filipenkov
783174c2af
Merge pull request #1523 from rilian-la-te/fix-ios-ci
suppress warning on iOS
2023-01-29 22:17:43 +03:00
Konstantin
080d4b13dd vcmi: suppress warning on IOS
Let CI passes on develop.
2023-01-29 21:30:37 +03:00
Dydzio
1898b8218c Merge remote-tracking branch 'origin/develop' into settings-rework 2023-01-29 17:36:56 +01:00
Dydzio
e3578d0bc8 Extract options stuff to separate file 2023-01-29 17:36:33 +01:00
Ivan Savenko
57ee9a9bf3 Merge vcmi/beta into vcmi/develop 2023-01-29 18:21:55 +02:00