1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Commit Graph

9899 Commits

Author SHA1 Message Date
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
Dydzio
0fdfd8bdcb Configurable interface for game settings, change sound/music sliders 2023-01-29 16:49:47 +01:00
Ivan Savenko
3749074a4d Renamed speed setting name to force-reset it to new scale 2023-01-28 16:49:35 +02:00
Ivan Savenko
9d1a075806 Fix battle speed selector in settings 2023-01-28 14:00:49 +02:00
Ivan Savenko
a853045509 Removed unused value from creature config 2023-01-28 13:56:51 +02:00
Ivan Savenko
d34efaeb81 All battle effects now use time-based timings 2023-01-28 13:19:35 +02:00
Ivan Savenko
bdde9f831a Fixed timings of building construction to match H3 2023-01-28 13:19:35 +02:00
Ivan Savenko
09413c61b8 Changed timing of building fade-in to match H3 2023-01-28 13:19:35 +02:00
Ivan Savenko
f1647cc3bb Animated spellcasting cursor now has same speed as in H3 2023-01-28 13:19:35 +02:00
Ivan Savenko
3acee297be CShowableAnim is now time-based with timing matching H3 2023-01-28 13:19:35 +02:00
Ivan Savenko
a9fefffc65 Video playback is now time-based, using video file timings 2023-01-28 13:19:35 +02:00
Ivan Savenko
a2cd17197e Fix Campfire Gold reward amount. Now always one of 400/500/600 2023-01-28 13:12:03 +02:00
Ivan Savenko
d82822d37a Fix reset of rewardable objects with reset period of 1 day 2023-01-28 13:12:03 +02:00
Ivan Savenko
7bbaae75a2
Merge pull request #1508 from kambala-decapitator/shipyard-regression
attempt to show shipyard dialog only when a hero is selected
2023-01-28 02:04:10 +02:00
Ivan Savenko
c2c08a46bf
Merge pull request #1513 from IvanSavenko/gui_handler_remove_current_event
Removed pointer to current SDL_Event from GuiHandler
2023-01-28 01:35:08 +02:00
Ivan Savenko
50a0fc4fb2 Removed pointer to current SDL_Event from GuiHandler 2023-01-27 23:17:40 +02:00
Ivan Savenko
4d1c338503
Merge pull request #1498 from rilian-la-te/conan-v2
Conan as MXE replacement
2023-01-27 23:14:37 +02:00
Ivan Savenko
beb58ee8b0
Merge pull request #1516 from IvanSavenko/changelog_fix
Fix formatting of list inside another list
2023-01-27 13:51:37 +02:00
Ivan Savenko
94e7293eec Fix formatting of list inside another list 2023-01-27 13:24:13 +02:00
Ivan Savenko
aef4cb3c71
Merge pull request #1466 from IvanSavenko/translate_adventure_map
Translate adventure map objects
2023-01-27 11:38:16 +02:00
Ivan Savenko
2b28dc5b2d
Merge pull request #1512 from IvanSavenko/changelog_markdown
Converted ChangeLog to use Markdown syntax
2023-01-27 11:38:00 +02:00
Ivan Savenko
e87adf334d Fix loading of vcmi json maps 2023-01-26 23:32:56 +02:00
Ivan Savenko
8b2d336562 Fix initialization of visitDir in templates 2023-01-26 23:32:56 +02:00
Ivan Savenko
a3846f1b31 Fix incorrect identifiers format 2023-01-26 23:32:56 +02:00
Ivan Savenko
eebc6fd625 Map object use format mod:object (or mod:object.subobject) 2023-01-26 23:32:56 +02:00
Ivan Savenko
7b82387a49 Dwellings & Banks will register custom names for their objects 2023-01-26 23:32:56 +02:00