7
6
Fork
You've already forked Unvanquished
1

unvmods-0.56-bot-menu #28

Open
bmorel wants to merge 14 commits from unvmods-0.56-bot-menu into unvmods-0.56
pull from: unvmods-0.56-bot-menu
merge into: unvmods:unvmods-0.56
unvmods:unvmods-0.56
unvmods:map-testing-0.56.0-14
unvmods:spawn-clear-ui-sweet
unvmods:spawn-clear-ui
unvmods:unvmods-biokit
unvmods:map-testing-0.56.0-13
unvmods:deadbeef-mover-fixes
unvmods:map-testing-0.56.0-12
unvmods:map-testing-0.56.0-11
unvmods:map-testing-0.56.0-10
unvmods:map-testing-0.56.0-9
unvmods:unvmods-0.56-mods-space-brawl-ok
unvmods:deadbeef-spinigun
unvmods:map-testing-0.56.0-8
unvmods:unvmods-0.56-fix-ps-stats
unvmods:unvmods-0.56-no-__DATE__
unvmods:unvmods-readme-update
unvmods:unvmods-0.56-bugfixes
unvmods:chaingun-overheat
unvmods:bunker-0.56.0-0
unvmods:entity-cache-robustness
unvmods:unvmods-0.56-deadbeef-pending
unvmods:map-testing-0.56.0-7
unvmods:map-testing-0.56.0-7-lua-bsp-nodes
unvmods:bunker-0.56.0-rtm
unvmods:bunker-0.56.0-rc2
unvmods:bunker-0.55.3-4
unvmods:kench-stacking-0.55.5
unvmods:bunker-0.55.3-3
unvmods:bunker-0.55.3-2-sm2
unvmods:unvmods-0.56-stack-buildings-dirty
unvmods:unvmods-0.56-rotator-obstacle
unvmods:deadbeef-0.56-fix-server-version
unvmods:bunker-0.55.3-2
unvmods:g_admin_crash
unvmods:unvmods-gdb-stack-trace
unvmods:unvmods-stack-traces
unvmods:bunker-0.55.3-1
unvmods:zzz_enneract
unvmods:grise-patch-1
unvmods:bunker-0.55.3-0
unvmods:chainturbations-fix
unvmods:bunker-0.55.2-0
unvmods:master

This PR does 3 things:

  1. it replaces texts with icons
  2. it enables controlling jetpack use, which was missing in the icons and in the code
  3. it makes the command says what is the missing element, when an error is found

I would propose to squash this whole PR into a single commit if those changes are OK (they are used on all our servers, with the obvious exception of my commits as I made them right now).
This would make things easier in the future.
Another point is that, perhaps, the botallow/botequip wording could be uniformised. This is really a nitpick, but I tend to like consistency. I have NOT done that change though, in an effort to reduce git conflicts with other codebases.

This PR does 3 things: 1. it replaces texts with icons 2. it enables controlling jetpack use, which was missing in the icons and in the code 3. it makes the command says what is the missing element, when an error is found I would propose to squash this whole PR into a single commit if those changes are OK (they are used on all our servers, with the obvious exception of my commits as I made them right now). This would make things easier in the future. Another point is that, perhaps, the botallow/botequip wording could be uniformised. This is really a nitpick, but I tend to like consistency. I have NOT done that change though, in an effort to reduce git conflicts with other codebases.
bmorel force-pushed unvmods-0.56-bot-menu from cf67ca219e to f92d20a4b4 2025年11月22日 12:55:54 +01:00 Compare

Sorry for the nasty code duplication in the bot squad function. I planned to integrate this into Cmd_Tactic_f, but never did that (lol).

Sorry for the nasty code duplication in the bot squad function. I planned to integrate this into `Cmd_Tactic_f`, but never did that (lol).
Author
Owner
Copy link

feel free to fix it then I guess. I don't consider it to be that important, I prefer to have the feature with code dup, than to have no feature.

feel free to fix it then I guess. I don't consider it to be that important, I prefer to have the feature with code dup, than to have no feature.
Author
Owner
Copy link

regarding what you mentioned on IRC, that the /tactics stuff could be removed as 0.56 is going to have the circle menu for that, I would like to remind people that the circle menu does NOT handles the squad A vs squad B system, which is a very handy thing.
But I guess we could indeed split this PR and it's commits so that it is removed. I would personally still keep it in my branch, though (that is, until bots start to be able to plan and to act in squads without being hand-held, which is not tomorrow)

regarding what you mentioned on IRC, that the /tactics stuff could be removed as 0.56 is going to have the circle menu for that, I would like to remind people that the circle menu does NOT handles the squad A vs squad B system, which is a very handy thing. But I guess we could indeed split this PR and it's commits so that it is removed. I would personally still keep it in my branch, though (that is, until bots start to be able to plan and to act in squads without being hand-held, which is not tomorrow)
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin unvmods-0.56-bot-menu:unvmods-0.56-bot-menu
git switch unvmods-0.56-bot-menu

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch unvmods-0.56
git merge --no-ff unvmods-0.56-bot-menu
git switch unvmods-0.56-bot-menu
git rebase unvmods-0.56
git switch unvmods-0.56
git merge --ff-only unvmods-0.56-bot-menu
git switch unvmods-0.56-bot-menu
git rebase unvmods-0.56
git switch unvmods-0.56
git merge --no-ff unvmods-0.56-bot-menu
git switch unvmods-0.56
git merge --squash unvmods-0.56-bot-menu
git switch unvmods-0.56
git merge --ff-only unvmods-0.56-bot-menu
git switch unvmods-0.56
git merge unvmods-0.56-bot-menu
git push origin unvmods-0.56
Sign in to join this conversation.
No reviewers
No labels
bug
regression
upstream
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
unvmods/Unvanquished!28
Reference in a new issue
unvmods/Unvanquished
No description provided.
Delete branch "unvmods-0.56-bot-menu"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?