Skip to content

[Review Only] Trajectory disperse weapon #1887

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

Draft
wants to merge 192 commits into
base: develop
Choose a base branch
from
+5,282 −3,694
Draft

[Review Only] Trajectory disperse weapon #1887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
192 commits
Select commit Hold shift + click to select a range
9745f57
Core
CrimRecya Mar 20, 2025
8dc40e6
Fix parabola bounce
CrimRecya Mar 22, 2025
7f42d9b
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Mar 22, 2025
818b421
Fix tracing track
CrimRecya Mar 22, 2025
e46fe37
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Mar 22, 2025
61a265a
Fix missile inaccurate
CrimRecya Mar 24, 2025
df176e8
Fix bombard nolaunch
CrimRecya Mar 24, 2025
e83bd69
Fix typo
CrimRecya Mar 24, 2025
41ae3da
Synchronize actual trajectories
CrimRecya Mar 24, 2025
236c4e4
Simplify bombard code
CrimRecya Mar 25, 2025
d680c26
Fix empty ptr
CrimRecya Mar 25, 2025
ac38bf5
Optimize rotation
CrimRecya Mar 26, 2025
3b8e63d
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Mar 26, 2025
cbf5871
Restore `ProjectileRange`
CrimRecya Mar 29, 2025
cc80903
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Mar 29, 2025
9aa9e9b
Fix last impact count issue
CrimRecya Mar 31, 2025
a240cd9
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Mar 31, 2025
ff2c6a8
Fix doc
CrimRecya Mar 31, 2025
17be739
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Mar 31, 2025
eacec25
More hint in doc and fix `SubjectToBuildings` not working when speed …
CrimRecya Apr 2, 2025
3ecd1f0
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Apr 2, 2025
77c804b
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Apr 2, 2025
88bf533
Fix doc typo
CrimRecya Apr 2, 2025
e2ce775
Update doc
CrimRecya Apr 3, 2025
ff4960f
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Apr 3, 2025
8625b66
Fix target
CrimRecya Apr 4, 2025
b311ae5
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Apr 4, 2025
11c332a
Fix merge
CrimRecya Apr 4, 2025
b4045a6
Fix cherry-pick
CrimRecya Apr 4, 2025
9e50068
Fix typo
CrimRecya Apr 7, 2025
9dc2f79
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Apr 7, 2025
042221e
Doc
CrimRecya Apr 11, 2025
2682413
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Apr 11, 2025
c206838
Doc
CrimRecya Apr 11, 2025
473630a
Fix doc
CrimRecya Apr 11, 2025
6ba4833
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Apr 11, 2025
a324505
Merge hooks
CrimRecya Apr 11, 2025
1467736
重索敌所属限制
CrimRecya Apr 12, 2025
df8dc48
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Apr 12, 2025
83b030e
Fix `Trajectory.Missile.UniqueCurve`
CrimRecya Apr 13, 2025
272f070
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Apr 13, 2025
6dd6ebc
Doc
CrimRecya Apr 13, 2025
5e22588
New `Trajectory.Tracing.StableRotation`
CrimRecya Apr 15, 2025
522a7d4
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Apr 15, 2025
e36cad0
Remove useless
CrimRecya Apr 15, 2025
3e0b9c2
Fix `Trajectory.RecordSourceCoord` default value
CrimRecya Apr 17, 2025
ce71a73
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Apr 17, 2025
879d788
Fix an unexpected thing
CrimRecya Apr 17, 2025
20f1fe9
Doc
CrimRecya Apr 20, 2025
9d0bf4c
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Apr 20, 2025
588622d
Optimize `shared_ptr` loading
CrimRecya Apr 21, 2025
6ba561c
Doc
CrimRecya Apr 26, 2025
aaa7193
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Apr 26, 2025
db62132
Fix merge
CrimRecya Apr 26, 2025
fe7684c
Fix the issue that missile's gravity being unexpected limited by its …
CrimRecya Apr 29, 2025
b7bf39a
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Apr 29, 2025
43d3d55
简化代码
CrimRecya Apr 29, 2025
b54bf45
Fix a typo and optimize
CrimRecya Apr 29, 2025
8141c37
Simplify
CrimRecya Apr 29, 2025
50125db
Doc
CrimRecya Apr 29, 2025
726e91d
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya May 6, 2025
1f3d308
Doc
CrimRecya May 6, 2025
28a8361
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya May 6, 2025
353a4a3
Doc
CrimRecya May 6, 2025
15da02d
Make `Trajectory.Bombard.Height` affected by `Trajectory.Bombard.Fall…
CrimRecya May 8, 2025
1a262f8
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya May 8, 2025
e879f56
Fix missing function of `Inaccurate` and `Trajectory.OffsetCoord` wit…
CrimRecya May 11, 2025
0c724cd
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya May 11, 2025
8c63857
Fix doc and comment
CrimRecya May 12, 2025
df0cc9c
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya May 12, 2025
9e939f3
Core
CrimRecya May 12, 2025
f8177fb
Merge branch 'develop-SimulateCustomEBolt' into develop-TrajectorySystem
CrimRecya May 12, 2025
4f7164b
Fix unreasonable bullet actions when firer died in vanilla
CrimRecya May 12, 2025
cd7cdba
Fix doc
CrimRecya May 13, 2025
f11c677
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya May 13, 2025
3c02bb6
Some optimize for `Missile`
CrimRecya May 14, 2025
3b289de
Fix `Missile` with `Inaccurate`
CrimRecya May 14, 2025
89e875a
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya May 14, 2025
94f29b4
Fix `RecordSourceCoord` default value
CrimRecya May 15, 2025
dfb2df1
Fix load `shared_ptr` mistake
CrimRecya May 15, 2025
740085c
Enhance code readability
CrimRecya May 15, 2025
446774b
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya May 15, 2025
279e4f0
New `Trajectory.LeadTimeMaximum`
CrimRecya May 28, 2025
712cef1
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya May 28, 2025
aadfec8
Fix `Trajectory.Bombard.FallSpeed` reading issue
CrimRecya Jun 3, 2025
dc7b943
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Jun 3, 2025
f8a6b73
Comment
CrimRecya Jun 10, 2025
3d2a264
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Jun 10, 2025
a2bc770
Update YRpp
CrimRecya Jun 10, 2025
4f14443
Update YRpp
CrimRecya Jun 10, 2025
a325d49
New `Trajectory.Parabola.BounceOnTarget` and `Trajectory.Parabola.Bou…
CrimRecya Jun 11, 2025
2bbf84d
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Jun 11, 2025
9c03358
Optimize `ProximityImpact`
CrimRecya Jun 13, 2025
d4752fb
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Jun 13, 2025
df57f35
Optimize vector
CrimRecya Jun 26, 2025
fef0f26
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Jun 26, 2025
5d50c32
Optimize `abstract_cast`
CrimRecya Jun 26, 2025
21a5a5e
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Jul 5, 2025
e455bce
Update, optimize and fix known issue
CrimRecya Jul 5, 2025
b83b6a6
Fix a typo
CrimRecya Jul 5, 2025
2faf366
Update
CrimRecya Jul 7, 2025
0cff5b6
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Jul 7, 2025
8b0b7c9
Add comments
CrimRecya Jul 7, 2025
c616e49
Fix a bug with building distance
CrimRecya Jul 10, 2025
876f37f
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Jul 10, 2025
b23d09d
Fix a known issue and update doc
CrimRecya Jul 15, 2025
40bc491
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Jul 15, 2025
8a4825f
Update YRpp
CrimRecya Jul 15, 2025
dd9e39a
Update YRpp
CrimRecya Jul 15, 2025
d5fb90b
Fix firepower mult and update doc
CrimRecya Jul 15, 2025
a9dfd32
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Jul 15, 2025
7243d8b
Fix a repair bug and update doc
CrimRecya Jul 16, 2025
fc223ce
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Jul 16, 2025
cbe67dc
Rename key
CrimRecya Jul 16, 2025
b1d750d
Update doc
CrimRecya Jul 18, 2025
17058d4
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Jul 18, 2025
39f39b9
Update doc
CrimRecya Jul 20, 2025
df4e07a
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Jul 20, 2025
ec4d97b
Update doc
CrimRecya Jul 20, 2025
f03e35e
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Jul 20, 2025
f0945c5
Update doc
CrimRecya Jul 23, 2025
57446c2
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Jul 23, 2025
3767de0
Update doc
CrimRecya Jul 24, 2025
29b8cfc
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Jul 24, 2025
0d66c96
Some desirable AI suggestions
CrimRecya Jul 25, 2025
aded65a
Update doc
CrimRecya Jul 25, 2025
58cc14f
Update doc
CrimRecya Jul 26, 2025
0502181
Remove `the`
CrimRecya Jul 26, 2025
f82ebb1
Encapsulation
CrimRecya Jul 26, 2025
b17dcdf
More comments
CrimRecya Jul 26, 2025
57cef40
Readability
CrimRecya Jul 26, 2025
a7adbc2
Subfolder
CrimRecya Jul 26, 2025
0fa1c0d
Supplement
CrimRecya Jul 26, 2025
70bd1da
Auto
CrimRecya Jul 26, 2025
77fc4d5
More encapsulation
CrimRecya Jul 26, 2025
fc69353
Use pointer as key
CrimRecya Jul 26, 2025
901d3fb
Status
CrimRecya Jul 26, 2025
19707e9
Group
CrimRecya Jul 26, 2025
cb37df5
Enum and constexpr
CrimRecya Jul 26, 2025
f0a0e49
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Jul 26, 2025
56354b9
Constexpr sqrt
CrimRecya Jul 27, 2025
3799146
Add missing doc content
CrimRecya Jul 29, 2025
bca2fb6
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Jul 29, 2025
4c03c63
Fix a mistake
CrimRecya Aug 2, 2025
0748c72
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Aug 2, 2025
e890947
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Aug 4, 2025
edcd4c1
Fix merge
CrimRecya Aug 4, 2025
bd7e6da
Minor optimize
CrimRecya Aug 4, 2025
a430fcd
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Aug 7, 2025
fbe057d
Update firepower mult
CrimRecya Aug 7, 2025
a4a4cc9
Doc
CrimRecya Aug 14, 2025
80c620a
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Aug 14, 2025
49fa545
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Aug 15, 2025
9855ae9
Fix retarget
CrimRecya Aug 15, 2025
572e9cd
Code style thing
CrimRecya Aug 15, 2025
7f5617f
Merge remote-tracking branch 'upstream/develop' into develop-Trajecto…
CrimRecya Aug 15, 2025
d5fb137
Predict the trajectory of `CruiseAlongLevel`
CrimRecya Aug 17, 2025
dac02f2
Rename section keys
CrimRecya Aug 18, 2025
bbfd02e
Merge branch 'develop' into develop-TrajectorySystem
CrimRecya Aug 18, 2025
4959ca3
Remove useless
CrimRecya Aug 18, 2025
6f0de7f
Refactor engrave laser
CrimRecya Aug 19, 2025
e3f8f6b
Merge branch 'develop' into develop-TrajectorySystem
CrimRecya Aug 19, 2025
644ee7a
For Tracing to draw tracking laser
CrimRecya Aug 20, 2025
ae06e8e
Fix load crash
CrimRecya Aug 20, 2025
e273453
No move when the velocity is extremely low
CrimRecya Aug 21, 2025
9b59fd9
Merge branch 'develop' into develop-TrajectorySystem
CrimRecya Aug 28, 2025
1469bf7
Update for general purpose
CrimRecya Aug 31, 2025
632d414
Merge branch 'develop' into develop-TrajectorySystem
CrimRecya Aug 31, 2025
bca8ac4
Fix doc
CrimRecya Aug 31, 2025
13c22bc
FLH fix
CrimRecya Sep 2, 2025
c5ee9cb
Merge branch 'develop' into develop-TrajectorySystem
CrimRecya Sep 2, 2025
e05fd9e
Update doc
CrimRecya Sep 6, 2025
e48dcf9
Merge branch 'develop' into develop-TrajectorySystem
CrimRecya Sep 6, 2025
b701940
Merge branch 'develop' into develop-TrajectorySystem
CrimRecya Sep 9, 2025
7e17448
Add a check
CrimRecya Sep 10, 2025
119e75e
Merge branch 'develop' into develop-TrajectorySystem
CrimRecya Sep 10, 2025
18b7299
Merge branch 'develop' into develop-TrajectorySystem
CrimRecya Sep 12, 2025
2a2c378
Fix no target detonate coords
CrimRecya Sep 14, 2025
6d60320
Merge branch 'develop' into develop-TrajectorySystem
CrimRecya Sep 14, 2025
2e73dca
Add more comments
CrimRecya Sep 16, 2025
9f7adda
Merge branch 'develop' into develop-TrajectorySystem
CrimRecya Sep 16, 2025
2bf1e1c
Merge branch 'develop' into develop-TrajectorySystem
CrimRecya Sep 17, 2025
a1def19
Fix doc
CrimRecya Sep 21, 2025
d26c122
Merge branch 'develop' into develop-TrajectorySystem
CrimRecya Sep 21, 2025
50ca077
Fix some edge error and add more comments
CrimRecya Sep 21, 2025
4445c5e
Merge branch 'develop' into develop-TrajectorySystem
CrimRecya Oct 1, 2025
c364ad1
Update doc
CrimRecya Oct 4, 2025
08870db
Merge branch 'develop-TrajectorySystem' into TrajSys-DisperseWeapons
CrimRecya Oct 4, 2025
ab3eca5
Remove doc
CrimRecya Oct 4, 2025
e2942d2
Remove unrelated part
CrimRecya Oct 4, 2025
438a0a9
Fix split
CrimRecya Oct 4, 2025
97f5a82
Core commit for review
CrimRecya Oct 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions Phobos.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,13 @@
<ClCompile Include="src\Ext\Anim\Hooks.cpp" />
<ClCompile Include="src\Ext\Anim\Hooks.AnimCreateUnit.cpp" />
<ClCompile Include="src\Ext\Bullet\Hooks.DetonateLogics.cpp" />
<ClCompile Include="src\Ext\Bullet\Trajectories\BombardTrajectory.cpp" />
<ClCompile Include="src\Ext\Bullet\AdditionalWeapons.cpp" />
<ClCompile Include="src\Ext\Bullet\AdditionalWarheads.cpp" />
<ClCompile Include="src\Ext\Bullet\Trajectories\PhobosTrajectory.cpp" />
<ClCompile Include="src\Ext\Bullet\Trajectories\StraightTrajectory.cpp" />
<ClCompile Include="src\Ext\Bullet\Trajectories\ParabolaTrajectory.cpp" />
<ClCompile Include="src\Ext\Bullet\Trajectories\PhobosActualTrajectory.cpp" />
<ClCompile Include="src\Ext\Bullet\Trajectories\ActualTrajectories\StraightTrajectory.cpp" />
<ClCompile Include="src\Ext\Bullet\Trajectories\ActualTrajectories\BombardTrajectory.cpp" />
<ClCompile Include="src\Ext\Bullet\Trajectories\ActualTrajectories\ParabolaTrajectory.cpp" />
<ClCompile Include="src\Ext\CaptureManager\Hooks.cpp" />
<ClCompile Include="src\Ext\CaptureManager\Body.cpp" />
<ClCompile Include="src\Ext\OverlayType\Body.cpp" />
Expand Down Expand Up @@ -241,10 +244,11 @@
<ClInclude Include="src\Commands\ToggleDesignatorRange.h" />
<ClInclude Include="src\Commands\ToggleDigitalDisplay.h" />
<ClInclude Include="src\Commands\SaveVariablesToFile.h" />
<ClInclude Include="src\Ext\Bullet\Trajectories\BombardTrajectory.h" />
<ClInclude Include="src\Ext\Bullet\Trajectories\PhobosTrajectory.h" />
<ClInclude Include="src\Ext\Bullet\Trajectories\StraightTrajectory.h" />
<ClInclude Include="src\Ext\Bullet\Trajectories\ParabolaTrajectory.h" />
<ClInclude Include="src\Ext\Bullet\Trajectories\PhobosActualTrajectory.h" />
<ClInclude Include="src\Ext\Bullet\Trajectories\ActualTrajectories\StraightTrajectory.h" />
<ClInclude Include="src\Ext\Bullet\Trajectories\ActualTrajectories\BombardTrajectory.h" />
<ClInclude Include="src\Ext\Bullet\Trajectories\ActualTrajectories\ParabolaTrajectory.h" />
<ClInclude Include="src\Ext\OverlayType\Body.h" />
<ClInclude Include="src\Ext\ParticleType\Body.h" />
<ClInclude Include="src\Ext\Sidebar\Body.h" />
Expand Down
Loading