Skip to content

Commit f66ce77

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into random-anims
# Conflicts: # CREDITS.md # docs/New-or-Enhanced-Logics.md # docs/Whats-New.md # docs/locale/zh_CN/LC_MESSAGES/New-or-Enhanced-Logics.po # src/Ext/Anim/Hooks.AnimCreateUnit.cpp # src/Ext/AnimType/Body.h # src/Ext/Techno/Body.Update.cpp # src/Ext/Techno/Hooks.Misc.cpp # src/Ext/Techno/Hooks.cpp # src/Ext/TechnoType/Body.cpp # src/Ext/TechnoType/Body.h
2 parents ced318e + c722b45 commit f66ce77

File tree

166 files changed

+13625
-6018
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+13625
-6018
lines changed

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ env:
2020

2121
jobs:
2222
build:
23-
runs-on: windows-2019
23+
runs-on: windows-latest
2424

2525
steps:
2626
- uses: actions/checkout@v4

.github/workflows/pr-nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616

1717
jobs:
1818
build:
19-
runs-on: windows-2019
19+
runs-on: windows-latest
2020

2121
steps:
2222
- uses: actions/checkout@v4

.vsconfig

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"version": "1.0",
3-
"components": [
4-
"Microsoft.VisualStudio.Component.CoreEditor",
5-
"Microsoft.VisualStudio.Workload.CoreEditor",
6-
"Microsoft.VisualStudio.Component.VC.CoreIde",
7-
"Microsoft.VisualStudio.Component.Windows10SDK.20348",
8-
"Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64",
9-
"Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL"
10-
]
3+
"components": [
4+
"Microsoft.VisualStudio.Component.CoreEditor",
5+
"Microsoft.VisualStudio.Workload.CoreEditor",
6+
"Microsoft.VisualStudio.Component.VC.CoreIde",
7+
"Microsoft.VisualStudio.Component.Windows10SDK.20348",
8+
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
9+
"Microsoft.VisualStudio.Component.VC.ATL"
10+
]
1111
}

CREDITS.md

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ This page lists all the individual contributions to the project by their author.
4848
- Ability to disable shadow for debris & meteor animations
4949
- Voxel light source position customization
5050
- `UseFixedVoxelLighting`
51+
- Warhead activation target health thresholds
5152
- **Uranusian (Thrifinesma)**:
5253
- Mind Control enhancement
5354
- Custom warhead splash list
@@ -68,6 +69,8 @@ This page lists all the individual contributions to the project by their author.
6869
- Wall-Gate links
6970
- Ability for deployed infantry to use both weapons
7071
- Observer PCX loading screen
72+
- Original `Arcing` elevation inaccuracy fix
73+
- Display banner improvement
7174
- Official CN docs for Build#29 and previous versions
7275
- **secsome (SEC-SOME)**:
7376
- Debug info dump hotkey
@@ -95,6 +98,8 @@ This page lists all the individual contributions to the project by their author.
9598
- Vanilla map preview reading bugfix
9699
- Customizable tooltip background
97100
- Parts of Ares calling code
101+
- Original `Arcing` elevation inaccuracy fix
102+
- Dehardcode 255 limit of `OverlayType`
98103
- **Otamaa (Fahroni, BoredEXE)**:
99104
- Help with CellSpread
100105
- Ported and fixed custom RadType code
@@ -118,6 +123,9 @@ This page lists all the individual contributions to the project by their author.
118123
- Help with custom locomotors
119124
- Extension class optimization
120125
- Overload characteristic dehardcoded
126+
- Customizable garrison and bunker properties
127+
- Disable `DamageSound` for buildings
128+
- Power plant damage factor
121129
- **FS-21**:
122130
- Dump Object Info enhancements
123131
- `Powered.KillSpawns`
@@ -138,6 +146,7 @@ This page lists all the individual contributions to the project by their author.
138146
- Map Events 604 & 605 for checking if a specific Techno enters in a cell
139147
- Warhead that can not kill
140148
- `Pips.HideIfNoStrength` and `SelfHealing.EnabledBy` additions for shields
149+
- Warhead activation target health thresholds enhancements
141150
- **Starkku**:
142151
- Misc. minor bugfixes & improvements
143152
- AI script actions:
@@ -217,7 +226,7 @@ This page lists all the individual contributions to the project by their author.
217226
- `PipScale` pip size & ammo pip frame customization
218227
- Extension class optimization
219228
- Additional sync logging
220-
- `Arcing` elevation inaccuracy fix
229+
- Original `Arcing` elevation inaccuracy fix
221230
- `EMPulseCannon` projectile gravity fix
222231
- Custom palette support for wall overlays
223232
- Warhead animation improvements
@@ -260,6 +269,7 @@ This page lists all the individual contributions to the project by their author.
260269
- Vehicles keeping target on move command
261270
- `IsSonic` wave drawing crash fix
262271
- Customizable electric bolt duration and electric bolt-related fixes
272+
- Airstrike flare visual customizations & fixes
263273
- **Morton (MortonPL)**:
264274
- `XDrawOffset` for animations
265275
- Shield passthrough & absorption
@@ -279,6 +289,7 @@ This page lists all the individual contributions to the project by their author.
279289
- `601 House owns TechnoType` and `602 House doesn't own TechnoType` trigger events
280290
- Voxel light source position customization
281291
- Extending `Power` to all TechnoTypes
292+
- Display banner by triggers
282293
- Help with docs
283294
- **ChrisLv_CN** (work relicensed under [following permission](https://github.com/Phobos-developers/Phobos/blob/develop/images/ChrisLv-relicense.png)):
284295
- General assistance
@@ -305,7 +316,7 @@ This page lists all the individual contributions to the project by their author.
305316
- Redeployable MCV in campaigns
306317
- Allow buildings with `UndeploysInto` to be sold if `Unsellable=no` even if not conyard
307318
- Trigger actions that allow/forbid MCV to redeploy in game
308-
- `AlternateFLH` of vehicles in `OpenTopped` transport.
319+
- `AlternateFLH` of vehicles in `OpenTopped` transport
309320
- Slaves' house customization when owner is killed
310321
- Trigger Action spawned team IFV/OpenTopped logic fix
311322
- Singleplayer Campaign AI's base node/SW-delivered/trigger action `125 Create Building At...`'s auto-repairability dehardcode
@@ -355,6 +366,13 @@ This page lists all the individual contributions to the project by their author.
355366
- `Edit/Clear Hate-Value` Trigger Action
356367
- `Set Force Enemy` Trigger Action
357368
- Fix the issue where computer players did not search for new enemies after defeating them or forming alliances with them
369+
- Customize the damage taken when falling from a bridge
370+
- `600 The shield of the attached object is broken` bug fix for the triggered event
371+
- Fix an issue where a portion of Ares's trigger event 75/77 was determined unsuccessfully
372+
- Second weapon with `ElectricAssault=yes` will not unconditionally attack your building with `Overpowerable=yes`
373+
- Fix the issue where some units crashed after the deployment transformation
374+
- Turretless vehicles with `Voxel=no` support use `FireUp` like infantry
375+
- Infantry support `IsGattling=yes`
358376
- **NetsuNegi**:
359377
- Forbidding parallel AI queues by type
360378
- Jumpjet crash speed fix when crashing onto building
@@ -388,6 +406,16 @@ This page lists all the individual contributions to the project by their author.
388406
- Fix the bug that `AllowAirstrike=no` cannot completely prevent air strikes from being launched against it
389407
- Fix the bug that infantry ignored `Passengers` and `SizeLimit` when entering buildings
390408
- Tiberium eater logic
409+
- Fix the bug that ships can travel on elevated bridges
410+
- Original `Arcing` elevation inaccuracy fix
411+
- Fix the bug that uncontrolled scatter when elite techno attacked by aircraft or some unit try crush it
412+
- Exclusive SuperWeapon Sidebar
413+
- Fix the bug that AlphaImage remained after unit entered tunnel
414+
- Weapon target filtering by health percentage
415+
- Fix the bug that `DamageSelf` and `AllowDamageOnSelf` are ineffective on airforce
416+
- Customize limit when engineer repair a building
417+
- Fix the bug that damaged particle dont disappear after building has repaired by engineer
418+
- Display banner improvement
391419
- **Apollo** - Translucent SHP drawing patches
392420
- **ststl**:
393421
- Customizable `ShowTimer` priority of superweapons
@@ -396,7 +424,9 @@ This page lists all the individual contributions to the project by their author.
396424
- Unlimited `AlternateFLH` entries
397425
- Build limit group
398426
- Customizing whether passengers are kicked out when an aircraft fires
427+
- Display banner by triggers
399428
- New SuperWeapon Type template
429+
- Fix the issue where some units crashed after the deployment transformation
400430
- **TwinkleStar**:
401431
- Custom slaves free sound
402432
- Jumpjet crash rotation control
@@ -414,6 +444,7 @@ This page lists all the individual contributions to the project by their author.
414444
- Flashing Technos on selecting
415445
- Promotion animation
416446
- Damaged unit image changes
447+
- `VoiceDeploy` through hot-key/command bar fix
417448
- **ZivDero**:
418449
- Re-enable the Veinhole Monster and Weeds from TS
419450
- Recreate the weed-charging of SWs like the TS Chemical Missile
@@ -461,10 +492,14 @@ This page lists all the individual contributions to the project by their author.
461492
- Aggressive attack move mission
462493
- Amphibious access vehicle
463494
- Fix an issue that spawned `Strafe` aircraft on aircraft carriers may not be able to return normally if aircraft carriers moved a short distance when the aircraft is landing
495+
- Exclusive SuperWeapon Sidebar
496+
- Fix an issue that the widespread damage caused by detonation on the bridge/ground cannot affect objects on the ground/bridge who are in the opposite case
497+
- Several new Infotypes, no display in specific status and a new single frame display method
498+
- Customizable spawn delay of `VoxelAnim`'s `TrailerAnim` and fix its incorrect position
464499
- **Ollerus**:
465500
- Build limit group enhancement
466501
- Customizable rocker amplitude
467-
- Allowed `AuxBuilding` and Ares' `SW.Aux/NegBuildings` to count building upgrades
502+
- Allow `AuxBuilding` and Ares' `SW.Aux/NegBuildings` to count building upgrades
468503
- Type select for buildings (doc)
469504
- Enhanced Bombard trajectory
470505
- Shield armor inheritance customization
@@ -474,6 +509,10 @@ This page lists all the individual contributions to the project by their author.
474509
- Forcing specific weapon by range
475510
- Passenger-based insignias
476511
- Use `InsigniaType` to set the properties of insignia in a batch
512+
- Allow player's self-healing effects to be benefited by allied or `PlayerControl=true` houses
513+
- Power plant damage factor
514+
- Allow faking digital display for `InfoType=Health` at disguise
515+
- Display banner improvement and doc
477516
- Randomized anims for several behaviors
478517
- **NaotoYuuki** - Vertical & meteor trajectory projectile prototypes
479518
- **handama** - AI script action to `16005 Jump Back To Previous Script`
@@ -505,6 +544,9 @@ This page lists all the individual contributions to the project by their author.
505544
- RadarInvisible for non-enemy house
506545
- Allow miners do area guard
507546
- Make harvesters do addtional scan after unload
547+
- Customize the scatter caused by aircraft attack mission
548+
- Customize whether `Crater=yes` animation would destroy tiberium
549+
- Targeting limitation for berzerk technos
508550
- **tyuah8**:
509551
- Drive/Jumpjet/Ship/Teleport locomotor did not power on when it is un-piggybacked bugfix
510552
- Destroyed unit leaves sensors bugfix

Phobos.vcxproj

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,18 @@
1818
</ProjectConfiguration>
1919
</ItemGroup>
2020
<ItemGroup>
21+
<ClCompile Include="src\Ext\Infantry\Hooks.Firing.cpp" />
22+
<ClCompile Include="src\Ext\Unit\Hooks.Firing.cpp" />
23+
<ClCompile Include="src\New\Type\Affiliated\CreateUnitTypeClass.cpp" />
2124
<ClCompile Include="src\Blowfish\blowfish.cpp" />
2225
<ClCompile Include="src\Blowfish\Hooks.Blowfish.cpp" />
2326
<ClCompile Include="src\Ext\Cell\Body.cpp" />
2427
<ClCompile Include="src\Ext\House\Hooks.ForceEnemy.cpp" />
28+
<ClCompile Include="src\Commands\ToggleSWSidebar.cpp" />
29+
<ClCompile Include="src\Ext\Sidebar\SWSidebar\SWColumnClass.cpp" />
30+
<ClCompile Include="src\Ext\Sidebar\SWSidebar\SWSidebarClass.cpp" />
31+
<ClCompile Include="src\Ext\Sidebar\SWSidebar\SWButtonClass.cpp" />
32+
<ClCompile Include="src\Ext\Sidebar\SWSidebar\ToggleSWButtonClass.cpp" />
2533
<ClCompile Include="src\Ext\TechnoType\Hooks.MatrixOp.cpp" />
2634
<ClCompile Include="src\Ext\Techno\Hooks.Airstrike.cpp" />
2735
<ClCompile Include="src\Ext\Unit\Hooks.Harvester.cpp" />
@@ -81,8 +89,10 @@
8189
<ClCompile Include="src\Misc\Hooks.VeinholeMonster.cpp" />
8290
<ClCompile Include="src\Misc\PhobosToolTip.cpp" />
8391
<ClCompile Include="src\Misc\TextInput.cpp" />
92+
<ClCompile Include="src\New\Entity\BannerClass.cpp" />
8493
<ClCompile Include="src\New\Entity\ShieldClass.cpp" />
8594
<ClCompile Include="src\Misc\RetryDialog.cpp" />
95+
<ClCompile Include="src\New\Type\BannerTypeClass.cpp" />
8696
<ClCompile Include="src\New\Type\Affiliated\DroppodTypeClass.cpp" />
8797
<ClCompile Include="src\New\Type\DigitalDisplayTypeClass.cpp" />
8898
<ClCompile Include="src\New\Type\InsigniaTypeClass.cpp" />
@@ -176,6 +186,7 @@
176186
<ClCompile Include="src\Misc\Hooks.Timers.cpp" />
177187
<ClCompile Include="src\Misc\Hooks.INIInheritance.cpp" />
178188
<ClCompile Include="src\Misc\Hooks.SkirmishColors.cpp" />
189+
<ClCompile Include="src\Misc\Hooks.Overlay.cpp" />
179190
<ClCompile Include="src\New\Type\Affiliated\TypeConvertGroup.cpp" />
180191
<ClCompile Include="src\Ext\BuildingType\Hooks.Upgrade.cpp" />
181192
<ClCompile Include="src\Phobos.COM.cpp" />
@@ -195,8 +206,15 @@
195206
<ClCompile Include="YRpp\StaticInits.cpp" />
196207
</ItemGroup>
197208
<ItemGroup>
209+
<ClInclude Include="src\New\Type\Affiliated\CreateUnitTypeClass.h" />
198210
<ClInclude Include="src\Blowfish\blowfish.h" />
199211
<ClInclude Include="src\Ext\Cell\Body.h" />
212+
<ClInclude Include="src\Commands\FireTacticalSW.h" />
213+
<ClInclude Include="src\Commands\ToggleSWSidebar.h" />
214+
<ClInclude Include="src\Ext\Sidebar\SWSidebar\SWColumnClass.h" />
215+
<ClInclude Include="src\Ext\Sidebar\SWSidebar\SWSidebarClass.h" />
216+
<ClInclude Include="src\Ext\Sidebar\SWSidebar\SWButtonClass.h" />
217+
<ClInclude Include="src\Ext\Sidebar\SWSidebar\ToggleSWButtonClass.h" />
200218
<ClInclude Include="src\New\Entity\AttachEffectClass.h" />
201219
<ClInclude Include="src\New\Type\Affiliated\TiberiumEaterTypeClass.h" />
202220
<ClInclude Include="src\New\Type\AttachEffectTypeClass.h" />
@@ -230,6 +248,8 @@
230248
<ClInclude Include="src\Misc\FlyingStrings.h" />
231249
<ClInclude Include="src\Misc\PhobosToolTip.h" />
232250
<ClInclude Include="src\Misc\SyncLogging.h" />
251+
<ClInclude Include="src\New\Entity\BannerClass.h" />
252+
<ClInclude Include="src\New\Type\BannerTypeClass.h" />
233253
<ClInclude Include="src\New\Type\Affiliated\TypeConvertGroup.h" />
234254
<ClInclude Include="src\New\Type\Affiliated\DroppodTypeClass.h" />
235255
<ClInclude Include="src\New\Type\DigitalDisplayTypeClass.h" />
@@ -308,21 +328,21 @@
308328
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
309329
<ConfigurationType>DynamicLibrary</ConfigurationType>
310330
<UseDebugLibraries>false</UseDebugLibraries>
311-
<PlatformToolset>v142</PlatformToolset>
331+
<PlatformToolset>v143</PlatformToolset>
312332
<CharacterSet>NotSet</CharacterSet>
313333
<XPDeprecationWarning>false</XPDeprecationWarning>
314334
</PropertyGroup>
315335
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DevBuild|Win32'" Label="Configuration">
316336
<ConfigurationType>DynamicLibrary</ConfigurationType>
317337
<UseDebugLibraries>false</UseDebugLibraries>
318-
<PlatformToolset>v142</PlatformToolset>
338+
<PlatformToolset>v143</PlatformToolset>
319339
<CharacterSet>NotSet</CharacterSet>
320340
<XPDeprecationWarning>false</XPDeprecationWarning>
321341
</PropertyGroup>
322342
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
323343
<ConfigurationType>DynamicLibrary</ConfigurationType>
324344
<UseDebugLibraries>false</UseDebugLibraries>
325-
<PlatformToolset>v142</PlatformToolset>
345+
<PlatformToolset>v143</PlatformToolset>
326346
<CharacterSet>NotSet</CharacterSet>
327347
<XPDeprecationWarning>false</XPDeprecationWarning>
328348
</PropertyGroup>

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ UIDescription=<none> ; CSF entry key
8282
Building manually
8383
-----------------
8484

85-
0. Install **Visual Studio** (2022 is recommended, 2019 is minimum) with the dependencies listed in `.vsconfig` (it will prompt you to install missing dependences when you open the project, or you can run VS installer and import the config). If you prefer to use **Visual Studio Code** you may install **VS Build Tools** with the dependencies from `.vsconfig` instead. Not using a code editor or IDE and building via **command line scripts** included with the project is also an option.
85+
0. Install **Visual Studio** (2022 is minimum) with the dependencies listed in `.vsconfig` (it will prompt you to install missing dependences when you open the project, or you can run VS installer and import the config). If you prefer to use **Visual Studio Code** you may install **VS Build Tools** with the dependencies from `.vsconfig` instead. Not using a code editor or IDE and building via **command line scripts** included with the project is also an option.
8686
1. Clone this repo recursively via your favorite git client (that will also clone YRpp).
8787
2. To build the extension:
8888
- in Visual Studio: open the solution file in VS and build it (`Debug` build config is recommended);

0 commit comments

Comments
 (0)