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

13769 Commits

Author SHA1 Message Date
Alexander Wilms
bcaa2e5966 AI/VCAI/VCAI.cpp: Remove "e" from "throw" statement to rethrow the original exception.
The original exception object should be rethrown
2023-10-27 14:29:44 +00:00
Alexander Wilms
e4aaeef5da AUTHORS.h: Global variables should be const.
Non-const global variables should not be used
2023-10-27 14:29:34 +00:00
Alexander Wilms
04b3dca773 github.yml: Remove duplicate -prune in line endings stage 2023-10-27 14:28:58 +00:00
Alexander Wilms
1d206253e0 CI/linux-qt6/validate_json.py: Use sys.exit(1) instead of throwing Exception 2023-10-27 14:28:19 +00:00
Alexander Wilms
6516ecbedd Format CI/linux-qt6/validate_json.py with 'black -l999 .' 2023-10-27 14:28:05 +00:00
Nordsoft91
def927f8be
Merge pull request #3106 from Nordsoft91/editor-improvements-1.4
Fixes for map editor
2023-10-26 23:23:02 +02:00
Nordsoft91
8824835c09
Merge pull request #3096 from Alexander-Wilms/develop
Add CI stage to ensure LF line endings
2023-10-26 23:19:40 +02:00
Nordsoft91
8f2b50a5e2
Merge pull request #3095 from Laserlicht/team_alignment
fix team alignments
2023-10-26 23:19:18 +02:00
Ivan Savenko
feae8b6ae4 Do not allow loading new objects into another mod namespace 2023-10-26 15:32:46 +03:00
Ivan Savenko
6337b0d3b9 Fix potential crash on loading mod with invalid handler name 2023-10-26 15:32:13 +03:00
Tomasz Zieliński
a817e481d0 Merge fix 2023-10-26 10:46:04 +02:00
Tomasz Zieliński
36911d1e0a Merge remote-tracking branch 'origin/develop' into fix_rmg_teams
# Conflicts:
#	client/lobby/RandomMapTab.cpp
2023-10-26 10:31:41 +02:00
krs
7d473317ac Renamed to AI.md 2023-10-26 00:13:22 +03:00
krs
27c4a1fe15
Update ai-description.md 2023-10-25 22:59:45 +03:00
krs
d0cdd06383 Update docs/developers/ai-description.md
Co-authored-by: Alexander Wilms <Alexander-Wilms@users.noreply.github.com>
2023-10-25 22:23:06 +03:00
krs
90f20b20d5 Added ai-description to docs 2023-10-25 21:13:47 +03:00
nordsoft
b6b75beb29 Fixes for map editor
1) fix owner serialization for hero placeholder
2) fix roads/rivers layout
3) fix lasso
2023-10-24 23:58:26 +02:00
Laserlicht
e28d14d16d
not needed anymore 2023-10-24 18:56:30 +02:00
Laserlicht
abb279f5b4
use config 2023-10-24 18:51:58 +02:00
Ivan Savenko
c202f58a15 Account for conflicts (and reverse-conflicts) when loading mods 2023-10-24 14:01:20 +03:00
Ivan Savenko
5cbf5031ea move SetStackEffect to a separate file 2023-10-24 01:27:52 +03:00
krs
ab7caa0777 Removed space after Torosar hero name 2023-10-23 23:57:37 +02:00
Ivan Savenko
9fc3d822bb
Merge pull request #3103 from IvanSavenko/spell_shool_fix
Fix crash on accessing "any" spellschool via bonus system
2023-10-23 23:58:36 +03:00
Ivan Savenko
77780e0de5 Fix crash on accessing "any" spellschool via bonus system 2023-10-23 22:28:36 +03:00
Ivan Savenko
2315ea84ec
Invert condition 2023-10-23 22:18:21 +03:00
Ivan Savenko
7dfdee2db8 Check whether H3 data has been imported using most common spellings of
data directory
2023-10-23 20:33:01 +03:00
Ivan Savenko
91e202e0e3 Ignore case when checking whether path is white-listed.
Fixes data import with H3 data that has different case in directory names
2023-10-23 20:32:45 +03:00
Ivan Savenko
5523f05284 Moved ArtifactLocation to a separate file 2023-10-23 19:02:28 +03:00
Alexander Wilms
941181b8b9 Convert XML files in android/ from CRLF to LF, exclude .bat files from CI check 2023-10-23 13:33:09 +00:00
Ivan Savenko
ae92bdfb51 Fix Lua and test building 2023-10-23 16:05:38 +03:00
Alexander Wilms
f63c2ac5db
CI step "Ensure LF line endings": No need to ignore Android files
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2023-10-23 14:55:09 +02:00
Ivan Savenko
b88a8da4e8 Split off some netpack structures into separate files 2023-10-23 13:59:15 +03:00
Ivan Savenko
d1d4db26e0 Moved existing files to new directory 2023-10-22 22:20:36 +03:00
Andrii Danylchenko
f74daa2e1f BattleAI: fix health bounty calculation 2023-10-22 22:06:42 +03:00
Andrii Danylchenko
870fbd50e3 BattleAI: bigger reachability map 2023-10-22 21:37:55 +03:00
Andrii Danylchenko
9eb9404f28 BattleAI: divide only positive part of score onto turns count 2023-10-22 21:37:54 +03:00
Alexander Wilms
7e9a3ea042 CI step "Ensure LF line endings": Don't create subshell for grouped commands 2023-10-22 17:50:16 +00:00
Alexander Wilms
0ff423ff0e Change remaining CRLF line endings to LF
find . -type f -name "*.JSON" -exec dos2unix {} \+;
2023-10-22 16:41:09 +00:00
Alexander Wilms
9e84ddc0aa Add CI stage to ensure LF line endings
Based on @josch's command:
https://github.com/vcmi/vcmi/pull/3078#issuecomment-1772150744
2023-10-22 16:12:16 +00:00
Ivan Savenko
3880ea58b9 Merge branch 'josch/dos2unix' into develop 2023-10-22 18:39:03 +03:00
Ivan Savenko
3867e512f7
Merge pull request #3064 from IvanSavenko/bonus_metaidentifier
Type-safe bonus system
2023-10-22 18:34:12 +03:00
Ivan Savenko
b0a67a66e4
Merge pull request #3092 from IvanSavenko/compatibility_mods
Better support for compatibility mods
2023-10-22 18:02:45 +03:00
Ivan Savenko
85f902fa26 Update docs 2023-10-22 17:12:34 +03:00
Ivan Savenko
8df39c43a0 Fix game loading 2023-10-22 17:04:14 +03:00
Ivan Savenko
a5f0429691
Merge pull request #3083 from Nordsoft91/editor-improvements-1.4
Redesign map editor rendering
2023-10-22 16:56:39 +03:00
Ivan Savenko
a70ad7202f
Merge pull request #3088 from Laserlicht/non_squared
Minimap keep aspect ratio (Letterboxing)
2023-10-22 16:55:58 +03:00
Ivan Savenko
4f47555977 Split OBJECT bonus source into OBJECT_TYPE and OBJECT_INSTANCE 2023-10-22 16:55:19 +03:00
Ivan Savenko
ac925bb786 Renamed new types for consistency with code style 2023-10-22 16:55:19 +03:00
Ivan Savenko
31cf3442af Update docs 2023-10-22 16:55:19 +03:00
Ivan Savenko
36a1d6c415 Removed remaining integer bonus subtypes from configs 2023-10-22 16:55:19 +03:00