Skip to content

Feature aircraft drop passengers #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
TaranDahl wants to merge 9 commits into
base: MJmain
Choose a base branch
from
Open

Feature aircraft drop passengers #12

TaranDahl wants to merge 9 commits into from

Conversation

@TaranDahl
Copy link
Owner

@TaranDahl TaranDahl commented Mar 25, 2024

No description provided.

@TaranDahl TaranDahl force-pushed the MJmain branch 2 times, most recently from 00e608f to 2d7af16 Compare May 17, 2024 03:12
@Starkku Starkku force-pushed the feature-aircraft-drop-passengers branch from 5f0b6e9 to 0ec4542 Compare July 6, 2024 15:09
CrimRecya added a commit that referenced this pull request Mar 4, 2025
@TaranDahl @DeathFishAtEase @CrimRecya
Auto building rally points (#12)
8427505 
* unfinished

* update

* [Docs] update & fix

* [Doc][zh-cn] CREDITS

Due to some processing issues with the sphinx-build command, there were some minor problems with the previous Mentalmeisters Team section

* update

* update

* update

* ready to go

* 更新改动说明

* 更改一些可本地化内容

* 更新改动说明

* 删个等号

* update

* 修复扩散抛体的小问题

* 更新改动

* update

* docs

* 1

* 移除多余

* Core

* 额外功能说明

* 更新改动说明

* Fit with trajectory

* Fix compile error

* Fix YRpp

* Optimize and rename

---------

Co-authored-by: 九千天华 <[email protected]>
Co-authored-by: CrimRecya <[email protected]>
CrimRecya added a commit that referenced this pull request Mar 5, 2025
@CrimRecya
Squashed commit of the following:
65890a7 
commit 2bdc233b9ca3d794d98c0f3429003750de9fd0f9
Author: CrimRecya <[email protected]>
Date:   Thu Mar 6 00:30:00 2025 +0800

    加播个语音

commit d0c8ef43698804f043077ad30e21bf091330a1bc
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 23:50:07 2025 +0800

    将计算方法调整回去

commit 6218bda6effcba850ddb64a3580d9429f6d3c496
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 22:51:31 2025 +0800

    改变提交检查机制

commit e543044ce8f6b80cbd39553efa10facc2def8dee
Merge: d96a5bb2 abe7a823
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 22:50:40 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit abe7a823e125e37a5a4fe50c02200deb6efbe35a
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 22:50:16 2025 +0800

    改变提交检查机制

commit d96a5bb2258838cb97b12036183c1660c0e0015c
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 22:30:47 2025 +0800

    版本号更新

commit 107b50d3c36cc35517712571e9ae51d90299aa84
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 22:24:29 2025 +0800

    更新改动说明

commit 16944848abd94de2def433a3fdafbd4bc2e4cb07
Merge: a6dd9ff5 8331ba92
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 22:15:11 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 8331ba928ac8ea384247e45e46c4291ea2954c66
Merge: 304a4702 6e44b4a3
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 22:14:48 2025 +0800

    Merge branch 'develop' into develop-Mix4BEtest

commit a6dd9ff5c27938c5c86e2938ea5729488ffa4d5c
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 22:13:06 2025 +0800

    修复多炮塔读取问题并优化相关代码

commit 51168d1f3b887f4266cf363fcf814d45f082c052
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 21:23:32 2025 +0800

    优化子机返回位置

commit 955c628d2ee27f72067ff5094df363211bca0aa5
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 20:13:47 2025 +0800

    修一下自动建筑范围判断的小问题

commit 6e44b4a31354d67431e51b6a8430541b673335d9
Author: 九千天华 <[email protected]>
Date:   Wed Mar 5 20:12:07 2025 +0800

    Standardize the text of the previously submitted document at Ollerus' request.

commit e306631a27431bb535fac2eaef5680eacc8e2904
Merge: a0bdbb78 304a4702
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 16:10:32 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 304a4702984e4d3031a79e19d2a736f01904a5b2
Merge: d4ad4efa 7ebb58b1
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 16:10:21 2025 +0800

    Merge branch 'develop-FloatMinerPathFix' into develop-Mix4BEtest

commit d4ad4efab35bff3a6254a491cac931fd38def369
Merge: a214926e 5994d6eb
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 16:09:57 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit 7ebb58b1225a584de498d83e93d20e68be46aa90
Merge: 00094e04 5994d6eb
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 16:08:09 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-FloatMinerPathFix

commit 00094e04a31e96f0b1db6d10fbbc79cf486d03a1
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 16:07:36 2025 +0800

    Not affect teleporters and add the comment

commit 5994d6eb0573cd6e817c9024b7b87eeba4cbd263
Author: Netsu_Negi <[email protected]>
Date:   Wed Mar 5 15:56:06 2025 +0800

    Fix Pathfinding Bugs by Decoupling SpeedType from Hardcoded Values (#1552)

    `FreeUnit` uses the unit's own `SpeedType` to find the spawn location.
    The bug where naval ships as StartUnit might spawn on land has been
    fixed.
    When a building undeploy, it will normally use the target VehicleType's
    pathfinding method to decide whether it can move to the target cell.

    ---------

    Co-authored-by: 九千天华 <[email protected]>

commit a0bdbb7840c234269b428f69f2a185e938afdbdf
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 15:37:49 2025 +0800

    加点注释再优化一下

commit 9b7e78de84f24ad980eabfdb92ea68977072b35b
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 14:19:52 2025 +0800

    修复不可作为延伸的建筑自动放不下去的问题

commit 27e635cc2ff4608bc28e3789fffa224c1d63ece0
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 14:19:14 2025 +0800

    优化初始位置

commit 99a93a8c164b59dafbe93c257af9ebf99d848767
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 12:46:57 2025 +0800

    更换顺序并优化

commit aa7ceeaf0b65c306a5ffc9b29ba40be8360d8233
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 12:46:30 2025 +0800

    再优化

commit 3794edc5ce58f26779f3a4fb18bcee03f390dbce
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 01:25:34 2025 +0800

    版本号更新

commit 0d91de2ab10be08be7a95b5562904188c25de76f
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 01:25:01 2025 +0800

    更新改动说明

commit 4206971676c8ebf118204dc228a3a2f8d2d08ccb
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 01:20:59 2025 +0800

    距离小修复

commit 0069d3b9100211c7a94d3c1ce20c0d1b0da9ba93
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 01:02:59 2025 +0800

    额外功能说明

commit 98dd8b87ec7079616e69a5b8bf5652d097bea763
Merge: 7ba94fad a214926e
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 00:55:45 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit a214926e900c68ef575219e97508aa2842ba54d8
Merge: aa1ca7bf d66d818e
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 00:55:24 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit 7ba94fad0c57fd05d490baaf624c0310b4481d97
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 00:54:38 2025 +0800

    修复编译问题

commit 38ce2f7f24af8c8f1ab406d0c893a20ed5b406ea
Merge: f7eecfc0 5d573807
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 00:54:24 2025 +0800

    Merge branch 'develop-Mix4ECpack' of https://github.com/CrimRecya/Phobos into develop-Mix4ECpack

commit 5d5738074231a7355b7ada5656b11740ea3bf514
Author: 航味麻酱 <[email protected]>
Date:   Wed Mar 5 00:27:29 2025 +0800

    多炮塔 (#13)

    * unfinished

    * [Docs] update & fix

    * Fix oversight in attached particle system pointer invalidation

    * Update Hooks.MatrixOp.cpp

    * Update Hooks.MatrixOp.cpp

    * Update Hooks.MatrixOp.cpp

    * 画对辣

    * 完成辣

    ---------

    Co-authored-by: 九千天华 <[email protected]>
    Co-authored-by: Starkku <[email protected]>
    Co-authored-by: 绯红热茶 <[email protected]>

commit f7eecfc0a284f076b3b679210a118261e7f19f77
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 00:23:37 2025 +0800

    更新改动说明

commit 86532c0c49e62d7543e72e006014af8b70bd07a9
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 00:21:48 2025 +0800

    自动建筑绝赞更新

commit 237a9f9625f50331c5799e01be300db2953568d1
Author: CrimRecya <[email protected]>
Date:   Tue Mar 4 23:43:40 2025 +0800

    Minor update

commit e6ed00e4f476f8bd5b1ad320b1353f2a6431ac34
Author: CrimRecya <[email protected]>
Date:   Tue Mar 4 12:19:53 2025 +0800

    优化子机返回

commit e1c8bbfd7c2360e4e77b6468402c95f3720ed573
Author: CrimRecya <[email protected]>
Date:   Tue Mar 4 01:04:49 2025 +0800

    遗漏内容

commit 98dd6982a59c77623d27902217ec488847f5f38a
Author: CrimRecya <[email protected]>
Date:   Tue Mar 4 01:01:02 2025 +0800

    修复弹窗

commit c1813bbe86208b9329920ede4ad30b5f76c5f17c
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 23:38:43 2025 +0800

    更新改动说明

commit 9e625ae50663db0da92e03aee0742d7aa2a7baca
Merge: e96716c5 aa1ca7bf
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 22:00:14 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit aa1ca7bf99ce5f88dc5fa666fb0c918f9f461491
Merge: 66e4db9b dda20ea0
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 22:00:07 2025 +0800

    Merge branch 'develop-kickout' into develop-Mix4BEtest

commit dda20ea0aa37983fdac8046288b44f5f8b51cbbc
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 21:58:55 2025 +0800

    Optimize

commit e96716c566117fdcaa150b150f1921215b9ebaf9
Merge: 8b2f4b77 66e4db9b
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 21:51:01 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 66e4db9b39d407154f655357280c8bd74c455f14
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 21:50:55 2025 +0800

    优化代码并增加一大堆注释

commit 8b2f4b775aa0425afefe851f8a35e4413df00e65
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 17:52:22 2025 +0800

    更新改动说明

commit 5c57777a921c5faf2296d664eb6c632a7cf39df9
Merge: fd280020 79880e38
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 17:50:32 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 79880e38b8d268940ec65953a8b7ad0fb474e7b1
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 17:50:25 2025 +0800

    超武侧栏优化

commit fd2800206011306fb249224d241353d3f3b4dbc7
Merge: 72dbc1ad 190e7960
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 17:26:32 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 190e7960e6de4752acc480749d23c83c4f90b832
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 17:23:40 2025 +0800

    修复合并

commit a91bd8429b898805acca47f7833f8342200e6a23
Merge: 853c68dc ae7d0982
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 17:23:15 2025 +0800

    Merge branch 'develop-kickout' into develop-Mix4BEtest

commit ae7d0982c7e2547d519c5d9af1c9b785df85a6db
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 17:21:57 2025 +0800

    Fix merge, update and add comments

commit 1cdb30acac5ec5c169a8b95c0c30cdeba8d72c9e
Merge: 236ada4f ed339c07
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 17:02:22 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-kickout

commit 72dbc1ad82c71b58f956b4bd2204855aee109362
Merge: ee658d40 853c68dc
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 16:59:11 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 853c68dca77483b516745c4909e86afa370f7336
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 16:59:03 2025 +0800

    简化代码

commit ee658d406af2f9d0d8718e1250079dcd9960f10a
Merge: cf715d1d 320de3c5
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 02:41:39 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 320de3c508990f57770b0a5ae974e9afe89072ad
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 02:41:34 2025 +0800

    更新一些注释

commit cf715d1df89037ebfa80de5e7aac7f156417c44b
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 02:17:29 2025 +0800

    移除重复

commit ff99e9b8f7838aa61392cc4a2288d22edb43b242
Merge: 3fa9ac49 90cc85d8
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 02:16:54 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 90cc85d80e342bdf32ec07146337b9a0a7d651e4
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 02:16:33 2025 +0800

    移除重复

commit 43387597f09a3858e387487ae3a48be097d98462
Merge: 8f86097b 661a4f68
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 02:14:45 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit 8f86097b900ca35d4f52a240fd4d82678ba0f33e
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 02:13:22 2025 +0800

    移除说明

commit 3fa9ac49005c58c7bc9dc1f5fb0460322ae6a792
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 02:12:55 2025 +0800

    更新改动说明

commit 0d466f10161f22a01624b5dfff80e39279680f9d
Merge: 4cf0d7f3 346c89c5
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 01:42:50 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 346c89c5fb3286bd6e9806d4706cfd67c7c5bda1
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 01:41:45 2025 +0800

    移除说明

commit 4cf0d7f351363db8ba03d0db9cd684bd6ae34f5f
Merge: 74c6dab9 bdd8b62f
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 01:27:57 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit bdd8b62f4ec71cd98894787b5363fb23121b09df
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 01:27:27 2025 +0800

    修复合并后多余的东西

commit 892f237de757c11a4c674802d3ba70ef88928404
Merge: 8098f942 482a74be
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 01:24:59 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit 8098f942f9d188f43e3f75060bd4446d07b0813b
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 01:21:06 2025 +0800

    移除无用

commit 74c6dab95f76e849f7cd6b4c28ae93c54a92ac6a
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 23:57:47 2025 +0800

    版本号更新

commit 30e56d3df9a76276e531ed2e576ad3626613c83c
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 23:57:34 2025 +0800

    更新改动说明

commit 33833463ffabe63811b087096d38d3a266932bc4
Merge: 6204e63d 00356d0f
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 23:56:11 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 00356d0f6d07995ed991d011eb7a21148b3c6690
Merge: dcd80748 47837877
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 23:56:05 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit 6204e63dfdb9e4e3ff73dbd9746eb2b2baefdc31
Merge: bc5299d0 dcd80748
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 23:51:56 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit dcd80748266fa0d76f3ca73fa0fa095e37343685
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 23:51:41 2025 +0800

    加点注释并简化代码

commit bc5299d02ef33a94198f639538ed8b9ccbd0d606
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 22:30:26 2025 +0800

    小修正

commit e99d503bee939d5f7c909274fd262f6c4128fcb7
Merge: 2c0b00d1 8427505f
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 18:22:17 2025 +0800

    Merge branch 'develop-Mix4ECpack' of https://github.com/CrimRecya/Phobos into develop-Mix4ECpack

commit 8427505f39a5a531e17fd1cc59a02bf185d790d3
Author: 航味麻酱 <[email protected]>
Date:   Sun Mar 2 18:20:29 2025 +0800

    Auto building rally points (#12)

    * unfinished

    * update

    * [Docs] update & fix

    * [Doc][zh-cn] CREDITS

    Due to some processing issues with the sphinx-build command, there were some minor problems with the previous Mentalmeisters Team section

    * update

    * update

    * update

    * ready to go

    * 更新改动说明

    * 更改一些可本地化内容

    * 更新改动说明

    * 删个等号

    * update

    * 修复扩散抛体的小问题

    * 更新改动

    * update

    * docs

    * 1

    * 移除多余

    * Core

    * 额外功能说明

    * 更新改动说明

    * Fit with trajectory

    * Fix compile error

    * Fix YRpp

    * Optimize and rename

    ---------

    Co-authored-by: 九千天华 <[email protected]>
    Co-authored-by: CrimRecya <[email protected]>

commit 2c0b00d188cbc792acd935d73288d1a7ec4aeb0b
Merge: e55f72d2 eebf2153
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 15:43:01 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit eebf21539b8f91abdcd103cfb7f04736191e2c38
Merge: e5e44191 d9387d8a
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 15:42:52 2025 +0800

    Merge branch 'develop-VisualScatter' into develop-Mix4BEtest

commit d9387d8af12b332ffb37b2c6d765f2f910e1f5b1
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 15:42:45 2025 +0800

    Fit with trajectory

commit e55f72d2b2479fb829e394014b3878c87970a005
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 14:15:32 2025 +0800

    更新改动说明

commit 5d508f5dcfb1ab7a4147a7c8e5c461ab09949f8c
Merge: d97cf3b8 e5e44191
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 14:13:04 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit e5e44191922e5326bced333aad27f80b667836c2
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 14:12:29 2025 +0800

    额外功能说明

commit 3dc09e1102149aae185f5f65a23ae3822c50933d
Merge: 28a89af4 8c425be5
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 14:07:14 2025 +0800

    Merge branch 'develop-VisualScatter' into develop-Mix4BEtest

commit 8c425be586c5ab426592d87203c27b814ed7b690
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 14:05:56 2025 +0800

    Core

commit d97cf3b8c5c4225cb706c6a3116c032dfc5bd94d
Merge: fd78150f 28a89af4
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 13:29:28 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 28a89af4ca8d40fff5954e94eaafeaf03ff78da2
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 13:29:23 2025 +0800

    移除多余

commit fd78150fe058515967ad406bd720ecfbdb0c269c
Author: CrimRecya <[email protected]>
Date:   Sat Mar 1 19:55:50 2025 +0800

    更新改动

commit 6bd1b8b3b85cce0799aec650e5b618abaf55c6f6
Merge: e75a3955 a45d07ca
Author: CrimRecya <[email protected]>
Date:   Sat Mar 1 19:28:41 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit a45d07ca4b30a80e6ff9cfd0b81fc2282224716a
Author: CrimRecya <[email protected]>
Date:   Sat Mar 1 19:28:36 2025 +0800

    修复扩散抛体的小问题

commit e75a3955d89ac64fa9219e81aa68e517e65c6fe6
Author: CrimRecya <[email protected]>
Date:   Sat Mar 1 18:15:47 2025 +0800

    删个等号

commit e0165973cae855383975aec5b14ccbe450d31fe5
Author: CrimRecya <[email protected]>
Date:   Sat Mar 1 16:50:50 2025 +0800

    更新改动说明

commit d372fde62957b03aa1133c4a6eb181289c0e2c22
Merge: 7a308703 cd479d43
Author: CrimRecya <[email protected]>
Date:   Sat Mar 1 16:37:50 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit cd479d43527d2f9043b7de68ea298f91809abc6a
Merge: 181dff01 799ea22f
Author: CrimRecya <[email protected]>
Date:   Sat Mar 1 16:36:50 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit 181dff016313dbf89e4568cbc64915c2948545d0
Author: CrimRecya <[email protected]>
Date:   Sat Mar 1 16:36:07 2025 +0800

    更改一些可本地化内容

commit 7a308703890a56642b736d216361ee7440d34046
Author: CrimRecya <[email protected]>
Date:   Sat Mar 1 16:34:39 2025 +0800

    更新改动说明

commit a8e4cb03c14684ff3744ea204c29995814c91153
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 21:58:43 2025 +0800

    版本号更新

commit e02e89c6ad36e355104ca44021090843c173ed9f
Merge: 22535236 1e8c985f
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 21:58:36 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 1e8c985f79dddc56e68da6d1eaa079af15795a52
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 21:58:09 2025 +0800

    版本号更新

commit 225352364fad8cc6edc6b9da5b9687be38219cc8
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 21:57:32 2025 +0800

    更新改动

commit c254c22cff7d78af8f4e678e913537d7e177525b
Merge: 7c64bf86 ffb199ff
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 21:41:08 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit ffb199ff78c53400f168273d0a77d273229e814b
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 21:41:03 2025 +0800

    退回旧版的方式

commit 7c64bf869e58e00a5b2048507787ed06d5763b30
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 19:26:52 2025 +0800

    改动说明

commit 987c0ec80996a8717f702011e96fe7d51068daa9
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 18:32:51 2025 +0800

    更新改动说明

commit 721d58adad310ff2e56c7f58095c47e98f30f296
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 18:30:47 2025 +0800

    版本号更新

commit 9b9cda93f7dfe16f57f3277b036329768efaf515
Merge: 085fb5eb 22fbf5f5
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 18:30:05 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 22fbf5f5a440bc4f6ad6a084b09397bc61c0dac3
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 18:29:15 2025 +0800

    修复合并

commit 1f7c688e7303100b2649f83c51d9a86c5d79d214
Merge: b87ce619 aadd0a1a
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 18:27:37 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit b87ce619258d7a696a2ec19d368e189fc3fee568
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 18:24:01 2025 +0800

    测试版本号更新

commit 085fb5eb01b41270a03c0cf71fb74270932c650d
Merge: 98367d80 e04b3d32
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 17:01:41 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit e04b3d32ed9b0e298109c648059e5c10f18cb785
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 17:01:35 2025 +0800

    更新四个抛体功能

commit 98367d80f38e67971af9c85ed844fddeb5993a51
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 16:58:39 2025 +0800

    改动说明

commit bc5ae226c76150e0045a434aa78f7946af896fd1
Merge: d82a9c53 4fae6712
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 14:08:30 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 4fae6712f0f40c9814e50ad881ebb7fc010665bc
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 14:08:24 2025 +0800

    功能说明

commit d82a9c53125abf8512e0501396e731e365bd50f6
Merge: d0e5d076 b3be6066
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 12:34:42 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit b3be60668176ac07013c6a42792659d7726a8f51
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 12:34:37 2025 +0800

    完成所有底边栏按钮

commit d0e5d076cb6f830763c37e9772366b727343cf31
Merge: 60a1684b 148302a1
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 02:23:12 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 148302a160904405e03f33951ab1ca6eef9bba4e
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 02:22:37 2025 +0800

    不再读取原本的单位组

commit 60a1684b777ee44c9149a90a7077e8b63e2d6fd2
Merge: 2847d7f7 1e1ee025
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 01:44:42 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 1e1ee025e8a0522762940039c62ee6d4a9ae3970
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 01:44:27 2025 +0800

    尝试优化并给展开的图标排序

commit 2847d7f70068cc99fa7f2067c21d830c8c50c5db
Merge: 43c65923 42f78201
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 22:23:32 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 42f7820127005c08a1c9bfc29f7022632e7a9be1
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 22:22:41 2025 +0800

    优化一下

commit 43c65923792d7e3579e5e9be110a0cbbf6418dc9
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 20:50:32 2025 +0800

    小改正

commit 0beac292f5440b8c90fca46020b219a78af18479
Merge: 31fa7a9f e54d7367
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 20:49:01 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit e54d73673f535587bbd62d21b234cb14cbefa818
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 20:45:36 2025 +0800

    判断按钮能不能按

commit 10ea9d77b363f0aef1f16672c200ef41b903185e
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 20:37:52 2025 +0800

    简化一个不必要的判断

commit 31fa7a9f2ae765bdafaa92ec7e0d7ad43b5aa55d
Merge: fcaf6d51 4317a201
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 20:12:27 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 4317a2017ef22f7f4949344575c007769e6b19f1
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 20:12:06 2025 +0800

    修正小问题

commit fcaf6d51f2fdf989892111f0c22d6d45d0d73f1f
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 19:29:22 2025 +0800

    更新改动说明

commit 34df1a98096f402eca822fd9495081c15b18d994
Merge: e96b17f2 88d64ffb
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 19:27:27 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 88d64ffb9122b396df72c5855aadd06a16449168
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 19:27:03 2025 +0800

    继续完善功能

commit 43a107818a7090f4d2becf0e41d2c5e974fe0fd8
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 18:58:11 2025 +0800

    移除不必要的说明

commit e96b17f213ab8d8023e0bbbcbc76ffd46ba2aea6
Merge: fd56fc06 1489d7cb
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 15:19:17 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 1489d7cb40feb0320883acad64a0e88a9bd1326b
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 15:18:53 2025 +0800

    底边栏增加信息

commit fd56fc067b37eb8d2642ca6ddad52f78de61802d
Merge: faa0b8d6 c169c892
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 12:07:11 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit c169c892536641ab7d2af720e562f6973cd6d096
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 12:07:05 2025 +0800

    小修复

commit faa0b8d698c5706486b428b3edcb3455f0e68a66
Merge: aa2e78dd a93877ef
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 11:47:13 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit a93877ef8a63ae5d0871725183470fd9356cc86c
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 11:47:08 2025 +0800

    输入先于绘制故可能需要提前更新选择信息

commit aa2e78dd526575a1fc4a9e476dee8961469a9f42
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 10:52:06 2025 +0800

    更新改动

commit 8ea06c2a61549a96a175c2bf7c4ce076b40a9be8
Merge: fbdcbe97 8aa06c4c
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 10:51:09 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 8aa06c4c08b22890f319e2f7309a1311e073db2d
Merge: c8a52883 78fea5be
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 10:50:48 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit c8a52883b04047825d484c9987871a76c2b3a6e1
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 10:50:46 2025 +0800

    功能说明

commit fbdcbe97ac14d5bc0c7bc9772dd352a652206a63
Merge: 2b47aa77 c6486242
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 00:41:15 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit c64862422cb5ba3b64faaaf91983c4bf8ce1a61d
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 00:41:11 2025 +0800

    修改并加上按钮音效

commit 2b47aa7746f4aa943258de28a73848674c49a9ee
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 00:32:20 2025 +0800

    改动说明

commit 3553552fc600a3479bbaed98766b3dd4827110a9
Merge: 694a07df 1762cfb4
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 00:28:53 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 1762cfb4e63971e2e2481d5b821f2e6bd0431d59
Merge: c8f1903c 8093e866
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 00:27:21 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit c8f1903cd6d50197486564f1958f61f5c6cd3ff4
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 00:25:56 2025 +0800

    修复命名问题

commit 694a07dfe465cff916ac64d9d812f52953fa26a0
Merge: 679e3ba2 b935e154
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 00:23:14 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit b935e154b986f48122a2d83b41621cce0f7d7464
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 00:23:08 2025 +0800

    继续完善底边栏功能

commit 679e3ba24e9dd9c3516cf22c9f59fdfc60a3d0fe
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 23:26:11 2025 +0800

    改动说明

commit cc5a9009f01dee40d62ca9a6821c10f57918c071
Merge: 137c6d96 ba4ebb87
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 21:12:35 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit ba4ebb870b5d70a9819ac239a793b8a4c5fd5489
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 21:12:29 2025 +0800

    功能说明

commit 137c6d96abf4f82be23e28dcace906f627171fbf
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 21:10:24 2025 +0800

    更新改动说明

commit 22143606802908851adf66a33d8971388ee489ac
Merge: db7172d2 741c8b51
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 20:55:14 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit db7172d2c20e858613a7ca10292843e4e8e31a90
Merge: 8f875c5e af5f6b69
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 20:55:11 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4ECpack

commit 741c8b51dbad9e5dd6f9334a63144dedcff067bc
Merge: be8292c7 af5f6b69
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 20:54:41 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit be8292c796eac2097a365e37af75a7f35c25115e
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 20:47:25 2025 +0800

    修复部署载具的问题

commit 8f875c5e0cd5d0dda8c523d3a632a05b03a38b0c
Merge: acade0cc c4c2767c
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 14:19:36 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit c4c2767c2fbfca9273d975394c4bff47be921ed5
Merge: 877b16c7 20efc644
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 14:19:15 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit acade0ccfdfe8c2f823469de2ccdea4116ca7fc2
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 01:45:09 2025 +0800

    小简化

commit 3e29230b27adb5e6ffa4ecb13bc67fedaaab3f7b
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 01:32:36 2025 +0800

    简化子机回收代码

commit 09df8c9af6dccdb3f31c12e6eba6f0e4449ccb51
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 01:21:51 2025 +0800

    合并子机回收位置

commit 83cd066a411bef4c43609407ebc92dd66b6d0183
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 00:54:43 2025 +0800

    更新改动说明

commit de2ced3bc0e9a2ef63c86d2d9fef0f74f3bf74f3
Merge: a45334de 877b16c7
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 00:53:24 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 877b16c74b035c181a3b8790e6c53df62ed683c8
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 00:53:19 2025 +0800

    修复不影响友军的弹头仍会导致图标闪红的问题

commit a45334de913f9c11f7e48da22b26f27a4c8169ed
Merge: f892d983 1598b7a6
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 00:10:29 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 1598b7a619c3b7bbc6dfe7a7fd9398ef45a7794b
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 00:09:21 2025 +0800

    修复合并

commit f892d983b7431a12b7df8c8ddd3e05991be993e5
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 23:59:40 2025 +0800

    修复合并

commit 788c4dc807bc9b6abbab9fe5cf6f6d3bad7626d9
Merge: 42f33b2c 4624023f
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 23:58:11 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 4624023f488fe6e2b0ffef9233aa706873631a07
Merge: 01a14911 2ff45a0a
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 23:52:57 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit 42f33b2cb2deb2496f37ee3fbf58c6d8c38bf748
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 23:48:30 2025 +0800

    同步更新

commit 0cdb62c863ec78aae828dc3fd379127191b58c07
Merge: 72f52f9b 01a14911
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 23:48:05 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 01a14911c066aff4431e9e232bc4477e04642d26
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 23:47:57 2025 +0800

    继续完善底边栏功能

commit 72f52f9bbd2db11d075f953efa5c141d744ccbe6
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 23:33:50 2025 +0800

    更新改动说明

commit 9b1fd819223e59279438caf91dbe3c9bdbafbd82
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 03:34:52 2025 +0800

    修复合并并更新说明

commit 9ecbab34fc626b8926788c5fcb23d79e2944e7d3
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 03:20:09 2025 +0800

    修复错误响应事件

commit ff14670fcb4c921d0c9737252622e71fa17170ae
Merge: 8a89341e 5c331244
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 02:41:28 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 5c33124467245bf4159e920832f09989f4d68ab6
Merge: 4b3b4d35 783bf212
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 02:41:23 2025 +0800

    Merge branch 'develop-newinfotype' into develop-Mix4BEtest

commit 783bf212bdcad194c7845aa7ffd10779bcd96fe9
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 02:41:18 2025 +0800

    Fix a typo

commit 8a89341e5ba4aa887932f721713a87db49e1fdbc
Merge: 8ffd725e 4b3b4d35
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 02:24:46 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 4b3b4d3522e9ce13de028209cde2d03aaf266c47
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 02:24:42 2025 +0800

    记一下要做的

commit 8ffd725edc6cb532f6eaa19b073ee0ab052c1c2d
Author: 航味麻酱 <[email protected]>
Date:   Tue Feb 25 02:22:36 2025 +0800

    Missile spawn exp (#11)

    * impl

    * [Docs] a few

    Handle errors (e.g., "applied to to TechnoTypes")
    Standardize the names and formats of special terms, such as changing *.ini->[xxx] to *.ini -> [xxx] like the existing [xxx] -> key (and sometimes the two are used together)
    Missing symbol
    Missing type annotation
    .etc

    * Update Hooks.BugFixes.cpp

    * Squashed commit of the following:

    commit ddcd9de51e703e2eafc79c325877a87417f960ae
    Author: 航味麻酱 <[email protected]>
    Date:   Tue Feb 25 02:17:27 2025 +0800

        补个标签 (#10)

        * impl

        * Update Hooks.Misc.cpp

        * Update Hooks.Misc.cpp

        * flag

        * [Vanilla Fix] Fix impassable invisible barrier created by chronosphere on uncrushable unit (#1529)

        (Re-merge properly)

        - Fix an issue where a unit will leave an impassable invisible barrier
        in its original position when it is teleported by ChronoSphere onto an
        uncrushable unit and self destruct.

        Thx to @NetsuNegi .

        Co-Authored-By: Netsu_Negi <[email protected]>

        * [Minor] Fix Ammo features and tank bunkers. (#1420)

        - fixing ammo block inside tank bunkers;
         - partially fixing ammo adding/substracting inside tank bunkers

        still problems with converters

        ---------

        Co-authored-by: Coronia <[email protected]>

        * [Minor] Disallow other actions for building in planning mode (#1524)

        <!-- Please add [Minor] to the title or the description if this change
        should not be mentioned in documentation, what's new and no credit needs
        to be given. -->

        ---------

        Co-authored-by: 绯红热茶 <[email protected]>

        * Add project maintenance structure and contribution types to docs

        * Fix #1106 : Deployer = yes to no infantry conversion sequence update (#1315)

        It's a bad design and thus does not worth a fix
        in case someone really wants to, here's one way to it

        * [Minor] Exception handler control via command line argument (#1231)

        Just use command line argument `-DontSetExceptionHandler` to disable
        game exception handler.

        UPDATE:
        `-EH-off` & `-EH-on` tags.
        For debug build default is **DISABLED**.

        UPDATE2:
        `-ExceptionHandler=boolean`

        ---------

        Co-authored-by: Kirill Andriiashin <[email protected]>
        Co-authored-by: Kerbiter <[email protected]>

        * Avoid InvisibleInGame targets in new scripts (#1312)

        Buildings with InvisibleInGame=yes should be ignored in the target
        selection of the new attack/move actions.

        I just found I forgot to send this time ago :-/
        No credits or mention needed since it only fix a small bad behaviour.

        * Fix contribution types docs a bit

        * update docs and credits

        * [Docs] a lot like [zh-cn]New-or-Enhanced-Logics

        * [doc] $Include

        Revise the description of disabling the Ares include feature and add the reasons.

        * [Docs] a few

        Handle errors (e.g., "applied to to TechnoTypes")
        Standardize the names and formats of special terms, such as changing *.ini->[xxx] to *.ini -> [xxx] like the existing [xxx] -> key (and sometimes the two are used together)
        Missing symbol
        Missing type annotation
        .etc

        * [Minor] Fix Insignia.Weapon parsing (#1530)

        Separate the fix from
        https://github.com/Phobos-developers/Phobos/pull/1365 to a standalone
        pull request, which should fix the issue in
        https://github.com/Phobos-developers/Phobos/issues/1528.
        - previous Insignia(.Frame/.Frames).WeaponN settings can't be read or
        overridden from maps, which is fixed now

        * [Vanilla Improvement] No turret unit turn to the target when rearming (#1465)

        - Now vehicles (exclude jumpjets) without turret will attempt to turn to
        the target while the weapon is cooling down, rather than after the
        weapon has cooled down, by setting to `NoTurret.TrackTarget` true.

        In `rulesmd.ini`:
        ```ini
        [General]
        NoTurret.TrackTarget=false   ; boolean

        [SOMEUNIT]                   ; UnitType
        NoTurret.TrackTarget=        ; boolean, defaults to [General]->NoTurret.TrackTarget
        ```

        ---------

        Co-authored-by: 航味麻酱 <[email protected]>

        * [Customized] Damage multiplier for different houses (#1307)

        - Warheads are now able to define the extra damage multiplier for owner
        house, ally houses and enemy houses. The values in warheads are default
        to respective `[CombatDamage]` -> `DamageXXMultiplier`, which all
        default to 1.0 .Note that this will not affect damage with ignore
        defenses.

        In `rulesmd.ini`:
        ```ini
        [CombatDamage]
        DamageOwnerMultiplier=1.0     ; floating point value
        DamageAlliesMultiplier=1.0    ; floating point value
        DamageEnemiesMultiplier=1.0   ; floating point value

        [SOMEWARHEAD]                 ; Warhead
        DamageOwnerMultiplier=        ; floating point value
        DamageAlliesMultiplier=       ; floating point value
        DamageEnemiesMultiplier=      ; floating point value
        ```

        * Remove a useless variable and fix doc

        * Squashed commit of the following:

        commit 2182e831aeae7f8938303721c6a2e937dd6ff067
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 25 02:06:36 2025 +0800

            小改位置

        commit 056a7ab1a82e11ba5b37b0c17613f927eb8fb66a
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 25 01:19:11 2025 +0800

            改动说明

        commit 545f6088d35b9b32543e9db7dc371a464fa90ce1
        Merge: 7d3c131d cf69a711
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 25 01:18:22 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit cf69a7111ae2070728de5f3cb40a399e203ac7be
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 25 01:18:17 2025 +0800

            功能说明

        commit af44f3f6182cb97eed0824fe9bcd40408b1f81be
        Merge: 49dfd0ae 886cd122
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 25 01:15:47 2025 +0800

            Merge branch 'develop-newinfotype' into develop-Mix4BEtest

        commit 886cd122a666ced42f990f3c4107bc5532ebe829
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 25 01:15:40 2025 +0800

            New `ValueAsTimer`

        commit 7d3c131ddda6ba5efad94b3f8c196d325bcf35d5
        Merge: 57eaa340 49dfd0ae
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 23:30:29 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 49dfd0aea1d60c88b270ba43d0182690da411a7d
        Merge: 4c7d1cc9 a954c838
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 23:29:55 2025 +0800

            Merge branch 'develop-newinfotype' into develop-Mix4BEtest

        commit a954c83885f29a2af9da6c10224f5ef27064be06
        Merge: 83debb74 13cdc0cc
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 23:28:34 2025 +0800

            Merge remote-tracking branch 'upstream/develop' into develop-newinfotype

        commit 57eaa3401b39d0159ed082c23fab4a911b3d50dc
        Merge: 9166eec1 4c7d1cc9
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 22:27:31 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 4c7d1cc9f25259335cbd95f9590b421982c406eb
        Merge: 052ce1e4 13cdc0cc
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 22:24:12 2025 +0800

            Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

        commit 052ce1e469faa7b7d92ea6f4fb41957f29840afd
        Merge: 59007c82 00752e41
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 22:17:17 2025 +0800

            Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

        commit 9166eec198d7f1e4d4691f05f4002a3c3bd9f5c7
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 21:04:39 2025 +0800

            修复侵略模式按钮

        commit 241479932e0fa9c9b9327d8aff51827e64e944a7
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 20:41:54 2025 +0800

            更新改动说明

        commit eed20f690ed6a5ff57f3da7cb6eacde3f7e3eac1
        Merge: 4d9ab456 59007c82
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 20:38:07 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 59007c8205df4cb35345a2f1a89b12d3d2c5cd76
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 20:38:02 2025 +0800

            小改动

        commit 4d9ab456f6285d7476be2d06aa56d8baad5eb2be
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 20:36:50 2025 +0800

            合并功能

        commit a3965d3d37a6195f226d3c3c9ecb025562f970fd
        Merge: 6342450f d1cda617
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 20:31:45 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit d1cda6171fce116c5195e64ba6c83270ac6b5a80
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 20:31:11 2025 +0800

            功能说明

        commit 6342450f45e7c0e4b791a9fa81de957c0601817c
        Merge: dc523103 3456e138
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 20:10:29 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 3456e138f8a480d8f83f82749d9b2b2419bee65b
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 20:10:23 2025 +0800

            完成所有基本底边栏功能

        commit eb2d35e49e57f285e81adbe0befc88138c9c8976
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 03:01:09 2025 +0800

            底边栏功能继续完善

        commit ac74b4c14b9891f351d2d27a043edbc06c560475
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 00:02:03 2025 +0800

            全新的底边选择栏底层

        commit dc523103555d09cd4ded6779e7d805a49f61bfda
        Author: CrimRecya <[email protected]>
        Date:   Sun Feb 23 01:47:54 2025 +0800

            更新改动说明

        commit c8ebd98339f9671164c901f7c9ce354de8e374d5
        Author: CrimRecya <[email protected]>
        Date:   Sun Feb 23 01:47:39 2025 +0800

            修改玩家自动修理

        commit 94ea4577332bdc7e08416d9fcce6d3e0bbc83d85
        Merge: 16ff7f60 9180ff46
        Author: CrimRecya <[email protected]>
        Date:   Sun Feb 23 00:54:34 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 9180ff46ca477872b8697d73191bc9f0f6a48f58
        Author: CrimRecya <[email protected]>
        Date:   Sun Feb 23 00:54:15 2025 +0800

            更新说明书

        commit 16ff7f60b4cca7e9bfa94e41416798f7dde98550
        Merge: 2d01a403 8be46a13
        Author: CrimRecya <[email protected]>
        Date:   Sun Feb 23 00:47:51 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 8be46a13c08a209a148dcea48ad29c74ff3fe51e
        Author: CrimRecya <[email protected]>
        Date:   Sun Feb 23 00:47:46 2025 +0800

            增加自动建筑快捷键初始默认值

        commit 2d01a40324ab5868d6638b2c48b3a5aa26358b48
        Merge: 23a3d9ca 40a71e5b
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 23:02:29 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 40a71e5b2e56a5788b1ed55fdd909cab972d4ccc
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 23:02:24 2025 +0800

            补充独特单位显示的完整开关

        commit 23a3d9ca3e099433a52ba4ffa5cedf6336aebfd1
        Merge: 7b831b56 87b20441
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 22:52:49 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 87b20441dd94d225559b13f7dcff3bc1ccb954df
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 22:52:16 2025 +0800

            彻底修复超武侧栏的开关点击问题

        commit 7b831b56de380bda032adbe852adb798ed353e9f
        Merge: 4d99159a b2adb3c2
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 20:58:27 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit b2adb3c2b382c116d529d62a1bb0409dd7f87e00
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 20:58:23 2025 +0800

            Fix typo

        commit 4d99159ab6cd325251152b9ed7bed1044b9709af
        Merge: a9f01889 7053fae2
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 20:24:20 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 7053fae23ecb17efa368c4258c891a1723e6e9a7
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 20:24:15 2025 +0800

            修复最后一个点击问题并优化科技树图标检查

        commit a9f018895c06b6922e2a8d61a7be73a837829a66
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 17:06:18 2025 +0800

            更新改动说明

        commit 4d9f7580e1709d0fcbd2bc4369d65591cf50da96
        Merge: da3e0c4d 8e57d2e0
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 17:01:38 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 8e57d2e03698dfb5a9f7493af0ad2636ba8bced0
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 17:01:33 2025 +0800

            修复超武侧栏的一些点击类问题

        commit da3e0c4d64d79bf080d775e7cfa1477d0948c0da
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 14:01:31 2025 +0800

            更新改动说明

        commit 0e782d6afa7b9391d75600d7f3272246d60faa12
        Merge: f49ceee6 1ce0f217
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 13:51:41 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 1ce0f217a579170a63981e30b4604350b3487349
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 13:51:08 2025 +0800

            超武侧栏的更新和修复

        commit 504b88e6f16be5ff25174e77605918306f97bd9c
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 12:14:33 2025 +0800

            修一下说明书

        commit f49ceee64f2fe71d3d8194726fc6761ae2b40d61
        Merge: 1eb3ccdc 8e4b0a24
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 05:21:55 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 8e4b0a24461f040ed07b42e6cf0153785fd58977
        Merge: 3cb24f21 2d9f9c4c
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 05:18:43 2025 +0800

            Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

        commit 3cb24f21da43fc59c75fd830b766ede418fb6345
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 05:14:52 2025 +0800

            修改一些超武栏的钩子并重做英雄栏底层

        commit 1eb3ccdc534ccfe4de3b89a40e2997dd38313788
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:47:17 2025 +0800

            版本号更新

        commit 7c0c86202cb3a2d0a777f7aab5bc3181b7fa08ca
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:46:24 2025 +0800

            改动说明

        commit e0e8ab1372852d65035d7206873eb5669926c655
        Merge: c35b5f5d 97849d3d
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:42:11 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 97849d3debd3f109cc47ba88d954255a5b35d45a
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:42:06 2025 +0800

            功能说明

        commit 7cf6b28f7916afb292b94fd6cb6ffdabd11d252b
        Merge: cad44713 86e3aa61
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:41:07 2025 +0800

            Merge branch 'develop-UndeployBuilding' into develop-Mix4BEtest

        commit 86e3aa611d574da3186af9b41a782f3175af6ee8
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:40:59 2025 +0800

            Fix

        commit c35b5f5db8b5cf947e89bc6d6a89afd7643f5459
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:22:35 2025 +0800

            更新改动说明

        commit be5597d2de4cf4445e370652e4fa962a335302e6
        Merge: 81cd401a cad44713
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:19:10 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit cad44713188639146629b4642c38171569b882dd
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:19:04 2025 +0800

            额外功能说明

        commit 394fd6962496aeaf9c4aac259cacf27393fa1cb4
        Merge: c6f6c2be 1b984b03
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:17:41 2025 +0800

            Merge branch 'develop-UndeployBuilding' into develop-Mix4BEtest

        commit 1b984b034eff04c81e8fe02f8b4ec23f0743912b
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:17:32 2025 +0800

            New `BuildingSell.IgnoreUnsellable`

        commit 81cd401aa6796a2187130c16f90bf86d968fd973
        Merge: 998455e6 c6f6c2be
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:10:12 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit c6f6c2be2f8fb2121f4f1afc67caa7c5726a1b5c
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:10:07 2025 +0800

            播一下声音写一下字

        commit 998455e6c74f9fe1c0ee2d4359ad8d63d7dafafe
        Merge: e8ed0b99 01e4b330
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 20:21:47 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 01e4b3304dcbe182ce0b12188d02f2934e2c7a6f
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 20:21:44 2025 +0800

            修一下注释的位置

        commit e8ed0b99e1bcd5694b2522b3ae476b6f3bd34064
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 20:21:06 2025 +0800

            更新改动说明

        commit 6daf0a89ee309b2e88dc88e32c62ee8be8aabe5b
        Merge: 3875c084 0c03bdf8
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 20:17:23 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 0c03bdf88d763d51726fda78cd74315cbb276a43
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 20:17:18 2025 +0800

            新增滚轮功能

        commit 83debb7474efde6b3f4c0a40eeffd51d0fd48a10
        Merge: f260915c aa4e9525
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 17:44:55 2025 +0800

            Merge remote-tracking branch 'upstream/develop' into develop-newinfotype

        commit 3875c0848646ba8dab39c47ada5bed002f5ae0cb
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 17:42:54 2025 +0800

            更新说明

        commit 79109419c4c74892cd030f0bb664aa7b2908dfe4
        Merge: b6197722 2d6f3384
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 15:19:52 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 2d6f33849a6633a83490833481a6ceb5efde3fe8
        Merge: bb7ada15 aa4e9525
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 15:19:29 2025 +0800

            Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

        commit aa4e9525a3929c07e19957a76536c222c5d69b9a
        Author: 航味麻酱 <[email protected]>
        Date:   Thu Feb 20 15:18:14 2025 +0800

            [Minor] Disallow other actions for building in planning mode (#1524)

            <!-- Please add [Minor] to the title or the description if this change
            should not be mentioned in documentation, what's new and no credit needs
            to be given. -->

            ---------

            Co-authored-by: 绯红热茶 <[email protected]>

        commit 06664e94f92e68f8ad22554354f7160eea64e8d4
        Author: Fryone <[email protected]>
        Date:   Thu Feb 20 09:57:57 2025 +0300

            [Minor] Fix Ammo features and tank bunkers. (#1420)

            - fixing ammo block inside tank bunkers;
             - partially fixing ammo adding/substracting inside tank bunkers

            still problems with converters

            ---------

            Co-authored-by: Coronia <[email protected]>

        commit b619772284613a317851bc3ac38c56fd5f4a460b
        Merge: 65ea625a bb7ada15
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 13:32:35 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit bb7ada15bb756d6fd9d4d6cef6b8ffecb0d7eb56
        Merge: eb2d49cf ee1f0eae
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 13:32:26 2025 +0800

            Merge branch 'develop-UndeployBuilding' into develop-Mix4BEtest

        commit ee1f0eaee296465d335ed4a42ccd0577c6ea284b
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 13:32:06 2025 +0800

            More check

        commit 65ea625af75da45d2717ca242b73174ffdb79f3d
        Merge: 0596116c eb2d49cf
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 13:29:46 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit eb2d49cfe5c66d917c8395e2f19311ac7a2a24d5
        Merge: 7aef8ff6 9e33e4dd
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 13:29:21 2025 +0800

            Merge branch 'develop-UndeployBuilding' into develop-Mix4BEtest

        commit 9e33e4dde4d3a2efc695e0f02b5e0e47e5705369
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 13:26:56 2025 +0800

            Comment

        commit da46faa83f5e3ff68dc5b09c8b3366b5347f18fd
        Merge: a6291514 3b8e0e32
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 13:03:15 2025 +0800

            Merge remote-tracking branch 'upstream/develop' into develop-UndeployBuilding

        commit 0596116c970a15360bfa6fe88fd8d63fe514f50c
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 21:10:38 2025 +0800

            更新改动说明

        commit 5939c3c6da9e30d2a02c6bf49e3128e491aa85aa
        Merge: 5d71a343 7aef8ff6
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 21:07:58 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 7aef8ff684e8a754bb445fafe197218330a537bb
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 21:07:54 2025 +0800

            修复超长距离

        commit 5d71a343e534a465a5b347dc43ee4c44bc0c162e
        Merge: 81b6cefb b420e139
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 18:28:13 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit b420e1398cc022a8ba1513ab74a27044fbaa2228
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 18:28:09 2025 +0800

            扩散没目标的时候重新看一眼原目标

        commit 81b6cefbb0c63a27fd09e1969d482e16379d4801
        Merge: 5a47a9af 240efea7
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 17:14:22 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 240efea7905c407d0356ddbe39d12806186652a5
        Merge: 17f81446 fac6abb9
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 17:14:03 2025 +0800

            Merge branch 'develop-FloatMinerPathFix' into develop-Mix4BEtest

        commit 17f814461f680b5d0b8216e61abe9a32ce2d17e1
        Merge: 54dc20f5 3b8e0e32
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 17:13:32 2025 +0800

            Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

        commit 54dc20f545236f66f1cf5cbe2e7aadacbccac554
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 17:13:22 2025 +0800

            先移除重复

        commit fac6abb918b429de2031cf01876b48f16a75f85d
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 17:08:56 2025 +0800

            Core

        commit 5a47a9af68f05e6170764e0d7277e608d54d335f
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 16:40:33 2025 +0800

            更新改动说明

        commit 3b8e0e32fa9bafb3d5c954ac5419b8897beea316
        Merge: e14ffa83 93b5f068
        Author: Coronia <[email protected]>
        Date:   Wed Feb 19 16:40:13 2025 +0800

            [Vanilla Fix] Fix impassable invisible barrier created by chronosphere on uncrushable unit (#1529)

            - Fix an issue where a unit will leave an impassable invisible barrier
            in its original position when it is teleported by ChronoSphere onto an
            uncrushable unit and self destruct.

            Thx to @NetsuNegi .

        commit 5542bc84d8e46bfa0e0d20e76b6f5afb284e0174
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 16:36:34 2025 +0800

            说明书

        commit 041cc26812d1bdcf6eff7741fc8e5cfb83acefe1
        Merge: f44f3336 1d0fa6d5
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 16:34:45 2025 +0800

            Merge branch 'develop-Mix4ECpack' of https://github.com/CrimRecya/Phobos into develop-Mix4ECpack

        commit 1d0fa6d57a05c1ed61cc207a09265250021d5764
        Author: 航味麻酱 <[email protected]>
        Date:   Wed Feb 19 16:34:16 2025 +0800

            维修子机目标问题修复 (#9)

            * impl

            * Update Hooks.Misc.cpp

            * Update Hooks.Misc.cpp

        commit f44f333623b7cd216c001e543c22dd3b62d2a9cd
        Merge: 94b12f5b 5e07847c
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 16:31:02 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 5e07847ce7c0117fb32bd557c08fd264fa07f81e
        Merge: cce26bca bed1e2e7
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 16:30:58 2025 +0800

            Merge branch 'develop-KeepTargetFix' into develop-Mix4BEtest

        commit bed1e2e72a1d21069e45fcafa6c29080dce7aaa0
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 16:30:51 2025 +0800

            Core

        commit 94b12f5b0d953b0acb468eea0bc115f501eef200
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 15:05:40 2025 +0800

            更新改动说明

        commit 5ae70982f60bb122a63ba07a5c6a0a1f26639437
        Merge: 79bb3743 cce26bca
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 15:03:16 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit cce26bca9813068de56eb66d8a99e70acbfc69ad
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 15:03:12 2025 +0800

            小修复

        commit 79bb37432e6d99e9722bdf8d6ecf4bedb2d4b938
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 23:50:15 2025 +0800

            更新改动说明

        commit 9414b022f9316b929df2b03a85cd57599632cfc9
        Merge: ccbdee2f 5677c8ca
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 23:48:23 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 5677c8cad1f7b94f1e3b2f310059c1260bac64a8
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 23:48:13 2025 +0800

            修复读取错误

        commit ccbdee2f5cf1d8edc4ef33d341ea20b7f6783d9b
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 22:48:45 2025 +0800

            更新改动说明

        commit 903ac37c6367042347db5d090d178d8f14e32f26
        Merge: 1bab85db 04c2f22c
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 22:44:43 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 04c2f22c1b8a05cbd864398e585b1eda2d114b5c
        Merge: 6ebe050b e14ffa83
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 22:43:54 2025 +0800

            Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

        commit 1bab85db2a31b40d6e656aaa8a170d16cf590dc0
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 16:05:53 2025 +0800

            更新改动说明

        commit 83c8f7c6ec11449f470fe383af5196fcf135bf88
        Merge: 853630d8 6ebe050b
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 15:54:31 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 6ebe050b7e0695dfc82d2231eae8a3b5065164f4
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 15:54:26 2025 +0800

            小修复

        commit 853630d8a87fc0fb3beb42dbfc4aacb11b07ae27
        Merge: 5dc93d25 2520485a
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 15:48:10 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 2520485af31c094c1a143e3ed6e8cdb673deb2c5
        Merge: be0c165a 646224b2
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 15:48:06 2025 +0800

            Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

        commit 5dc93d25d753530bf43030fba100dcaadb516079
        Merge: 73f17e1c be0c165a
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 15:47:20 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit be0c165ab70ff45cdf664214518f160ef48c1b96
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 15:47:16 2025 +0800

            修复变量名

        commit 73f17e1c875fc1dd516f451120ea7d5b3ab8ea96
        Merge: 735fa1d1 eb018bf6
        Author: CrimRecya <[email protected]>
        Date…
TaranDahl added a commit that referenced this pull request Mar 6, 2025
@TaranDahl @CrimRecya
步兵在载具中装弹，以及各种InLimbo保持更新 (#14)
ccfce12 
* impl

* update in limbo

* update

* Update Hooks.cpp

* Squashed commit of the following:

commit 2bdc233b9ca3d794d98c0f3429003750de9fd0f9
Author: CrimRecya <[email protected]>
Date:   Thu Mar 6 00:30:00 2025 +0800

    加播个语音

commit d0c8ef43698804f043077ad30e21bf091330a1bc
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 23:50:07 2025 +0800

    将计算方法调整回去

commit 6218bda6effcba850ddb64a3580d9429f6d3c496
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 22:51:31 2025 +0800

    改变提交检查机制

commit e543044ce8f6b80cbd39553efa10facc2def8dee
Merge: d96a5bb2 abe7a823
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 22:50:40 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit abe7a823e125e37a5a4fe50c02200deb6efbe35a
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 22:50:16 2025 +0800

    改变提交检查机制

commit d96a5bb2258838cb97b12036183c1660c0e0015c
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 22:30:47 2025 +0800

    版本号更新

commit 107b50d3c36cc35517712571e9ae51d90299aa84
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 22:24:29 2025 +0800

    更新改动说明

commit 16944848abd94de2def433a3fdafbd4bc2e4cb07
Merge: a6dd9ff5 8331ba92
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 22:15:11 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 8331ba928ac8ea384247e45e46c4291ea2954c66
Merge: 304a4702 6e44b4a3
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 22:14:48 2025 +0800

    Merge branch 'develop' into develop-Mix4BEtest

commit a6dd9ff5c27938c5c86e2938ea5729488ffa4d5c
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 22:13:06 2025 +0800

    修复多炮塔读取问题并优化相关代码

commit 51168d1f3b887f4266cf363fcf814d45f082c052
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 21:23:32 2025 +0800

    优化子机返回位置

commit 955c628d2ee27f72067ff5094df363211bca0aa5
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 20:13:47 2025 +0800

    修一下自动建筑范围判断的小问题

commit 6e44b4a31354d67431e51b6a8430541b673335d9
Author: 九千天华 <[email protected]>
Date:   Wed Mar 5 20:12:07 2025 +0800

    Standardize the text of the previously submitted document at Ollerus' request.

commit e306631a27431bb535fac2eaef5680eacc8e2904
Merge: a0bdbb78 304a4702
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 16:10:32 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 304a4702984e4d3031a79e19d2a736f01904a5b2
Merge: d4ad4efa 7ebb58b1
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 16:10:21 2025 +0800

    Merge branch 'develop-FloatMinerPathFix' into develop-Mix4BEtest

commit d4ad4efab35bff3a6254a491cac931fd38def369
Merge: a214926e 5994d6eb
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 16:09:57 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit 7ebb58b1225a584de498d83e93d20e68be46aa90
Merge: 00094e04 5994d6eb
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 16:08:09 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-FloatMinerPathFix

commit 00094e04a31e96f0b1db6d10fbbc79cf486d03a1
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 16:07:36 2025 +0800

    Not affect teleporters and add the comment

commit 5994d6eb0573cd6e817c9024b7b87eeba4cbd263
Author: Netsu_Negi <[email protected]>
Date:   Wed Mar 5 15:56:06 2025 +0800

    Fix Pathfinding Bugs by Decoupling SpeedType from Hardcoded Values (#1552)

    `FreeUnit` uses the unit's own `SpeedType` to find the spawn location.
    The bug where naval ships as StartUnit might spawn on land has been
    fixed.
    When a building undeploy, it will normally use the target VehicleType's
    pathfinding method to decide whether it can move to the target cell.

    ---------

    Co-authored-by: 九千天华 <[email protected]>

commit a0bdbb7840c234269b428f69f2a185e938afdbdf
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 15:37:49 2025 +0800

    加点注释再优化一下

commit 9b7e78de84f24ad980eabfdb92ea68977072b35b
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 14:19:52 2025 +0800

    修复不可作为延伸的建筑自动放不下去的问题

commit 27e635cc2ff4608bc28e3789fffa224c1d63ece0
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 14:19:14 2025 +0800

    优化初始位置

commit 99a93a8c164b59dafbe93c257af9ebf99d848767
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 12:46:57 2025 +0800

    更换顺序并优化

commit aa7ceeaf0b65c306a5ffc9b29ba40be8360d8233
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 12:46:30 2025 +0800

    再优化

commit 3794edc5ce58f26779f3a4fb18bcee03f390dbce
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 01:25:34 2025 +0800

    版本号更新

commit 0d91de2ab10be08be7a95b5562904188c25de76f
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 01:25:01 2025 +0800

    更新改动说明

commit 4206971676c8ebf118204dc228a3a2f8d2d08ccb
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 01:20:59 2025 +0800

    距离小修复

commit 0069d3b9100211c7a94d3c1ce20c0d1b0da9ba93
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 01:02:59 2025 +0800

    额外功能说明

commit 98dd8b87ec7079616e69a5b8bf5652d097bea763
Merge: 7ba94fad a214926e
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 00:55:45 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit a214926e900c68ef575219e97508aa2842ba54d8
Merge: aa1ca7bf d66d818e
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 00:55:24 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit 7ba94fad0c57fd05d490baaf624c0310b4481d97
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 00:54:38 2025 +0800

    修复编译问题

commit 38ce2f7f24af8c8f1ab406d0c893a20ed5b406ea
Merge: f7eecfc0 5d573807
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 00:54:24 2025 +0800

    Merge branch 'develop-Mix4ECpack' of https://github.com/CrimRecya/Phobos into develop-Mix4ECpack

commit 5d5738074231a7355b7ada5656b11740ea3bf514
Author: 航味麻酱 <[email protected]>
Date:   Wed Mar 5 00:27:29 2025 +0800

    多炮塔 (#13)

    * unfinished

    * [Docs] update & fix

    * Fix oversight in attached particle system pointer invalidation

    * Update Hooks.MatrixOp.cpp

    * Update Hooks.MatrixOp.cpp

    * Update Hooks.MatrixOp.cpp

    * 画对辣

    * 完成辣

    ---------

    Co-authored-by: 九千天华 <[email protected]>
    Co-authored-by: Starkku <[email protected]>
    Co-authored-by: 绯红热茶 <[email protected]>

commit f7eecfc0a284f076b3b679210a118261e7f19f77
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 00:23:37 2025 +0800

    更新改动说明

commit 86532c0c49e62d7543e72e006014af8b70bd07a9
Author: CrimRecya <[email protected]>
Date:   Wed Mar 5 00:21:48 2025 +0800

    自动建筑绝赞更新

commit 237a9f9625f50331c5799e01be300db2953568d1
Author: CrimRecya <[email protected]>
Date:   Tue Mar 4 23:43:40 2025 +0800

    Minor update

commit e6ed00e4f476f8bd5b1ad320b1353f2a6431ac34
Author: CrimRecya <[email protected]>
Date:   Tue Mar 4 12:19:53 2025 +0800

    优化子机返回

commit e1c8bbfd7c2360e4e77b6468402c95f3720ed573
Author: CrimRecya <[email protected]>
Date:   Tue Mar 4 01:04:49 2025 +0800

    遗漏内容

commit 98dd6982a59c77623d27902217ec488847f5f38a
Author: CrimRecya <[email protected]>
Date:   Tue Mar 4 01:01:02 2025 +0800

    修复弹窗

commit c1813bbe86208b9329920ede4ad30b5f76c5f17c
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 23:38:43 2025 +0800

    更新改动说明

commit 9e625ae50663db0da92e03aee0742d7aa2a7baca
Merge: e96716c5 aa1ca7bf
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 22:00:14 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit aa1ca7bf99ce5f88dc5fa666fb0c918f9f461491
Merge: 66e4db9b dda20ea0
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 22:00:07 2025 +0800

    Merge branch 'develop-kickout' into develop-Mix4BEtest

commit dda20ea0aa37983fdac8046288b44f5f8b51cbbc
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 21:58:55 2025 +0800

    Optimize

commit e96716c566117fdcaa150b150f1921215b9ebaf9
Merge: 8b2f4b77 66e4db9b
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 21:51:01 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 66e4db9b39d407154f655357280c8bd74c455f14
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 21:50:55 2025 +0800

    优化代码并增加一大堆注释

commit 8b2f4b775aa0425afefe851f8a35e4413df00e65
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 17:52:22 2025 +0800

    更新改动说明

commit 5c57777a921c5faf2296d664eb6c632a7cf39df9
Merge: fd280020 79880e38
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 17:50:32 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 79880e38b8d268940ec65953a8b7ad0fb474e7b1
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 17:50:25 2025 +0800

    超武侧栏优化

commit fd2800206011306fb249224d241353d3f3b4dbc7
Merge: 72dbc1ad 190e7960
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 17:26:32 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 190e7960e6de4752acc480749d23c83c4f90b832
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 17:23:40 2025 +0800

    修复合并

commit a91bd8429b898805acca47f7833f8342200e6a23
Merge: 853c68dc ae7d0982
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 17:23:15 2025 +0800

    Merge branch 'develop-kickout' into develop-Mix4BEtest

commit ae7d0982c7e2547d519c5d9af1c9b785df85a6db
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 17:21:57 2025 +0800

    Fix merge, update and add comments

commit 1cdb30acac5ec5c169a8b95c0c30cdeba8d72c9e
Merge: 236ada4f ed339c07
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 17:02:22 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-kickout

commit 72dbc1ad82c71b58f956b4bd2204855aee109362
Merge: ee658d40 853c68dc
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 16:59:11 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 853c68dca77483b516745c4909e86afa370f7336
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 16:59:03 2025 +0800

    简化代码

commit ee658d406af2f9d0d8718e1250079dcd9960f10a
Merge: cf715d1d 320de3c5
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 02:41:39 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 320de3c508990f57770b0a5ae974e9afe89072ad
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 02:41:34 2025 +0800

    更新一些注释

commit cf715d1df89037ebfa80de5e7aac7f156417c44b
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 02:17:29 2025 +0800

    移除重复

commit ff99e9b8f7838aa61392cc4a2288d22edb43b242
Merge: 3fa9ac49 90cc85d8
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 02:16:54 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 90cc85d80e342bdf32ec07146337b9a0a7d651e4
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 02:16:33 2025 +0800

    移除重复

commit 43387597f09a3858e387487ae3a48be097d98462
Merge: 8f86097b 661a4f68
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 02:14:45 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit 8f86097b900ca35d4f52a240fd4d82678ba0f33e
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 02:13:22 2025 +0800

    移除说明

commit 3fa9ac49005c58c7bc9dc1f5fb0460322ae6a792
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 02:12:55 2025 +0800

    更新改动说明

commit 0d466f10161f22a01624b5dfff80e39279680f9d
Merge: 4cf0d7f3 346c89c5
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 01:42:50 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 346c89c5fb3286bd6e9806d4706cfd67c7c5bda1
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 01:41:45 2025 +0800

    移除说明

commit 4cf0d7f351363db8ba03d0db9cd684bd6ae34f5f
Merge: 74c6dab9 bdd8b62f
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 01:27:57 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit bdd8b62f4ec71cd98894787b5363fb23121b09df
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 01:27:27 2025 +0800

    修复合并后多余的东西

commit 892f237de757c11a4c674802d3ba70ef88928404
Merge: 8098f942 482a74be
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 01:24:59 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit 8098f942f9d188f43e3f75060bd4446d07b0813b
Author: CrimRecya <[email protected]>
Date:   Mon Mar 3 01:21:06 2025 +0800

    移除无用

commit 74c6dab95f76e849f7cd6b4c28ae93c54a92ac6a
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 23:57:47 2025 +0800

    版本号更新

commit 30e56d3df9a76276e531ed2e576ad3626613c83c
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 23:57:34 2025 +0800

    更新改动说明

commit 33833463ffabe63811b087096d38d3a266932bc4
Merge: 6204e63d 00356d0f
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 23:56:11 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 00356d0f6d07995ed991d011eb7a21148b3c6690
Merge: dcd80748 47837877
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 23:56:05 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit 6204e63dfdb9e4e3ff73dbd9746eb2b2baefdc31
Merge: bc5299d0 dcd80748
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 23:51:56 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit dcd80748266fa0d76f3ca73fa0fa095e37343685
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 23:51:41 2025 +0800

    加点注释并简化代码

commit bc5299d02ef33a94198f639538ed8b9ccbd0d606
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 22:30:26 2025 +0800

    小修正

commit e99d503bee939d5f7c909274fd262f6c4128fcb7
Merge: 2c0b00d1 8427505f
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 18:22:17 2025 +0800

    Merge branch 'develop-Mix4ECpack' of https://github.com/CrimRecya/Phobos into develop-Mix4ECpack

commit 8427505f39a5a531e17fd1cc59a02bf185d790d3
Author: 航味麻酱 <[email protected]>
Date:   Sun Mar 2 18:20:29 2025 +0800

    Auto building rally points (#12)

    * unfinished

    * update

    * [Docs] update & fix

    * [Doc][zh-cn] CREDITS

    Due to some processing issues with the sphinx-build command, there were some minor problems with the previous Mentalmeisters Team section

    * update

    * update

    * update

    * ready to go

    * 更新改动说明

    * 更改一些可本地化内容

    * 更新改动说明

    * 删个等号

    * update

    * 修复扩散抛体的小问题

    * 更新改动

    * update

    * docs

    * 1

    * 移除多余

    * Core

    * 额外功能说明

    * 更新改动说明

    * Fit with trajectory

    * Fix compile error

    * Fix YRpp

    * Optimize and rename

    ---------

    Co-authored-by: 九千天华 <[email protected]>
    Co-authored-by: CrimRecya <[email protected]>

commit 2c0b00d188cbc792acd935d73288d1a7ec4aeb0b
Merge: e55f72d2 eebf2153
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 15:43:01 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit eebf21539b8f91abdcd103cfb7f04736191e2c38
Merge: e5e44191 d9387d8a
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 15:42:52 2025 +0800

    Merge branch 'develop-VisualScatter' into develop-Mix4BEtest

commit d9387d8af12b332ffb37b2c6d765f2f910e1f5b1
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 15:42:45 2025 +0800

    Fit with trajectory

commit e55f72d2b2479fb829e394014b3878c87970a005
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 14:15:32 2025 +0800

    更新改动说明

commit 5d508f5dcfb1ab7a4147a7c8e5c461ab09949f8c
Merge: d97cf3b8 e5e44191
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 14:13:04 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit e5e44191922e5326bced333aad27f80b667836c2
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 14:12:29 2025 +0800

    额外功能说明

commit 3dc09e1102149aae185f5f65a23ae3822c50933d
Merge: 28a89af4 8c425be5
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 14:07:14 2025 +0800

    Merge branch 'develop-VisualScatter' into develop-Mix4BEtest

commit 8c425be586c5ab426592d87203c27b814ed7b690
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 14:05:56 2025 +0800

    Core

commit d97cf3b8c5c4225cb706c6a3116c032dfc5bd94d
Merge: fd78150f 28a89af4
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 13:29:28 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 28a89af4ca8d40fff5954e94eaafeaf03ff78da2
Author: CrimRecya <[email protected]>
Date:   Sun Mar 2 13:29:23 2025 +0800

    移除多余

commit fd78150fe058515967ad406bd720ecfbdb0c269c
Author: CrimRecya <[email protected]>
Date:   Sat Mar 1 19:55:50 2025 +0800

    更新改动

commit 6bd1b8b3b85cce0799aec650e5b618abaf55c6f6
Merge: e75a3955 a45d07ca
Author: CrimRecya <[email protected]>
Date:   Sat Mar 1 19:28:41 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit a45d07ca4b30a80e6ff9cfd0b81fc2282224716a
Author: CrimRecya <[email protected]>
Date:   Sat Mar 1 19:28:36 2025 +0800

    修复扩散抛体的小问题

commit e75a3955d89ac64fa9219e81aa68e517e65c6fe6
Author: CrimRecya <[email protected]>
Date:   Sat Mar 1 18:15:47 2025 +0800

    删个等号

commit e0165973cae855383975aec5b14ccbe450d31fe5
Author: CrimRecya <[email protected]>
Date:   Sat Mar 1 16:50:50 2025 +0800

    更新改动说明

commit d372fde62957b03aa1133c4a6eb181289c0e2c22
Merge: 7a308703 cd479d43
Author: CrimRecya <[email protected]>
Date:   Sat Mar 1 16:37:50 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit cd479d43527d2f9043b7de68ea298f91809abc6a
Merge: 181dff01 799ea22f
Author: CrimRecya <[email protected]>
Date:   Sat Mar 1 16:36:50 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit 181dff016313dbf89e4568cbc64915c2948545d0
Author: CrimRecya <[email protected]>
Date:   Sat Mar 1 16:36:07 2025 +0800

    更改一些可本地化内容

commit 7a308703890a56642b736d216361ee7440d34046
Author: CrimRecya <[email protected]>
Date:   Sat Mar 1 16:34:39 2025 +0800

    更新改动说明

commit a8e4cb03c14684ff3744ea204c29995814c91153
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 21:58:43 2025 +0800

    版本号更新

commit e02e89c6ad36e355104ca44021090843c173ed9f
Merge: 22535236 1e8c985f
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 21:58:36 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 1e8c985f79dddc56e68da6d1eaa079af15795a52
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 21:58:09 2025 +0800

    版本号更新

commit 225352364fad8cc6edc6b9da5b9687be38219cc8
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 21:57:32 2025 +0800

    更新改动

commit c254c22cff7d78af8f4e678e913537d7e177525b
Merge: 7c64bf86 ffb199ff
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 21:41:08 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit ffb199ff78c53400f168273d0a77d273229e814b
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 21:41:03 2025 +0800

    退回旧版的方式

commit 7c64bf869e58e00a5b2048507787ed06d5763b30
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 19:26:52 2025 +0800

    改动说明

commit 987c0ec80996a8717f702011e96fe7d51068daa9
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 18:32:51 2025 +0800

    更新改动说明

commit 721d58adad310ff2e56c7f58095c47e98f30f296
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 18:30:47 2025 +0800

    版本号更新

commit 9b9cda93f7dfe16f57f3277b036329768efaf515
Merge: 085fb5eb 22fbf5f5
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 18:30:05 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 22fbf5f5a440bc4f6ad6a084b09397bc61c0dac3
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 18:29:15 2025 +0800

    修复合并

commit 1f7c688e7303100b2649f83c51d9a86c5d79d214
Merge: b87ce619 aadd0a1a
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 18:27:37 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit b87ce619258d7a696a2ec19d368e189fc3fee568
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 18:24:01 2025 +0800

    测试版本号更新

commit 085fb5eb01b41270a03c0cf71fb74270932c650d
Merge: 98367d80 e04b3d32
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 17:01:41 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit e04b3d32ed9b0e298109c648059e5c10f18cb785
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 17:01:35 2025 +0800

    更新四个抛体功能

commit 98367d80f38e67971af9c85ed844fddeb5993a51
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 16:58:39 2025 +0800

    改动说明

commit bc5ae226c76150e0045a434aa78f7946af896fd1
Merge: d82a9c53 4fae6712
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 14:08:30 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 4fae6712f0f40c9814e50ad881ebb7fc010665bc
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 14:08:24 2025 +0800

    功能说明

commit d82a9c53125abf8512e0501396e731e365bd50f6
Merge: d0e5d076 b3be6066
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 12:34:42 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit b3be60668176ac07013c6a42792659d7726a8f51
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 12:34:37 2025 +0800

    完成所有底边栏按钮

commit d0e5d076cb6f830763c37e9772366b727343cf31
Merge: 60a1684b 148302a1
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 02:23:12 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 148302a160904405e03f33951ab1ca6eef9bba4e
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 02:22:37 2025 +0800

    不再读取原本的单位组

commit 60a1684b777ee44c9149a90a7077e8b63e2d6fd2
Merge: 2847d7f7 1e1ee025
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 01:44:42 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 1e1ee025e8a0522762940039c62ee6d4a9ae3970
Author: CrimRecya <[email protected]>
Date:   Fri Feb 28 01:44:27 2025 +0800

    尝试优化并给展开的图标排序

commit 2847d7f70068cc99fa7f2067c21d830c8c50c5db
Merge: 43c65923 42f78201
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 22:23:32 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 42f7820127005c08a1c9bfc29f7022632e7a9be1
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 22:22:41 2025 +0800

    优化一下

commit 43c65923792d7e3579e5e9be110a0cbbf6418dc9
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 20:50:32 2025 +0800

    小改正

commit 0beac292f5440b8c90fca46020b219a78af18479
Merge: 31fa7a9f e54d7367
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 20:49:01 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit e54d73673f535587bbd62d21b234cb14cbefa818
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 20:45:36 2025 +0800

    判断按钮能不能按

commit 10ea9d77b363f0aef1f16672c200ef41b903185e
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 20:37:52 2025 +0800

    简化一个不必要的判断

commit 31fa7a9f2ae765bdafaa92ec7e0d7ad43b5aa55d
Merge: fcaf6d51 4317a201
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 20:12:27 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 4317a2017ef22f7f4949344575c007769e6b19f1
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 20:12:06 2025 +0800

    修正小问题

commit fcaf6d51f2fdf989892111f0c22d6d45d0d73f1f
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 19:29:22 2025 +0800

    更新改动说明

commit 34df1a98096f402eca822fd9495081c15b18d994
Merge: e96b17f2 88d64ffb
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 19:27:27 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 88d64ffb9122b396df72c5855aadd06a16449168
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 19:27:03 2025 +0800

    继续完善功能

commit 43a107818a7090f4d2becf0e41d2c5e974fe0fd8
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 18:58:11 2025 +0800

    移除不必要的说明

commit e96b17f213ab8d8023e0bbbcbc76ffd46ba2aea6
Merge: fd56fc06 1489d7cb
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 15:19:17 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 1489d7cb40feb0320883acad64a0e88a9bd1326b
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 15:18:53 2025 +0800

    底边栏增加信息

commit fd56fc067b37eb8d2642ca6ddad52f78de61802d
Merge: faa0b8d6 c169c892
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 12:07:11 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit c169c892536641ab7d2af720e562f6973cd6d096
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 12:07:05 2025 +0800

    小修复

commit faa0b8d698c5706486b428b3edcb3455f0e68a66
Merge: aa2e78dd a93877ef
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 11:47:13 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit a93877ef8a63ae5d0871725183470fd9356cc86c
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 11:47:08 2025 +0800

    输入先于绘制故可能需要提前更新选择信息

commit aa2e78dd526575a1fc4a9e476dee8961469a9f42
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 10:52:06 2025 +0800

    更新改动

commit 8ea06c2a61549a96a175c2bf7c4ce076b40a9be8
Merge: fbdcbe97 8aa06c4c
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 10:51:09 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 8aa06c4c08b22890f319e2f7309a1311e073db2d
Merge: c8a52883 78fea5be
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 10:50:48 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit c8a52883b04047825d484c9987871a76c2b3a6e1
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 10:50:46 2025 +0800

    功能说明

commit fbdcbe97ac14d5bc0c7bc9772dd352a652206a63
Merge: 2b47aa77 c6486242
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 00:41:15 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit c64862422cb5ba3b64faaaf91983c4bf8ce1a61d
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 00:41:11 2025 +0800

    修改并加上按钮音效

commit 2b47aa7746f4aa943258de28a73848674c49a9ee
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 00:32:20 2025 +0800

    改动说明

commit 3553552fc600a3479bbaed98766b3dd4827110a9
Merge: 694a07df 1762cfb4
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 00:28:53 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 1762cfb4e63971e2e2481d5b821f2e6bd0431d59
Merge: c8f1903c 8093e866
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 00:27:21 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit c8f1903cd6d50197486564f1958f61f5c6cd3ff4
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 00:25:56 2025 +0800

    修复命名问题

commit 694a07dfe465cff916ac64d9d812f52953fa26a0
Merge: 679e3ba2 b935e154
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 00:23:14 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit b935e154b986f48122a2d83b41621cce0f7d7464
Author: CrimRecya <[email protected]>
Date:   Thu Feb 27 00:23:08 2025 +0800

    继续完善底边栏功能

commit 679e3ba24e9dd9c3516cf22c9f59fdfc60a3d0fe
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 23:26:11 2025 +0800

    改动说明

commit cc5a9009f01dee40d62ca9a6821c10f57918c071
Merge: 137c6d96 ba4ebb87
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 21:12:35 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit ba4ebb870b5d70a9819ac239a793b8a4c5fd5489
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 21:12:29 2025 +0800

    功能说明

commit 137c6d96abf4f82be23e28dcace906f627171fbf
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 21:10:24 2025 +0800

    更新改动说明

commit 22143606802908851adf66a33d8971388ee489ac
Merge: db7172d2 741c8b51
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 20:55:14 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit db7172d2c20e858613a7ca10292843e4e8e31a90
Merge: 8f875c5e af5f6b69
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 20:55:11 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4ECpack

commit 741c8b51dbad9e5dd6f9334a63144dedcff067bc
Merge: be8292c7 af5f6b69
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 20:54:41 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit be8292c796eac2097a365e37af75a7f35c25115e
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 20:47:25 2025 +0800

    修复部署载具的问题

commit 8f875c5e0cd5d0dda8c523d3a632a05b03a38b0c
Merge: acade0cc c4c2767c
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 14:19:36 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit c4c2767c2fbfca9273d975394c4bff47be921ed5
Merge: 877b16c7 20efc644
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 14:19:15 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit acade0ccfdfe8c2f823469de2ccdea4116ca7fc2
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 01:45:09 2025 +0800

    小简化

commit 3e29230b27adb5e6ffa4ecb13bc67fedaaab3f7b
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 01:32:36 2025 +0800

    简化子机回收代码

commit 09df8c9af6dccdb3f31c12e6eba6f0e4449ccb51
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 01:21:51 2025 +0800

    合并子机回收位置

commit 83cd066a411bef4c43609407ebc92dd66b6d0183
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 00:54:43 2025 +0800

    更新改动说明

commit de2ced3bc0e9a2ef63c86d2d9fef0f74f3bf74f3
Merge: a45334de 877b16c7
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 00:53:24 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 877b16c74b035c181a3b8790e6c53df62ed683c8
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 00:53:19 2025 +0800

    修复不影响友军的弹头仍会导致图标闪红的问题

commit a45334de913f9c11f7e48da22b26f27a4c8169ed
Merge: f892d983 1598b7a6
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 00:10:29 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 1598b7a619c3b7bbc6dfe7a7fd9398ef45a7794b
Author: CrimRecya <[email protected]>
Date:   Wed Feb 26 00:09:21 2025 +0800

    修复合并

commit f892d983b7431a12b7df8c8ddd3e05991be993e5
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 23:59:40 2025 +0800

    修复合并

commit 788c4dc807bc9b6abbab9fe5cf6f6d3bad7626d9
Merge: 42f33b2c 4624023f
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 23:58:11 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 4624023f488fe6e2b0ffef9233aa706873631a07
Merge: 01a14911 2ff45a0a
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 23:52:57 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit 42f33b2cb2deb2496f37ee3fbf58c6d8c38bf748
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 23:48:30 2025 +0800

    同步更新

commit 0cdb62c863ec78aae828dc3fd379127191b58c07
Merge: 72f52f9b 01a14911
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 23:48:05 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 01a14911c066aff4431e9e232bc4477e04642d26
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 23:47:57 2025 +0800

    继续完善底边栏功能

commit 72f52f9bbd2db11d075f953efa5c141d744ccbe6
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 23:33:50 2025 +0800

    更新改动说明

commit 9b1fd819223e59279438caf91dbe3c9bdbafbd82
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 03:34:52 2025 +0800

    修复合并并更新说明

commit 9ecbab34fc626b8926788c5fcb23d79e2944e7d3
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 03:20:09 2025 +0800

    修复错误响应事件

commit ff14670fcb4c921d0c9737252622e71fa17170ae
Merge: 8a89341e 5c331244
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 02:41:28 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 5c33124467245bf4159e920832f09989f4d68ab6
Merge: 4b3b4d35 783bf212
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 02:41:23 2025 +0800

    Merge branch 'develop-newinfotype' into develop-Mix4BEtest

commit 783bf212bdcad194c7845aa7ffd10779bcd96fe9
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 02:41:18 2025 +0800

    Fix a typo

commit 8a89341e5ba4aa887932f721713a87db49e1fdbc
Merge: 8ffd725e 4b3b4d35
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 02:24:46 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 4b3b4d3522e9ce13de028209cde2d03aaf266c47
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 02:24:42 2025 +0800

    记一下要做的

commit 8ffd725edc6cb532f6eaa19b073ee0ab052c1c2d
Author: 航味麻酱 <[email protected]>
Date:   Tue Feb 25 02:22:36 2025 +0800

    Missile spawn exp (#11)

    * impl

    * [Docs] a few

    Handle errors (e.g., "applied to to TechnoTypes")
    Standardize the names and formats of special terms, such as changing *.ini->[xxx] to *.ini -> [xxx] like the existing [xxx] -> key (and sometimes the two are used together)
    Missing symbol
    Missing type annotation
    .etc

    * Update Hooks.BugFixes.cpp

    * Squashed commit of the following:

    commit ddcd9de51e703e2eafc79c325877a87417f960ae
    Author: 航味麻酱 <[email protected]>
    Date:   Tue Feb 25 02:17:27 2025 +0800

        补个标签 (#10)

        * impl

        * Update Hooks.Misc.cpp

        * Update Hooks.Misc.cpp

        * flag

        * [Vanilla Fix] Fix impassable invisible barrier created by chronosphere on uncrushable unit (#1529)

        (Re-merge properly)

        - Fix an issue where a unit will leave an impassable invisible barrier
        in its original position when it is teleported by ChronoSphere onto an
        uncrushable unit and self destruct.

        Thx to @NetsuNegi .

        Co-Authored-By: Netsu_Negi <[email protected]>

        * [Minor] Fix Ammo features and tank bunkers. (#1420)

        - fixing ammo block inside tank bunkers;
         - partially fixing ammo adding/substracting inside tank bunkers

        still problems with converters

        ---------

        Co-authored-by: Coronia <[email protected]>

        * [Minor] Disallow other actions for building in planning mode (#1524)

        <!-- Please add [Minor] to the title or the description if this change
        should not be mentioned in documentation, what's new and no credit needs
        to be given. -->

        ---------

        Co-authored-by: 绯红热茶 <[email protected]>

        * Add project maintenance structure and contribution types to docs

        * Fix #1106 : Deployer = yes to no infantry conversion sequence update (#1315)

        It's a bad design and thus does not worth a fix
        in case someone really wants to, here's one way to it

        * [Minor] Exception handler control via command line argument (#1231)

        Just use command line argument `-DontSetExceptionHandler` to disable
        game exception handler.

        UPDATE:
        `-EH-off` & `-EH-on` tags.
        For debug build default is **DISABLED**.

        UPDATE2:
        `-ExceptionHandler=boolean`

        ---------

        Co-authored-by: Kirill Andriiashin <[email protected]>
        Co-authored-by: Kerbiter <[email protected]>

        * Avoid InvisibleInGame targets in new scripts (#1312)

        Buildings with InvisibleInGame=yes should be ignored in the target
        selection of the new attack/move actions.

        I just found I forgot to send this time ago :-/
        No credits or mention needed since it only fix a small bad behaviour.

        * Fix contribution types docs a bit

        * update docs and credits

        * [Docs] a lot like [zh-cn]New-or-Enhanced-Logics

        * [doc] $Include

        Revise the description of disabling the Ares include feature and add the reasons.

        * [Docs] a few

        Handle errors (e.g., "applied to to TechnoTypes")
        Standardize the names and formats of special terms, such as changing *.ini->[xxx] to *.ini -> [xxx] like the existing [xxx] -> key (and sometimes the two are used together)
        Missing symbol
        Missing type annotation
        .etc

        * [Minor] Fix Insignia.Weapon parsing (#1530)

        Separate the fix from
        https://github.com/Phobos-developers/Phobos/pull/1365 to a standalone
        pull request, which should fix the issue in
        https://github.com/Phobos-developers/Phobos/issues/1528.
        - previous Insignia(.Frame/.Frames).WeaponN settings can't be read or
        overridden from maps, which is fixed now

        * [Vanilla Improvement] No turret unit turn to the target when rearming (#1465)

        - Now vehicles (exclude jumpjets) without turret will attempt to turn to
        the target while the weapon is cooling down, rather than after the
        weapon has cooled down, by setting to `NoTurret.TrackTarget` true.

        In `rulesmd.ini`:
        ```ini
        [General]
        NoTurret.TrackTarget=false   ; boolean

        [SOMEUNIT]                   ; UnitType
        NoTurret.TrackTarget=        ; boolean, defaults to [General]->NoTurret.TrackTarget
        ```

        ---------

        Co-authored-by: 航味麻酱 <[email protected]>

        * [Customized] Damage multiplier for different houses (#1307)

        - Warheads are now able to define the extra damage multiplier for owner
        house, ally houses and enemy houses. The values in warheads are default
        to respective `[CombatDamage]` -> `DamageXXMultiplier`, which all
        default to 1.0 .Note that this will not affect damage with ignore
        defenses.

        In `rulesmd.ini`:
        ```ini
        [CombatDamage]
        DamageOwnerMultiplier=1.0     ; floating point value
        DamageAlliesMultiplier=1.0    ; floating point value
        DamageEnemiesMultiplier=1.0   ; floating point value

        [SOMEWARHEAD]                 ; Warhead
        DamageOwnerMultiplier=        ; floating point value
        DamageAlliesMultiplier=       ; floating point value
        DamageEnemiesMultiplier=      ; floating point value
        ```

        * Remove a useless variable and fix doc

        * Squashed commit of the following:

        commit 2182e831aeae7f8938303721c6a2e937dd6ff067
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 25 02:06:36 2025 +0800

            小改位置

        commit 056a7ab1a82e11ba5b37b0c17613f927eb8fb66a
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 25 01:19:11 2025 +0800

            改动说明

        commit 545f6088d35b9b32543e9db7dc371a464fa90ce1
        Merge: 7d3c131d cf69a711
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 25 01:18:22 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit cf69a7111ae2070728de5f3cb40a399e203ac7be
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 25 01:18:17 2025 +0800

            功能说明

        commit af44f3f6182cb97eed0824fe9bcd40408b1f81be
        Merge: 49dfd0ae 886cd122
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 25 01:15:47 2025 +0800

            Merge branch 'develop-newinfotype' into develop-Mix4BEtest

        commit 886cd122a666ced42f990f3c4107bc5532ebe829
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 25 01:15:40 2025 +0800

            New `ValueAsTimer`

        commit 7d3c131ddda6ba5efad94b3f8c196d325bcf35d5
        Merge: 57eaa340 49dfd0ae
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 23:30:29 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 49dfd0aea1d60c88b270ba43d0182690da411a7d
        Merge: 4c7d1cc9 a954c838
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 23:29:55 2025 +0800

            Merge branch 'develop-newinfotype' into develop-Mix4BEtest

        commit a954c83885f29a2af9da6c10224f5ef27064be06
        Merge: 83debb74 13cdc0cc
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 23:28:34 2025 +0800

            Merge remote-tracking branch 'upstream/develop' into develop-newinfotype

        commit 57eaa3401b39d0159ed082c23fab4a911b3d50dc
        Merge: 9166eec1 4c7d1cc9
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 22:27:31 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 4c7d1cc9f25259335cbd95f9590b421982c406eb
        Merge: 052ce1e4 13cdc0cc
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 22:24:12 2025 +0800

            Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

        commit 052ce1e469faa7b7d92ea6f4fb41957f29840afd
        Merge: 59007c82 00752e41
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 22:17:17 2025 +0800

            Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

        commit 9166eec198d7f1e4d4691f05f4002a3c3bd9f5c7
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 21:04:39 2025 +0800

            修复侵略模式按钮

        commit 241479932e0fa9c9b9327d8aff51827e64e944a7
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 20:41:54 2025 +0800

            更新改动说明

        commit eed20f690ed6a5ff57f3da7cb6eacde3f7e3eac1
        Merge: 4d9ab456 59007c82
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 20:38:07 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 59007c8205df4cb35345a2f1a89b12d3d2c5cd76
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 20:38:02 2025 +0800

            小改动

        commit 4d9ab456f6285d7476be2d06aa56d8baad5eb2be
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 20:36:50 2025 +0800

            合并功能

        commit a3965d3d37a6195f226d3c3c9ecb025562f970fd
        Merge: 6342450f d1cda617
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 20:31:45 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit d1cda6171fce116c5195e64ba6c83270ac6b5a80
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 20:31:11 2025 +0800

            功能说明

        commit 6342450f45e7c0e4b791a9fa81de957c0601817c
        Merge: dc523103 3456e138
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 20:10:29 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 3456e138f8a480d8f83f82749d9b2b2419bee65b
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 20:10:23 2025 +0800

            完成所有基本底边栏功能

        commit eb2d35e49e57f285e81adbe0befc88138c9c8976
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 03:01:09 2025 +0800

            底边栏功能继续完善

        commit ac74b4c14b9891f351d2d27a043edbc06c560475
        Author: CrimRecya <[email protected]>
        Date:   Mon Feb 24 00:02:03 2025 +0800

            全新的底边选择栏底层

        commit dc523103555d09cd4ded6779e7d805a49f61bfda
        Author: CrimRecya <[email protected]>
        Date:   Sun Feb 23 01:47:54 2025 +0800

            更新改动说明

        commit c8ebd98339f9671164c901f7c9ce354de8e374d5
        Author: CrimRecya <[email protected]>
        Date:   Sun Feb 23 01:47:39 2025 +0800

            修改玩家自动修理

        commit 94ea4577332bdc7e08416d9fcce6d3e0bbc83d85
        Merge: 16ff7f60 9180ff46
        Author: CrimRecya <[email protected]>
        Date:   Sun Feb 23 00:54:34 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 9180ff46ca477872b8697d73191bc9f0f6a48f58
        Author: CrimRecya <[email protected]>
        Date:   Sun Feb 23 00:54:15 2025 +0800

            更新说明书

        commit 16ff7f60b4cca7e9bfa94e41416798f7dde98550
        Merge: 2d01a403 8be46a13
        Author: CrimRecya <[email protected]>
        Date:   Sun Feb 23 00:47:51 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 8be46a13c08a209a148dcea48ad29c74ff3fe51e
        Author: CrimRecya <[email protected]>
        Date:   Sun Feb 23 00:47:46 2025 +0800

            增加自动建筑快捷键初始默认值

        commit 2d01a40324ab5868d6638b2c48b3a5aa26358b48
        Merge: 23a3d9ca 40a71e5b
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 23:02:29 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 40a71e5b2e56a5788b1ed55fdd909cab972d4ccc
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 23:02:24 2025 +0800

            补充独特单位显示的完整开关

        commit 23a3d9ca3e099433a52ba4ffa5cedf6336aebfd1
        Merge: 7b831b56 87b20441
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 22:52:49 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 87b20441dd94d225559b13f7dcff3bc1ccb954df
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 22:52:16 2025 +0800

            彻底修复超武侧栏的开关点击问题

        commit 7b831b56de380bda032adbe852adb798ed353e9f
        Merge: 4d99159a b2adb3c2
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 20:58:27 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit b2adb3c2b382c116d529d62a1bb0409dd7f87e00
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 20:58:23 2025 +0800

            Fix typo

        commit 4d99159ab6cd325251152b9ed7bed1044b9709af
        Merge: a9f01889 7053fae2
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 20:24:20 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 7053fae23ecb17efa368c4258c891a1723e6e9a7
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 20:24:15 2025 +0800

            修复最后一个点击问题并优化科技树图标检查

        commit a9f018895c06b6922e2a8d61a7be73a837829a66
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 17:06:18 2025 +0800

            更新改动说明

        commit 4d9f7580e1709d0fcbd2bc4369d65591cf50da96
        Merge: da3e0c4d 8e57d2e0
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 17:01:38 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 8e57d2e03698dfb5a9f7493af0ad2636ba8bced0
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 17:01:33 2025 +0800

            修复超武侧栏的一些点击类问题

        commit da3e0c4d64d79bf080d775e7cfa1477d0948c0da
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 14:01:31 2025 +0800

            更新改动说明

        commit 0e782d6afa7b9391d75600d7f3272246d60faa12
        Merge: f49ceee6 1ce0f217
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 13:51:41 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 1ce0f217a579170a63981e30b4604350b3487349
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 13:51:08 2025 +0800

            超武侧栏的更新和修复

        commit 504b88e6f16be5ff25174e77605918306f97bd9c
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 12:14:33 2025 +0800

            修一下说明书

        commit f49ceee64f2fe71d3d8194726fc6761ae2b40d61
        Merge: 1eb3ccdc 8e4b0a24
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 05:21:55 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 8e4b0a24461f040ed07b42e6cf0153785fd58977
        Merge: 3cb24f21 2d9f9c4c
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 05:18:43 2025 +0800

            Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

        commit 3cb24f21da43fc59c75fd830b766ede418fb6345
        Author: CrimRecya <[email protected]>
        Date:   Sat Feb 22 05:14:52 2025 +0800

            修改一些超武栏的钩子并重做英雄栏底层

        commit 1eb3ccdc534ccfe4de3b89a40e2997dd38313788
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:47:17 2025 +0800

            版本号更新

        commit 7c0c86202cb3a2d0a777f7aab5bc3181b7fa08ca
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:46:24 2025 +0800

            改动说明

        commit e0e8ab1372852d65035d7206873eb5669926c655
        Merge: c35b5f5d 97849d3d
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:42:11 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 97849d3debd3f109cc47ba88d954255a5b35d45a
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:42:06 2025 +0800

            功能说明

        commit 7cf6b28f7916afb292b94fd6cb6ffdabd11d252b
        Merge: cad44713 86e3aa61
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:41:07 2025 +0800

            Merge branch 'develop-UndeployBuilding' into develop-Mix4BEtest

        commit 86e3aa611d574da3186af9b41a782f3175af6ee8
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:40:59 2025 +0800

            Fix

        commit c35b5f5db8b5cf947e89bc6d6a89afd7643f5459
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:22:35 2025 +0800

            更新改动说明

        commit be5597d2de4cf4445e370652e4fa962a335302e6
        Merge: 81cd401a cad44713
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:19:10 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit cad44713188639146629b4642c38171569b882dd
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:19:04 2025 +0800

            额外功能说明

        commit 394fd6962496aeaf9c4aac259cacf27393fa1cb4
        Merge: c6f6c2be 1b984b03
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:17:41 2025 +0800

            Merge branch 'develop-UndeployBuilding' into develop-Mix4BEtest

        commit 1b984b034eff04c81e8fe02f8b4ec23f0743912b
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:17:32 2025 +0800

            New `BuildingSell.IgnoreUnsellable`

        commit 81cd401aa6796a2187130c16f90bf86d968fd973
        Merge: 998455e6 c6f6c2be
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:10:12 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit c6f6c2be2f8fb2121f4f1afc67caa7c5726a1b5c
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 22:10:07 2025 +0800

            播一下声音写一下字

        commit 998455e6c74f9fe1c0ee2d4359ad8d63d7dafafe
        Merge: e8ed0b99 01e4b330
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 20:21:47 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 01e4b3304dcbe182ce0b12188d02f2934e2c7a6f
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 20:21:44 2025 +0800

            修一下注释的位置

        commit e8ed0b99e1bcd5694b2522b3ae476b6f3bd34064
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 20:21:06 2025 +0800

            更新改动说明

        commit 6daf0a89ee309b2e88dc88e32c62ee8be8aabe5b
        Merge: 3875c084 0c03bdf8
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 20:17:23 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 0c03bdf88d763d51726fda78cd74315cbb276a43
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 20:17:18 2025 +0800

            新增滚轮功能

        commit 83debb7474efde6b3f4c0a40eeffd51d0fd48a10
        Merge: f260915c aa4e9525
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 17:44:55 2025 +0800

            Merge remote-tracking branch 'upstream/develop' into develop-newinfotype

        commit 3875c0848646ba8dab39c47ada5bed002f5ae0cb
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 17:42:54 2025 +0800

            更新说明

        commit 79109419c4c74892cd030f0bb664aa7b2908dfe4
        Merge: b6197722 2d6f3384
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 15:19:52 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 2d6f33849a6633a83490833481a6ceb5efde3fe8
        Merge: bb7ada15 aa4e9525
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 15:19:29 2025 +0800

            Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

        commit aa4e9525a3929c07e19957a76536c222c5d69b9a
        Author: 航味麻酱 <[email protected]>
        Date:   Thu Feb 20 15:18:14 2025 +0800

            [Minor] Disallow other actions for building in planning mode (#1524)

            <!-- Please add [Minor] to the title or the description if this change
            should not be mentioned in documentation, what's new and no credit needs
            to be given. -->

            ---------

            Co-authored-by: 绯红热茶 <[email protected]>

        commit 06664e94f92e68f8ad22554354f7160eea64e8d4
        Author: Fryone <[email protected]>
        Date:   Thu Feb 20 09:57:57 2025 +0300

            [Minor] Fix Ammo features and tank bunkers. (#1420)

            - fixing ammo block inside tank bunkers;
             - partially fixing ammo adding/substracting inside tank bunkers

            still problems with converters

            ---------

            Co-authored-by: Coronia <[email protected]>

        commit b619772284613a317851bc3ac38c56fd5f4a460b
        Merge: 65ea625a bb7ada15
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 13:32:35 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit bb7ada15bb756d6fd9d4d6cef6b8ffecb0d7eb56
        Merge: eb2d49cf ee1f0eae
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 13:32:26 2025 +0800

            Merge branch 'develop-UndeployBuilding' into develop-Mix4BEtest

        commit ee1f0eaee296465d335ed4a42ccd0577c6ea284b
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 13:32:06 2025 +0800

            More check

        commit 65ea625af75da45d2717ca242b73174ffdb79f3d
        Merge: 0596116c eb2d49cf
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 13:29:46 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit eb2d49cfe5c66d917c8395e2f19311ac7a2a24d5
        Merge: 7aef8ff6 9e33e4dd
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 13:29:21 2025 +0800

            Merge branch 'develop-UndeployBuilding' into develop-Mix4BEtest

        commit 9e33e4dde4d3a2efc695e0f02b5e0e47e5705369
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 13:26:56 2025 +0800

            Comment

        commit da46faa83f5e3ff68dc5b09c8b3366b5347f18fd
        Merge: a6291514 3b8e0e32
        Author: CrimRecya <[email protected]>
        Date:   Thu Feb 20 13:03:15 2025 +0800

            Merge remote-tracking branch 'upstream/develop' into develop-UndeployBuilding

        commit 0596116c970a15360bfa6fe88fd8d63fe514f50c
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 21:10:38 2025 +0800

            更新改动说明

        commit 5939c3c6da9e30d2a02c6bf49e3128e491aa85aa
        Merge: 5d71a343 7aef8ff6
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 21:07:58 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 7aef8ff684e8a754bb445fafe197218330a537bb
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 21:07:54 2025 +0800

            修复超长距离

        commit 5d71a343e534a465a5b347dc43ee4c44bc0c162e
        Merge: 81b6cefb b420e139
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 18:28:13 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit b420e1398cc022a8ba1513ab74a27044fbaa2228
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 18:28:09 2025 +0800

            扩散没目标的时候重新看一眼原目标

        commit 81b6cefbb0c63a27fd09e1969d482e16379d4801
        Merge: 5a47a9af 240efea7
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 17:14:22 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 240efea7905c407d0356ddbe39d12806186652a5
        Merge: 17f81446 fac6abb9
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 17:14:03 2025 +0800

            Merge branch 'develop-FloatMinerPathFix' into develop-Mix4BEtest

        commit 17f814461f680b5d0b8216e61abe9a32ce2d17e1
        Merge: 54dc20f5 3b8e0e32
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 17:13:32 2025 +0800

            Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

        commit 54dc20f545236f66f1cf5cbe2e7aadacbccac554
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 17:13:22 2025 +0800

            先移除重复

        commit fac6abb918b429de2031cf01876b48f16a75f85d
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 17:08:56 2025 +0800

            Core

        commit 5a47a9af68f05e6170764e0d7277e608d54d335f
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 16:40:33 2025 +0800

            更新改动说明

        commit 3b8e0e32fa9bafb3d5c954ac5419b8897beea316
        Merge: e14ffa83 93b5f068
        Author: Coronia <[email protected]>
        Date:   Wed Feb 19 16:40:13 2025 +0800

            [Vanilla Fix] Fix impassable invisible barrier created by chronosphere on uncrushable unit (#1529)

            - Fix an issue where a unit will leave an impassable invisible barrier
            in its original position when it is teleported by ChronoSphere onto an
            uncrushable unit and self destruct.

            Thx to @NetsuNegi .

        commit 5542bc84d8e46bfa0e0d20e76b6f5afb284e0174
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 16:36:34 2025 +0800

            说明书

        commit 041cc26812d1bdcf6eff7741fc8e5cfb83acefe1
        Merge: f44f3336 1d0fa6d5
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 16:34:45 2025 +0800

            Merge branch 'develop-Mix4ECpack' of https://github.com/CrimRecya/Phobos into develop-Mix4ECpack

        commit 1d0fa6d57a05c1ed61cc207a09265250021d5764
        Author: 航味麻酱 <[email protected]>
        Date:   Wed Feb 19 16:34:16 2025 +0800

            维修子机目标问题修复 (#9)

            * impl

            * Update Hooks.Misc.cpp

            * Update Hooks.Misc.cpp

        commit f44f333623b7cd216c001e543c22dd3b62d2a9cd
        Merge: 94b12f5b 5e07847c
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 16:31:02 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 5e07847ce7c0117fb32bd557c08fd264fa07f81e
        Merge: cce26bca bed1e2e7
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 16:30:58 2025 +0800

            Merge branch 'develop-KeepTargetFix' into develop-Mix4BEtest

        commit bed1e2e72a1d21069e45fcafa6c29080dce7aaa0
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 16:30:51 2025 +0800

            Core

        commit 94b12f5b0d953b0acb468eea0bc115f501eef200
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 15:05:40 2025 +0800

            更新改动说明

        commit 5ae70982f60bb122a63ba07a5c6a0a1f26639437
        Merge: 79bb3743 cce26bca
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 15:03:16 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit cce26bca9813068de56eb66d8a99e70acbfc69ad
        Author: CrimRecya <[email protected]>
        Date:   Wed Feb 19 15:03:12 2025 +0800

            小修复

        commit 79bb37432e6d99e9722bdf8d6ecf4bedb2d4b938
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 23:50:15 2025 +0800

            更新改动说明

        commit 9414b022f9316b929df2b03a85cd57599632cfc9
        Merge: ccbdee2f 5677c8ca
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 23:48:23 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 5677c8cad1f7b94f1e3b2f310059c1260bac64a8
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 23:48:13 2025 +0800

            修复读取错误

        commit ccbdee2f5cf1d8edc4ef33d341ea20b7f6783d9b
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 22:48:45 2025 +0800

            更新改动说明

        commit 903ac37c6367042347db5d090d178d8f14e32f26
        Merge: 1bab85db 04c2f22c
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 22:44:43 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 04c2f22c1b8a05cbd864398e585b1eda2d114b5c
        Merge: 6ebe050b e14ffa83
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 22:43:54 2025 +0800

            Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

        commit 1bab85db2a31b40d6e656aaa8a170d16cf590dc0
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 16:05:53 2025 +0800

            更新改动说明

        commit 83c8f7c6ec11449f470fe383af5196fcf135bf88
        Merge: 853630d8 6ebe050b
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 15:54:31 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 6ebe050b7e0695dfc82d2231eae8a3b5065164f4
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 15:54:26 2025 +0800

            小修复

        commit 853630d8a87fc0fb3beb42dbfc4aacb11b07ae27
        Merge: 5dc93d25 2520485a
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 15:48:10 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit 2520485af31c094c1a143e3ed6e8cdb673deb2c5
        Merge: be0c165a 646224b2
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 15:48:06 2025 +0800

            Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

        commit 5dc93d25d753530bf43030fba100dcaadb516079
        Merge: 73f17e1c be0c165a
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 15:47:20 2025 +0800

            Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

        commit be0c165ab70ff45cdf664214518f160ef48c1b96
        Author: CrimRecya <[email protected]>
        Date:   Tue Feb 18 15:47:16 2025 +0800

            修复变量名

        commit 73f17e…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@TaranDahl @ststl-s @Starkku