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

14592 Commits

Author SHA1 Message Date
Ivan Savenko
c839b397e8 Block self-casting, e.g. Archangels can't resurrect themselves 2024-01-15 23:16:53 +02:00
Ivan Savenko
6e5da6c158 Fixed Coronius specialty applying from two locations in code 2024-01-15 23:16:53 +02:00
Ivan Savenko
4735ad8299 Automatically activate scholar skill on visiting town 2024-01-15 23:16:53 +02:00
Ivan Savenko
c21913f661 Fixed initialization of move points and mana for dismissed heroes 2024-01-15 23:16:48 +02:00
Ivan Savenko
03675e1c48 Remove incorrect bonus - Black Dragons dont hate Giants 2024-01-15 21:09:22 +02:00
DjWarmonger
781cb4dabe
Add link do GPT Store 2024-01-15 19:38:24 +01:00
Ivan Savenko
d1055bdf2c
Merge pull request #3501 from Alexander-Wilms/remove-unused-git-branch-name
CI config cleanup
2024-01-15 19:07:07 +02:00
Ivan Savenko
2265890f69 Better detection of invalid mod data to avoid crash and notify modders 2024-01-15 18:19:21 +02:00
Alexander Wilms
cb82fcd954 Try to work around macOS CPack error 2024-01-15 13:00:41 +00:00
Alexander Wilms
9dd09d0a7e Make CI badge link to scheduled builds 2024-01-15 12:24:04 +00:00
Ivan Savenko
a32ef673f7
Merge pull request #3482 from IvanSavenko/extend_hota_bonuses
Extend hota bonuses
2024-01-15 13:47:13 +02:00
Ivan Savenko
9acd436a09 Review suggestion 2024-01-15 13:18:27 +02:00
Alexander Wilms
58f0dbc38b CI: Remove act10ns/slack action, since Slack's own GitHub app is sufficient 2024-01-15 11:11:24 +00:00
Alexander Wilms
03b20b5d58 CI: Add empty lines between steps in workflow file 2024-01-15 11:11:18 +00:00
Ivan Savenko
c7897300c0 Fixed missing translation strings on loading campaign save
- campaign header now contains text container and stores campaign texts
- map header now contains text container instead of inheriting it
- moved text container registration logic to a wraper class
- fixed registration of copied text containers (from copied map header)
2024-01-15 13:10:25 +02:00
Alexander Wilms
7c836f1320 Removed the unused EthanSK/git-branch-name-action@v1 action from CI workflow 2024-01-15 10:37:06 +00:00
Ivan Savenko
f863665ede
Merge pull request #3496 from vcmi/dependabot/github_actions/actions/upload-artifact-4
Bump actions/upload-artifact from 3 to 4
2024-01-15 12:21:34 +02:00
Ivan Savenko
62abe9d1e3
Merge pull request #3497 from vcmi/dependabot/github_actions/actions/download-artifact-4
Bump actions/download-artifact from 3 to 4
2024-01-15 12:21:22 +02:00
Ivan Savenko
87b26acdf8
Merge pull request #3495 from vcmi/dependabot/github_actions/act10ns/slack-2
Bump act10ns/slack from 1 to 2
2024-01-15 12:03:39 +02:00
Ivan Savenko
656162dedf
Merge pull request #3494 from vcmi/dependabot/github_actions/actions/setup-python-5
Bump actions/setup-python from 4 to 5
2024-01-15 12:03:15 +02:00
Ivan Savenko
7b4a4319c1
Merge pull request #3493 from vcmi/dependabot/github_actions/octokit/request-action-2.1.9
Bump octokit/request-action from 2.1.0 to 2.1.9
2024-01-15 12:02:46 +02:00
Ivan Savenko
a582cb554e
Merge pull request #3500 from IvanSavenko/fix_dendroid_bind
[1.4.3] Fix handling of Dendroid's Bind ability
2024-01-15 12:02:06 +02:00
Ivan Savenko
b4a1a755a4
Merge pull request #3498 from IvanSavenko/simturns_pathfinder
[1.4.3] Fixes for simultaneous turns
2024-01-15 12:00:54 +02:00
Ivan Savenko
c940bf226e
Merge pull request #3499 from IvanSavenko/bugfixing
[1.4.3] Bugfixing
2024-01-15 12:00:31 +02:00
Ivan Savenko
cb79a45748
Merge pull request #3483 from Alexander-Wilms/semicolons-after-macros
Remove trailing semicolons from macro definitions
2024-01-15 11:58:33 +02:00
Ivan Savenko
8400c27251
Merge pull request #3491 from IvanSavenko/change_default_driver
Change default SDL driver name from opengl to empty (autoselection)
2024-01-15 11:57:42 +02:00
Andrii Danylchenko
4f27d7adc8
Merge pull request #3489 from vcmi/battle-ai-drop-adjust-positions
Battle ai drop adjust positions
2024-01-15 09:08:00 +02:00
Tomasz Zieliński
0273d9c36b Remove unused variable 2024-01-15 07:59:50 +01:00
Tomasz Zieliński
285bafdbf4 Do not ban heroes in Prisons, they might be rehired after they are defeated.
Restore hero to pool if Prison fails to be placed.
2024-01-15 07:41:29 +01:00
Tomasz Zieliński
ee6c331bad Merge remote-tracking branch 'origin/beta' into random_prison_distributor 2024-01-14 21:56:49 +01:00
DjWarmonger
19765e0e01
Merge pull request #3480 from IvanSavenko/rmg_ban_starting_heroes
Ban starting heroes in RMG
2024-01-14 21:56:16 +01:00
Ivan Savenko
0d0d3d8c80 Renamed speed -> getMovementRange, remove misleading default parameter 2024-01-14 17:14:36 +02:00
Ivan Savenko
5565b55bb0 Fixed handling of SPELL_AFTER_ATTACK without addInfo field 2024-01-14 17:13:33 +02:00
Alexander Wilms
bc781c28e0 Remove trailing semicolon from NET_EVENT_HANDLER macro 2024-01-14 14:49:25 +00:00
Alexander Wilms
d2b105f216 CLoggerBase: Use IvanSavenko's single-statement macro so that ct100 is not immediately destroyed 2024-01-14 14:48:48 +00:00
Ivan Savenko
cc6d4fae4c Show tooltip on simturns AI option right-click 2024-01-14 16:02:57 +02:00
Ivan Savenko
fd499e318d Review suggestion 2024-01-14 15:36:29 +02:00
dependabot[bot]
8144165bdb
Bump actions/download-artifact from 3 to 4
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-14 13:11:18 +00:00
dependabot[bot]
fba3716aa1
Bump actions/upload-artifact from 3 to 4
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-14 13:11:15 +00:00
dependabot[bot]
cbc0190429
Bump act10ns/slack from 1 to 2
Bumps [act10ns/slack](https://github.com/act10ns/slack) from 1 to 2.
- [Release notes](https://github.com/act10ns/slack/releases)
- [Changelog](https://github.com/act10ns/slack/blob/master/RELEASE.md)
- [Commits](https://github.com/act10ns/slack/compare/v1...v2)

---
updated-dependencies:
- dependency-name: act10ns/slack
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-14 13:11:11 +00:00
dependabot[bot]
85d5e360af
Bump actions/setup-python from 4 to 5
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-14 13:11:08 +00:00
dependabot[bot]
bb0816dd14
Bump octokit/request-action from 2.1.0 to 2.1.9
Bumps [octokit/request-action](https://github.com/octokit/request-action) from 2.1.0 to 2.1.9.
- [Release notes](https://github.com/octokit/request-action/releases)
- [Commits](https://github.com/octokit/request-action/compare/v2.1.0...v2.1.9)

---
updated-dependencies:
- dependency-name: octokit/request-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-14 13:11:04 +00:00
Ivan Savenko
2be41fa916
Merge pull request #3492 from IvanSavenko/fix_dependabot_name
corrected dependabot file name
2024-01-14 15:10:42 +02:00
Ivan Savenko
059347048f
Merge pull request #3481 from Laserlicht/bugfix_cheat
vcmiobelisk bugfix
2024-01-14 14:42:10 +02:00
Ivan Savenko
5d21f103c8 corrected dependabot file name 2024-01-14 14:38:48 +02:00
Ivan Savenko
b08462d555 Change default SDL driver name from opengl to empty (autoselection) 2024-01-14 14:29:13 +02:00
Ivan Savenko
d3a1cdb97a
Merge pull request #3485 from Laserlicht/fix_selection
fix buggy multiplayer selection
2024-01-14 14:23:32 +02:00
Ivan Savenko
d4509bd03b
Merge pull request #3487 from Alexander-Wilms/ci-badge
CI badge: Only report status of vcmi/vcmi, ignore statuses of PRs
2024-01-14 14:22:01 +02:00
Ivan Savenko
ab1cdb0cab
Merge pull request #3488 from Alexander-Wilms/dependabot-config
Add Dependabot configuration to update GitHub Actions
2024-01-14 14:18:21 +02:00
Ivan Savenko
c1a870c842
Merge pull request #3484 from Laserlicht/console_fix
console fix
2024-01-14 14:17:34 +02:00