Skip to content

Commit bb904ce

Browse files
committed
Merge branch 'develop' into BalloonHoverPathingFix
2 parents 016a0bc + 2592d1d commit bb904ce

File tree

133 files changed

+9971
-5100
lines changed

Some content is hidden

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

133 files changed

+9971
-5100
lines changed

CREDITS.md

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ This page lists all the individual contributions to the project by their author.
6868
- Wall-Gate links
6969
- Ability for deployed infantry to use both weapons
7070
- Observer PCX loading screen
71+
- Original `Arcing` elevation inaccuracy fix
7172
- Official CN docs for Build#29 and previous versions
7273
- **secsome (SEC-SOME)**:
7374
- Debug info dump hotkey
@@ -95,6 +96,8 @@ This page lists all the individual contributions to the project by their author.
9596
- Vanilla map preview reading bugfix
9697
- Customizable tooltip background
9798
- Parts of Ares calling code
99+
- Original `Arcing` elevation inaccuracy fix
100+
- Dehardcode 255 limit of `OverlayType`
98101
- **Otamaa (Fahroni, BoredEXE)**:
99102
- Help with CellSpread
100103
- Ported and fixed custom RadType code
@@ -118,6 +121,9 @@ This page lists all the individual contributions to the project by their author.
118121
- Help with custom locomotors
119122
- Extension class optimization
120123
- Overload characteristic dehardcoded
124+
- Customizable garrison and bunker properties
125+
- Disable `DamageSound` for buildings
126+
- Power plant damage factor
121127
- **FS-21**:
122128
- Dump Object Info enhancements
123129
- `Powered.KillSpawns`
@@ -217,7 +223,7 @@ This page lists all the individual contributions to the project by their author.
217223
- `PipScale` pip size & ammo pip frame customization
218224
- Extension class optimization
219225
- Additional sync logging
220-
- `Arcing` elevation inaccuracy fix
226+
- Original `Arcing` elevation inaccuracy fix
221227
- `EMPulseCannon` projectile gravity fix
222228
- Custom palette support for wall overlays
223229
- Warhead animation improvements
@@ -260,6 +266,8 @@ This page lists all the individual contributions to the project by their author.
260266
- Vehicles keeping target on move command
261267
- `IsSonic` wave drawing crash fix
262268
- Customizable electric bolt duration and electric bolt-related fixes
269+
- Airstrike flare visual customizations
270+
- Fix an issue where airstrike flare line drawn to target at lower elevation would clip
263271
- **Morton (MortonPL)**:
264272
- `XDrawOffset` for animations
265273
- Shield passthrough & absorption
@@ -305,7 +313,7 @@ This page lists all the individual contributions to the project by their author.
305313
- Redeployable MCV in campaigns
306314
- Allow buildings with `UndeploysInto` to be sold if `Unsellable=no` even if not conyard
307315
- Trigger actions that allow/forbid MCV to redeploy in game
308-
- `AlternateFLH` of vehicles in `OpenTopped` transport.
316+
- `AlternateFLH` of vehicles in `OpenTopped` transport
309317
- Slaves' house customization when owner is killed
310318
- Trigger Action spawned team IFV/OpenTopped logic fix
311319
- Singleplayer Campaign AI's base node/SW-delivered/trigger action `125 Create Building At...`'s auto-repairability dehardcode
@@ -357,6 +365,10 @@ This page lists all the individual contributions to the project by their author.
357365
- Fix the issue where computer players did not search for new enemies after defeating them or forming alliances with them
358366
- Customize the damage taken when falling from a bridge
359367
- `600 The shield of the attached object is broken` bug fix for the triggered event
368+
- Fix an issue where a portion of Ares's trigger event 75/77 was determined unsuccessfully
369+
- Second weapon with `ElectricAssault=yes` will not unconditionally attack your building with `Overpowerable=yes`
370+
- Fix the issue where some units crashed after the deployment transformation
371+
- Turretless vehicles with `Voxel=no` support use `FireUp` like infantry
360372
- **NetsuNegi**:
361373
- Forbidding parallel AI queues by type
362374
- Jumpjet crash speed fix when crashing onto building
@@ -391,6 +403,11 @@ This page lists all the individual contributions to the project by their author.
391403
- Fix the bug that infantry ignored `Passengers` and `SizeLimit` when entering buildings
392404
- Tiberium eater logic
393405
- Fix the bug that ships can travel on elevated bridges
406+
- Original `Arcing` elevation inaccuracy fix
407+
- Fix the bug that uncontrolled scatter when elite techno attacked by aircraft or some unit try crush it
408+
- Exclusive SuperWeapon Sidebar
409+
- Fix the bug that AlphaImage remained after unit entered tunnel
410+
- Weapon target filtering by health percentage
394411
- **Apollo** - Translucent SHP drawing patches
395412
- **ststl**:
396413
- Customizable `ShowTimer` priority of superweapons
@@ -400,6 +417,7 @@ This page lists all the individual contributions to the project by their author.
400417
- Build limit group
401418
- Customizing whether passengers are kicked out when an aircraft fires
402419
- New SuperWeapon Type template
420+
- Fix the issue where some units crashed after the deployment transformation
403421
- **TwinkleStar**:
404422
- Custom slaves free sound
405423
- Jumpjet crash rotation control
@@ -465,6 +483,7 @@ This page lists all the individual contributions to the project by their author.
465483
- Aggressive attack move mission
466484
- Amphibious access vehicle
467485
- 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
486+
- Exclusive SuperWeapon Sidebar
468487
- **Ollerus**:
469488
- Build limit group enhancement
470489
- Customizable rocker amplitude
@@ -478,6 +497,8 @@ This page lists all the individual contributions to the project by their author.
478497
- Forcing specific weapon by range
479498
- Passenger-based insignias
480499
- Use `InsigniaType` to set the properties of insignia in a batch
500+
- Allowed player's self-healing effects to be benefited by allied or `PlayerControl=true` houses
501+
- Power plant damage factor
481502
- **NaotoYuuki** - Vertical & meteor trajectory projectile prototypes
482503
- **handama** - AI script action to `16005 Jump Back To Previous Script`
483504
- **TaranDahl (航味麻酱)**:
@@ -508,6 +529,8 @@ This page lists all the individual contributions to the project by their author.
508529
- RadarInvisible for non-enemy house
509530
- Allow miners do area guard
510531
- Make harvesters do addtional scan after unload
532+
- Customize the scatter caused by aircraft attack mission
533+
- Customize whether `Crater=yes` animation would destroy tiberium
511534
- Fix BalloonHover incorrectly considering ground factors when pathfinding
512535
- **tyuah8**:
513536
- Drive/Jumpjet/Ship/Teleport locomotor did not power on when it is un-piggybacked bugfix

Phobos.vcxproj

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,17 @@
1818
</ProjectConfiguration>
1919
</ItemGroup>
2020
<ItemGroup>
21+
<ClCompile Include="src\Ext\Unit\Hooks.Firing.cpp" />
22+
<ClCompile Include="src\New\Type\Affiliated\CreateUnitTypeClass.cpp" />
2123
<ClCompile Include="src\Blowfish\blowfish.cpp" />
2224
<ClCompile Include="src\Blowfish\Hooks.Blowfish.cpp" />
2325
<ClCompile Include="src\Ext\Cell\Body.cpp" />
2426
<ClCompile Include="src\Ext\House\Hooks.ForceEnemy.cpp" />
27+
<ClCompile Include="src\Commands\ToggleSWSidebar.cpp" />
28+
<ClCompile Include="src\Ext\Sidebar\SWSidebar\SWColumnClass.cpp" />
29+
<ClCompile Include="src\Ext\Sidebar\SWSidebar\SWSidebarClass.cpp" />
30+
<ClCompile Include="src\Ext\Sidebar\SWSidebar\SWButtonClass.cpp" />
31+
<ClCompile Include="src\Ext\Sidebar\SWSidebar\ToggleSWButtonClass.cpp" />
2532
<ClCompile Include="src\Ext\TechnoType\Hooks.MatrixOp.cpp" />
2633
<ClCompile Include="src\Ext\Techno\Hooks.Airstrike.cpp" />
2734
<ClCompile Include="src\Ext\Unit\Hooks.Harvester.cpp" />
@@ -176,6 +183,7 @@
176183
<ClCompile Include="src\Misc\Hooks.Timers.cpp" />
177184
<ClCompile Include="src\Misc\Hooks.INIInheritance.cpp" />
178185
<ClCompile Include="src\Misc\Hooks.SkirmishColors.cpp" />
186+
<ClCompile Include="src\Misc\Hooks.Overlay.cpp" />
179187
<ClCompile Include="src\New\Type\Affiliated\TypeConvertGroup.cpp" />
180188
<ClCompile Include="src\Ext\BuildingType\Hooks.Upgrade.cpp" />
181189
<ClCompile Include="src\Phobos.COM.cpp" />
@@ -195,8 +203,15 @@
195203
<ClCompile Include="YRpp\StaticInits.cpp" />
196204
</ItemGroup>
197205
<ItemGroup>
206+
<ClInclude Include="src\New\Type\Affiliated\CreateUnitTypeClass.h" />
198207
<ClInclude Include="src\Blowfish\blowfish.h" />
199208
<ClInclude Include="src\Ext\Cell\Body.h" />
209+
<ClInclude Include="src\Commands\FireTacticalSW.h" />
210+
<ClInclude Include="src\Commands\ToggleSWSidebar.h" />
211+
<ClInclude Include="src\Ext\Sidebar\SWSidebar\SWColumnClass.h" />
212+
<ClInclude Include="src\Ext\Sidebar\SWSidebar\SWSidebarClass.h" />
213+
<ClInclude Include="src\Ext\Sidebar\SWSidebar\SWButtonClass.h" />
214+
<ClInclude Include="src\Ext\Sidebar\SWSidebar\ToggleSWButtonClass.h" />
200215
<ClInclude Include="src\New\Entity\AttachEffectClass.h" />
201216
<ClInclude Include="src\New\Type\Affiliated\TiberiumEaterTypeClass.h" />
202217
<ClInclude Include="src\New\Type\AttachEffectTypeClass.h" />

docs/AI-Scripting-and-Mapping.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ Ranking.OverParMessage= ; CSF entry key
7878

7979
### Show briefing dialog on startup
8080

81-
- You can now have the briefing dialog screen show up on singleplayer campaign mission startup by setting `ShowBriefing` to true in map file's `[Basic]` section, or in the map file's section in `missionmd.ini` (latter takes precedence over former if available). This can be disabled by user by setting `ShowBriefing` to false in `RA2MD.INI`.
82-
- `BriefingTheme` (In order of precedence from highest to lowest: `missionmd.ini`, map file, side entry in `rulesmd.ini`) can be used to define a custom theme to play on this briefing screen. If not set, the loading screen theme will keep playing until the scenario starts properly.
81+
- You can now have the briefing dialog screen show up on singleplayer campaign mission startup by setting `ShowBriefing` to true in map file's `[Basic]` section, or in the map file's section in `missionmd.ini` (former takes precedence if available). This can be disabled by user by setting `ShowBriefing` to false in `RA2MD.INI`.
82+
- `BriefingTheme` (In order of precedence from highest to lowest: map file, `missionmd.ini`, side entry in `rulesmd.ini`) can be used to define a custom theme to play on this briefing screen. If not set, the loading screen theme will keep playing until the scenario starts properly.
8383
- String labels for the startup briefing dialog screen's resume button as well as the button's status bar text can be customized by setting `ShowBriefingResumeButtonLabel` and `ShowBriefingResumeButtonStatusLabel` respectively. They default to the same labels used by the briefing screen dialog when opened otherwise.
8484

8585
In `missionmd.ini`:
@@ -784,13 +784,13 @@ ID=EventCount,...,[EVENTID],2,[HouseIndex],[TechnoType],...
784784
- `HouseIndex` can be customized to focus in a specified house.
785785

786786
In `mycampaign.map`:
787-
```ini
788-
[Events]
789-
...
790-
ID=EventCount,...,604,2,[HouseIndex],[TechnoType],...
791-
ID=EventCount,...,605,2,[HouseIndex],[AITargetTypes index#],...
792-
...
793-
```
787+
<div class="highlight-ini notranslate"><div class="highlight"><pre><span></span><span class="k">[Events]</span>
788+
<span class="na">...</span>
789+
<span class="na">ID</span><span class="o">=</span><span class="s">EventCount,...,604,2,[HouseIndex],[TechnoType],...</span>
790+
<span class="na">ID</span><span class="o">=</span><span class="s">EventCount,...,605,2,[HouseIndex],[AITargetTypes index#],...</span>
791+
<span class="na">...</span>
792+
</pre></div>
793+
</div>
794794

795795
| *House Index* | *Description* |
796796
|:-------------:|:------------------------------------------:|

0 commit comments

Comments
 (0)