Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into develop-ManualRe…
Browse files Browse the repository at this point in the history
…load
  • Loading branch information
CrimRecya committed Feb 27, 2025
2 parents e1ec1dd + 78fea5b commit b247b0e
Show file tree
Hide file tree
Showing 91 changed files with 21,709 additions and 5,106 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,6 @@ build
cmake-*
out
.idea

# Python virtual environment for docs
.venv/
4 changes: 2 additions & 2 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ version: 2

# Set the version of Python and other tools you might need
build:
os: ubuntu-22.04
os: ubuntu-24.04
tools:
python: "3.8"
python: "3.11"

# Build documentation in the docs/ directory with Sphinx
sphinx:
Expand Down
37 changes: 33 additions & 4 deletions CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,8 @@ This page lists all the individual contributions to the project by their author.
- `Scorch` / `Flamer` fire animation customization
- EM Pulse cannon logic improvements
- `<Player @ X>` as owner for pre-placed objects
- Custom exit cell for infantry factory
- Vehicles keeping target on move command
- **Morton (MortonPL)**:
- `XDrawOffset` for animations
- Shield passthrough & absorption
Expand All @@ -269,8 +271,9 @@ This page lists all the individual contributions to the project by their author.
- Show designator & inhibitor range
- Dump variables to file on scenario end / hotkey
- "House owns TechnoType" and "House doesn't own TechnoType" trigger events
- Help with docs
- Voxel light source position customization
- Extending `Power` to all TechnoTypes
- Help with docs
- **ChrisLv_CN** (work relicensed under [following permission](https://github.com/Phobos-developers/Phobos/blob/develop/images/ChrisLv-relicense.png)):
- General assistance
- Interceptor logic prototype
Expand Down Expand Up @@ -327,6 +330,7 @@ This page lists all the individual contributions to the project by their author.
- Turret/Barrel/NoSpawnAlt/Multi-section voxel shadow, dynamic voxel shadow
- Skip units' turret rotation and jumpjets' wobbling under EMP
- Droppod properties dehardcode
- `Deployer = yes->no` infantry conversion sequence fix
- Waypoint entering building together with engineer/agent bug fix
- Skippable game save on scenario start
- `InfDeath=9` versus jumpjet infantry 0 damage fix
Expand All @@ -346,6 +350,7 @@ This page lists all the individual contributions to the project by their author.
- Disguised units not using the correct palette if target has custom palette bugfix
- Tunnel/Walk/Mech locomotor being stuck when moving too fast bugfix
- Assign Super Weapon cameo to any sidebar tab
- Fix impassable invisible barrier created by chronosphere on uncrushable unit.
- **Apollo** - Translucent SHP drawing patches
- **ststl**
- Customizable ShowTimer priority of superweapons
Expand All @@ -361,6 +366,7 @@ This page lists all the individual contributions to the project by their author.
- `TurretOffset` support for SHP vehicles
- Customizable rocker amplitude
- Customizable wake anim
- Initial effort on optimization for crates' random distribution
- **Fryone**
- Customizable ElectricBolt Arcs
- Sound entry on unit's creation
Expand All @@ -377,25 +383,47 @@ This page lists all the individual contributions to the project by their author.
- Fix `Stop` command not working so well in some cases
- Fix aircraft `MovementZone` and `SpeedType` inconsistencies
- Use 2D distance instead of 3D to check whether in air team members have arrived destination
- Enhanced Straight trajectory
- Enable Building Production Queue
- Fix for sidebar not updating queued unit numbers when on hold
- New Parabola trajectory
- Enhanced Bombard trajectory
- No turret unit turn to the target
- Damage multiplier for different houses
- Manually empty and reload ammo
- **Ollerus**
- Build limit group enhancement
- Customizable rocker amplitude
- Allowed `AuxBuilding` and Ares' `SW.Aux/NegBuildings` to count building upgrades
- Type select for buildings (doc)
- Enhanced Bombard trajectory
- **NaotoYuuki** - Vertical & meteor trajectory projectile prototypes
- **handama** - AI script action to jump back to previous script
- **TaranDahl (航味麻酱)**
- Skirmish AI "sell all buildings and set all technos to hunt" behavior dehardcode
- Skirmish AI "gather when MCV deploy" behavior dehardcode
- Global value of `RepairBaseNodes`
- **tyuah8** - Drive/Jumpjet/Ship/Teleport locomotor did not power on when it is un-piggybacked bugfix
- Skip anim delay for burst fire
- Type select for buildings (code)
- Raise alert when technos are taking damage
- Toggle waypoint for building
- Parasite returning bug fix
- Bunkerable checks dehardcode
- Prevent the units with locomotors that cause problems from entering the tank bunker
- No turret unit turn to the target
- **tyuah8**
- Drive/Jumpjet/Ship/Teleport locomotor did not power on when it is un-piggybacked bugfix
- Destroyed unit leaves sensors bugfix
- **Aephiex** - initial fix for Ares academy not working on the initial payloads of vehicles built from a war factory
- **Multfinite** - Allow to toggle main exception handler via command line argument `-ExceptionHandler=boolean`
- **Ares developers**
- YRpp and Syringe which are used, save/load, project foundation and generally useful code from Ares
- unfinished RadTypes code
- prototype deployer fixes
- Superweapon launch site & availability code
- AI vehicle production update code
- parts of TechnoType conversion placeholder code
- **ststl, FlyStar, Saigyouji, JunJacobYoung** - Digital Display
- **ststl, FlyStar, NaotoYuuki, Saigyouji, JunJacobYoung** - Digital Display
- **SukaHati (Erzoid)** - Minimum interceptor guard range
- **E1 Elite** - TileSet 255 and above bridge repair fix
- **AutoGavy** - interceptor logic, Warhead critical hit logic
Expand All @@ -413,7 +441,8 @@ This page lists all the individual contributions to the project by their author.
- **thomassneddon** - general assistance, knowledge about voxel lighting model
- **Xkein** - general assistance, YRpp edits
- **mevitar** - honorary shield tester *triple* award
- **Phobos CN Tester Group (Reedom, Mantis, Swim Wing, Takitoru, Examon, AKB, Pusheen, ZQ, Claptrap, BunkerGeneral, Big J, Skywalker, ChickEmperor, Shifty, Mikain, Tobiichi Origami, Feiron, W_S502, Ailink, AbrahamMikhail, Tide, Fnfalsc, Yumeri_Rei, Nacho, Zhuzi, Ika_Aru)** - extensive and thorough testing
- **Mentalmeisters Team (Speeder, Ollerus, mevitar, Reedom, Takitoru, Terumasa, Zhelin)** - extensive and thorough testing
- **Phobos CN Tester Group (Mantis, Swim Wing, Examon, AKB, Pusheen, ZQ, Claptrap, BunkerGeneral, Big J, Skywalker, ChickEmperor, Shifty, Mikain, Tobiichi Origami, Feiron, W_S502, Ailink, AbrahamMikhail, Tide, Fnfalsc, Yumeri_Rei, Nacho, Zhuzi, Ika_Aru, EUSiegfried, HanpiBaozi, Nxusbot, TientsinWind)** - extensive and thorough testing
- **Damfoos** - extensive and thorough testing
- **Dmitry Volkov** - extensive and thorough testing
- **Rise of the East community** - extensive playtesting of in-dev features
2 changes: 2 additions & 0 deletions Phobos.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
<ClCompile Include="src\Ext\Bullet\Trajectories\BombardTrajectory.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\CaptureManager\Hooks.cpp" />
<ClCompile Include="src\Ext\CaptureManager\Body.cpp" />
<ClCompile Include="src\Ext\Event\Body.cpp" />
Expand Down Expand Up @@ -202,6 +203,7 @@
<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\Event\Body.h" />
<ClInclude Include="src\Ext\OverlayType\Body.h" />
<ClInclude Include="src\Ext\ParticleType\Body.h" />
Expand Down
17 changes: 13 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,18 @@
> The project is currently not maintained actively enough and thus we are looking for active maintainers at the moment. Please message us [in Discord channel](https://discord.gg/sZeMzz6qVg) (or PM Kerbiter directly).
# Phobos

...is a community engine extension project providing a set of new features and fixes for Yuri's Revenge based on [modified YRpp](https://github.com/Metadorius/YRpp) and [Syringe](https://github.com/Ares-Developers/Syringe) to allow injecting code. It's meant to accompany [Ares](https://github.com/Ares-Developers/Ares) rather than replace it, thus it won't introduce incompatibilities.

While Phobos is independent of Ares and does NOT require Ares specifically to function, Phobos complements some of the features found in Ares and vice versa.

You can discuss the project at a dedicated [channel on C&C Mod Haven](https://discord.gg/sZeMzz6qVg).
Community
---------

As the project is international and English is currently studied the most commonly as a second language, it's the main project language. We do not limit the creation of language-specific community groups though, because we understand that many may not know English as well as their native language and/or may have trouble accessing Discord.

- **[🌐 International Discord channel on C&C Mod Haven](https://discord.gg/sZeMzz6qVg)**
- [🇨🇳 Chinese QQ Phobos group](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=f_h7TZoVX_8--ZedVFBMmjRrLBIzjMKJ&authKey=QfNyW4DZUFqL3ZKzGL5PgLUWTnISj0myWn4WGtPPQmi3F%2FP3vfnuBd3YjLFk%2BU94&noverify=0&group_code=630590659)(630590659)

Downloads
---------
Expand Down Expand Up @@ -47,8 +54,10 @@ Documentation
-------------

- [Official docs](https://phobos.readthedocs.io) (also available in [Chinese](https://phobos.readthedocs.io/zh_CN/latest))
- [Community Chinese docs](https://docs.qq.com/doc/p/dc3da1ce39a6e787b6e133f7d33d6aebef581cb4)
- Because the Chinese translation of the official docs is currently underdeveloped, at the time it is recommended to use the community docs for Chinese users.

You can switch between versions (displays latest develop nightly version by default) in the bottom left corner, as well as download a PDF version.
You can switch between versions (displays latest develop nightly version by default) in the bottom right corner, as well as download a PDF version.

The documentation is split by a few major categories, each represented with a page on the sidebar. Each page has its contents grouped into multiple subcategories, be it buildings, technotypes, infantries, superweapons or something else.

Expand Down Expand Up @@ -84,9 +93,9 @@ Credits

### Developers
- **Belonit (Gluk-v48)** - project author
- **Kerbiter (Metadorius)** - project co-author, BDFL, maintainer (semi-active for the time being; [Patreon](https://www.patreon.com/kerbiter), PM me for PayPal to avoid fees)
- **Kerbiter (Metadorius)** - project co-author, BDFL, maintainer ([Patreon](https://www.patreon.com/kerbiter), PM me for PayPal to avoid fees)
- **Starkku** - co-maintainer, developer ([Patreon](https://www.patreon.com/Starkku))
- **Uranusian (Thrifinesma)** - retired developer, CN community ambassador
- **Uranusian (Thrifinesma)** - developer, CN community ambassador
- **secsome (SEC-SOME)** - developer
- **Otamaa (Fahroni, BoredEXE)** - developer ([PayPal](https://paypal.me/GeneralOtama))
- **FS-21** - developer
Expand Down
2 changes: 1 addition & 1 deletion YRpp
Loading

0 comments on commit b247b0e

Please sign in to comment.