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
Ivan Savenko
f7718628dc
Merge pull request #3074 from Nordsoft91/quests
...
Fix warnings about empty kill target
2023-10-18 12:34:44 +03:00
nordsoft
966ffe4377
Fix warnings about empty kill target
2023-10-18 00:13:32 +02:00
Alexandre Detiste
15e45f966c
typos found by lintian
2023-10-17 22:06:08 +02:00
Nordsoft91
1ffc246c8b
Merge pull request #3051 from Laserlicht/name_change
...
possibility to change name in lobby
2023-10-16 22:28:31 +02:00
Nordsoft91
02c1425939
Merge pull request #3046 from Nordsoft91/editor-improvements-1.4
...
Add map editor zoom and objects lock functionality
2023-10-16 01:22:18 +02:00
nordsoft
4651893b48
Fix hota quests
2023-10-14 00:15:15 +02:00
nordsoft
5f52e6b35e
Revert "Auxiliary commit to revert individual files from 2bf8cdc9f525099348439c700af0466955f01b30"
...
This reverts commit d9952495391f7ac77dd32dcf33f487e146b3655b.
2023-10-13 23:35:37 +02:00
Laserlicht
0c6b1ca3c8
possibility to change name
2023-10-13 23:04:35 +02:00
nordsoft
55900ceb66
Add portraits delegate
2023-10-13 20:15:29 +02:00
nordsoft
2bf8cdc9f5
Hota-related bugs were fixed
2023-10-13 12:52:45 +02:00
nordsoft
fbf5492fd9
Remove unnecessary virtuals
2023-10-12 13:30:01 +02:00
nordsoft
74a90cde5d
Fix hero level limiter
2023-10-12 12:52:01 +02:00
nordsoft
14b030d2eb
Support hota quest gates
2023-10-11 23:15:24 +02:00
nordsoft
7ccd4cdcb2
Refactor quests progress
2023-10-11 21:10:42 +02:00
nordsoft
22c9eecd7d
Fix mistake
2023-10-11 08:54:54 +02:00
nordsoft
2b88e6941c
Fix mana limiter
2023-10-11 01:43:24 +02:00
nordsoft
6093f042dd
Text container fix
2023-10-11 01:26:07 +02:00
nordsoft
8335fffaea
Fix rumors
2023-10-11 00:58:32 +02:00
nordsoft
5b10b457cf
Fix code review suggestions
2023-10-11 00:47:19 +02:00
nordsoft
62c4e8a98d
Fix compiling
2023-10-10 23:44:29 +02:00
nordsoft
31d71ddd25
Minor fixes in text
2023-10-10 23:44:29 +02:00
nordsoft
5eeda3cd25
Quests mostly work
2023-10-10 23:44:29 +02:00
nordsoft
d2d64dbddd
Bugfixes
2023-10-10 23:44:29 +02:00
nordsoft
bb238f9b72
New quests work
2023-10-10 23:44:29 +02:00
nordsoft
63bdfb8ff6
New quests implemented
2023-10-10 23:44:29 +02:00
nordsoft
1460541ee5
New limiter based quests
2023-10-10 23:44:29 +02:00
nordsoft
b7568a160c
Fixes
2023-10-10 23:44:29 +02:00
nordsoft
6a7b23c007
Additional properties for limiter
2023-10-10 23:44:28 +02:00
nordsoft
937a8d63c7
Check for artifacts copies in limiter
2023-10-10 23:44:28 +02:00
nordsoft
0cf3205e15
Fix quest regressions
2023-10-10 23:44:28 +02:00
nordsoft
d7d435dcb7
Add game pause
2023-10-08 16:03:57 +02:00
Nordsoft91
1c4bbf1078
Merge pull request #3012 from Nordsoft91/fixes
2023-10-08 12:11:32 +02:00
nordsoft
043f54698b
Fix translations in map editor / fix crash on game end
2023-10-05 23:34:29 +02:00
SoundSSGood
bcce4c68e5
Artifacts placement fixed
2023-10-05 15:17:02 +03: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
39a92cdde3
Add query for dwellings dialog
2023-10-04 17:47:12 +03:00
Ivan Savenko
898733eed7
Added Query to track visit duration for Taverns and Markets
2023-10-04 17:47:12 +03:00
Andrii Danylchenko
20a944c551
Merge pull request #2884 from vcmi/nkai-air-water-walking
...
NKAI: water and air walking
2023-10-03 21:46:35 +03:00
Laserlicht
ec8580b99e
Merge branch 'develop' into patch-4map_overview_rework
2023-10-02 21:03:16 +02:00
Nordsoft91
80be1e9f4c
Merge pull request #2981 from Nordsoft91/rmg-template
...
Select random object template instead of first
2023-10-02 20:42:39 +02:00
Nordsoft91
c57d5545c2
Merge pull request #2971 from Nordsoft91/translations
...
Multi-language support for network game and for VMAPs
2023-10-02 20:41:42 +02:00
nordsoft
10eb19758a
Code review fixes
2023-10-01 18:00:36 +02:00
Ivan Savenko
b21a361b99
Merge pull request #2814 from SoundSSGood/arts-counter-impovements
...
Artifacts counter impovements
2023-10-01 17:53:51 +03:00
nordsoft
3ea7988883
Treasure placement uses random templates now
2023-09-30 23:06:38 +02:00
Laserlicht
8b835c9253
load game support
2023-09-30 20:03:33 +02:00
Andrii Danylchenko
2dd0d76412
NKAI: water and air walking
2023-09-30 10:37:32 +03:00
nordsoft
1502ea2250
Fix pandora mana problem
2023-09-30 01:33:12 +02:00
nordsoft
ce62ab3e66
Select random object template instead of first
2023-09-30 01:19:18 +02:00
