1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +02:00

154 Commits

Author SHA1 Message Date
a1a5bc28c2 convert line endings from CRLF (Windows) to LF (Linux/Unix)
Mixed line endings cause problems when exporting patches with
git-format-patch and then trying to "git am" a patch with mixed and
non-matching line endings. In such a situation git will fail to apply
the patch.

This commit runs the dos2unix tools on the remaining files with CRLF
(\r\n) line endings to convert them to line-feeds (\n) only.

Files that are Windows specific like *.vcxproj and *.props files were
not converted.

Closes: #3073
2023-10-19 16:23:21 +02:00
f39fbe5151 Merge pull request #2757 from IvanSavenko/filesystem_refactor
Filesystem refactor - part 1
2023-09-07 10:51:02 +03:00
41210c1dbf Client-side support for multiple battles 2023-09-06 16:03:47 +03:00
1d0e696db6 Added RenderHandler that acts as factory for images and animations 2023-09-04 18:22:34 +03:00
8dfdfffd87 Use ResourcePath for audio files 2023-09-04 18:22:34 +03:00
823ffa7a07 Always use ResourcePath for referencing images and animations 2023-09-04 18:22:34 +03:00
344593e891 vcmi: made some CSpell properties private
There are getters for it.
2023-08-23 17:53:08 +03:00
1c552ba9d9 Remove unused code 2023-08-21 17:55:49 +03:00
013417fb7e Code cleanup 2023-08-21 17:55:49 +03:00
6297140bf5 Start of stabilization - battles now start correctly 2023-08-21 17:55:49 +03:00
3213800097 Fix assertion failure on teleport cast 2023-08-03 14:20:54 +03:00
5be4f6ec2f Fix visibility of creature amount label after casting spell before turn 2023-07-22 22:49:48 +03:00
e6d8b65e2c Fix toggling of auto combat 2023-07-22 12:15:27 +03:00
1bf6bbd9b6 Significantly simplified threading model in battles 2023-07-18 19:55:59 +03:00
5e8a778e7d Attempt to fix / trace crashes from Google Play statistics 2023-07-18 17:31:21 +03:00
85262cf4f5 Moved CGameState files into a separate directory 2023-06-26 17:15:59 +03:00
8ea0ecaec1 show/showAll methods now use Canvas instead of SDL_Surface
- added compatibility method to Canvas to allow SDL_Surface access
- added drawBorder method to Canvas to replace CSDL_Ext method
- added drawColor method to Canvas to replace CSDL_Ext method
- minor changes to Tavern and Trade windows to adapt to new API
2023-06-02 16:42:18 +03:00
867c5355da Fix tower shooters animation updates 2023-05-20 13:11:52 +03:00
8a31aeb94b Battle animations use tick() for updates 2023-05-14 22:23:00 +03:00
03df274450 Framerate manager is now in a separate file and private member of GH 2023-05-14 22:22:37 +03:00
05eccbc2bb vcmi: split bonus to enumerator and HeroBonus.h 2023-05-03 18:01:06 +03:00
b472c89276 vcmi: make some CStack properties private
There is a getters for this properties already available
2023-04-27 20:58:49 +03:00
4a169972f0 Further refactoring to cleanup code of advmap and locplint 2023-04-20 22:04:24 +03:00
7a5775a9f9 vcmi: use std::optional 2023-04-17 00:43:13 +03:00
bc1aad3b26 vcmi: remove deprecated CStack::getCreature()
Function battle::Unit::unitType() does the same.
2023-04-13 11:24:19 +03:00
11b237a23c vcmi: massive refactoring v1 2023-04-05 22:33:12 +03:00
e9aed2761c Fix target selection for teleport 2023-03-31 23:18:45 +03:00
1fcaeba8e0 Fix stack amount boxes flickering between actions 2023-03-29 13:21:43 +03:00
3af829e6af Fix stack label position updates 2023-03-29 13:03:40 +03:00
0ce06e0f30 Improved rendering of stack amount boxes 2023-03-28 23:50:22 +03:00
4eed0b2c9e Added workaround for Dungeon towers 2023-03-25 23:54:51 +02:00
49fa628e9b Turret creature cutoff position should match H3 2023-03-25 23:54:51 +02:00
dcff463d36 Fixed handling of special palette colors in palette transformations
Fixes black color turning semi-transparent in some creatures from mods
2023-03-25 23:54:51 +02:00
5288e3761e Merge pull request #1764 from IvanSavenko/selectable_spellcaster
Implemented support for multi-spell casters
2023-03-25 20:08:47 +02:00
dc099b2a35 Implemented support for multi-spell casters 2023-03-25 00:48:14 +02:00
76a71226a2 Deactivate activeStack during spellCast 2023-03-24 22:43:41 +01:00
31b718898a Fix playback of shooter animations at max speed 2023-03-20 20:19:05 +02:00
688b8db3eb Removed delays due to thread waits from battle animations 2023-03-20 20:19:05 +02:00
7ef5163d9d Merge pull request #1581 from IvanSavenko/map_render_rewrite
Adventure Map - rendering rewrite
2023-03-05 19:51:07 +02:00
7df5c612f7 Fix battle rendering 2023-03-05 17:48:02 +02:00
acdb8d6e06 renamed Unicode -> TextOperations, to use for all text processing 2023-03-05 17:39:23 +02:00
34dcb4127a Removed text utilities from SDL_Extensions 2023-02-03 18:55:25 +02:00
3fef2a5e1f Moved Colors to a separate file, updated includes 2023-02-03 11:39:40 +02:00
64faa13b6d Merge pull request #1487 from IvanSavenko/battle_actions_refactoring
Battle actions refactoring
2023-02-03 11:28:14 +02:00
2ef33d54ab Merge branch 'develop' into battle-queue-improvement 2023-02-02 18:26:31 +01:00
c3b79c786b Spellcasters UI now shares handling with hero spellcasting 2023-02-02 13:25:55 +02:00
55a58596bc Mostly finished refactoring of BattleActionsController
TODO: test actions
TODO: test casters
TODO: fix random casters
2023-02-02 13:25:55 +02:00
108a42e4ba Reorganized includes for new layout. New class - IImageLoader 2023-02-01 20:42:06 +02:00
e14290fde0 Removed loading of images from file into SDL_Surface 2023-01-30 18:25:47 +02:00
68be7643f1 Remove redundant method - code review suggestion 2023-01-25 13:06:13 +01:00