1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-02 09:02:03 +02:00
Commit Graph

304 Commits

Author SHA1 Message Date
Ivan Savenko
10e50548e7 Converted Component class to use VariantIdentifier instead of int 2023-11-02 12:00:04 +02:00
Ivan Savenko
b88a8da4e8 Split off some netpack structures into separate files 2023-10-23 13:59:15 +03:00
Ivan Savenko
3880ea58b9 Merge branch 'josch/dos2unix' into develop 2023-10-22 18:39:03 +03:00
Laserlicht
737525756f
fix redraw 2023-10-21 17:28:23 +02:00
Laserlicht
e03f2a9d3a
improvements for non quadratic maps 2023-10-21 16:49:50 +02:00
Johannes Schauer Marin Rodrigues
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
Laserlicht
2fcbf78e4e
unused var 2023-10-17 21:22:27 +02:00
Laserlicht
464c65a595
fix 2023-10-17 21:17:57 +02:00
Laserlicht
e05102192b
heroes and more buttons 2023-10-17 21:13:08 +02:00
Laserlicht
d5b16ac96c
rename 2023-10-16 01:43:50 +02:00
Laserlicht
f3262a47c0
Update client/adventureMap/CList.cpp
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2023-10-16 01:42:01 +02:00
Laserlicht
4528f42cdf
fix segmentation fault; update townlist on adventuremap 2023-10-15 15:53:19 +02:00
Laserlicht
3b853bff08
sort town feature 2023-10-15 14:31:33 +02:00
Laserlicht
f9db3d131f
lastActivated with overload 2023-10-10 23:51:05 +02:00
Laserlicht
53ee843e7e
fixes problem with radial menu 2023-10-10 22:33:22 +02:00
Laserlicht
890c4ac19d
quick army managment click next 2023-10-10 22:11:06 +02:00
nordsoft
9b54b25a6c Show timer only for one player 2023-10-06 18:17:05 +02:00
nordsoft
a09c595cf4 Support simturn timers 2023-10-06 18:17:05 +02:00
Ivan Savenko
b75a67ef7c
Merge pull request #2973 from IvanSavenko/identifier_explicit_constructor
Improvements to type safety of Identifier class
2023-10-05 00:33:07 +03:00
Ivan Savenko
037efdf5fc Improvements to type safety of Identifier class
- Constructor of Identifier from integer is now explicit
- Lobby hero/town selection now uses Identifiers instead of int's
- Removed serialization workaround for hero portraits
- Added dummy objects for custom heroes portraits for ID resolver to use
- HeroInstance now stores portrait ID only in case of custom portrait
- Fixed loading of campaign heroes portraits on RoE maps
2023-10-04 18:05:23 +03:00
Ivan Savenko
898733eed7 Added Query to track visit duration for Taverns and Markets 2023-10-04 17:47:12 +03:00
Ivan Savenko
56074e18a9 Block turn end button after player ends turn 2023-09-26 13:42:20 +03:00
Laserlicht
72e4941982
dimlevel as class variable 2023-09-24 12:08:27 +02:00
Laserlicht
b143c2786f
use dimming to hide screen 2023-09-24 00:58:48 +02:00
Ivan Savenko
a9abd294da
Merge pull request #2876 from IvanSavenko/revisit_object_button_block
Block revisit object shortcut if no visit is possible
2023-09-20 22:09:36 +03:00
Ivan Savenko
42d9ba6c82
Merge pull request #2877 from IvanSavenko/simturn_fixes
Changes for simturns support
2023-09-20 22:09:25 +03:00
Ivan Savenko
d3ced6b703 Block revisit object shortcut if no visit is possible 2023-09-19 19:51:31 +03:00
Ivan Savenko
8c0d78f1d9 Added initiator-player to packs that add/remove/move objects 2023-09-19 19:24:34 +03:00
Laserlicht
a2174dc83f
fix window open while sound playing 2023-09-19 11:20:16 +02:00
Laserlicht
6ae09d8458
newday 2023-09-19 09:52:32 +02:00
Laserlicht
bcf32984ce
always sound at chat message 2023-09-19 01:08:49 +02:00
Ivan Savenko
c8e6a7cd27 Fixed most common cases of movement actions 2023-09-16 20:07:26 +03:00
Laserlicht
19693d251d comments 2023-09-15 15:15:33 +02:00
Laserlicht
6d69326c1a alternative implementation 2023-09-15 15:15:33 +02:00
Laserlicht
8d160101ed alt mode to select instead of changing path 2023-09-15 15:15:33 +02:00
Ivan Savenko
f8541d0ae4 Merge branch 'vcmi/master' into 'vcmi/develop' 2023-09-15 13:59:02 +03:00
Ivan Savenko
a09147a433 Do not block map layer toggles in world view mode 2023-09-12 21:15:14 +03:00
Nordsoft91
0a799ecc46
Merge pull request #2740 from Laserlicht/fix_cursor_issue 2023-09-11 22:20:11 +02:00
Laserlicht
2cb28178ae
code review 2023-09-10 20:52:35 +02:00
Ivan Savenko
63a8cd9642 Fix quest log button block status 2023-09-05 23:31:26 +03:00
Ivan Savenko
47249ee5ed Fix resource bar UI in hotseat 2023-09-05 23:31:20 +03:00
Ivan Savenko
1d0e696db6 Added RenderHandler that acts as factory for images and animations 2023-09-04 18:22:34 +03:00
Ivan Savenko
9cfcf5ea19 Fix regressions 2023-09-04 18:22:34 +03:00
Ivan Savenko
0f88b8969b Removed some usages of std string as resource path 2023-09-04 18:22:34 +03:00
Ivan Savenko
8dfdfffd87 Use ResourcePath for audio files 2023-09-04 18:22:34 +03:00
Ivan Savenko
6f0108e462 Use ResourcePath for referencing texts and json's 2023-09-04 18:22:34 +03:00
Ivan Savenko
823ffa7a07 Always use ResourcePath for referencing images and animations 2023-09-04 18:22:34 +03:00
Michael
20fd0d8901
fix cursor issue 2023-09-02 18:35:32 +02:00
Ivan Savenko
cab2bddf7e
Merge pull request #2712 from Laserlicht/dim_map
Dim adventuremap
2023-09-01 22:37:10 +03:00
Michael
1721fe1ad6
optimize if disabled 2023-08-31 21:03:54 +02:00