Skip to content
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.

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

RC 0.3.0 #72

Merged
merged 66 commits into from
Feb 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
6501edb
Add GunnerSeats_Hide AnimationSource
ampersand38 Feb 17, 2021
2e669fc
add gunner_seats bone to hide for DAP
ampersand38 Feb 17, 2021
703fd05
doorgun controls
ampersand38 Feb 17, 2021
6de4d14
ViV and DAP seat hide
ampersand38 Feb 17, 2021
e25563d
FFV accessible
ampersand38 Feb 17, 2021
df20dc0
Doorguns using renamed mempoints
ampersand38 Feb 17, 2021
f01c1d9
renamed mempoints
ampersand38 Feb 17, 2021
2bc4aa6
Some defines to main
ampersand38 Feb 17, 2021
7ef85a3
Fixed cargoProxyIndexes
ampersand38 Feb 17, 2021
1b4b5a8
consolidate defines and remove duplicates
ampersand38 Feb 18, 2021
30b4ad4
formatting
ampersand38 Feb 18, 2021
421b5e5
fix doorguns
ampersand38 Feb 18, 2021
aa9d13f
formatting
ampersand38 Feb 18, 2021
851379b
Sync copilot and pilot view limits
ampersand38 Feb 18, 2021
55f6e06
ViewGunner head limits don't seem to apply
ampersand38 Feb 18, 2021
afaf5ea
prevent hook from showing on slingload assistant
ampersand38 Feb 18, 2021
6ba54c7
formatting
ampersand38 Feb 18, 2021
61d97c8
viv scripted
ampersand38 Feb 18, 2021
359b4b6
A few to start
ampersand38 Feb 20, 2021
330f42e
all except DEBUG
ampersand38 Feb 20, 2021
921211b
Delete cfgVehicles1.hpp
ampersand38 Feb 20, 2021
6bead85
extra space
ampersand38 Feb 20, 2021
965a8f4
missing commas
ampersand38 Feb 20, 2021
9059092
check for h60
ampersand38 Feb 20, 2021
86ce0f4
Initial removal of all FLIR stuff
YannikH Feb 12, 2021
a665ed4
Zoom fixed
YannikH Feb 14, 2021
1fc5840
slewing now works well when stabilized, with well scaling slew speeds
YannikH Feb 14, 2021
f37775e
unstab movement closer to vanilla now
YannikH Feb 15, 2021
46a09b9
Pilotcamera and copilot camera now look the same
YannikH Feb 16, 2021
9acb487
Multiplayer sync code implemented, but untested
YannikH Feb 19, 2021
e2be5eb
Update MH-60M and MH-60S to new FLIR system
YannikH Feb 20, 2021
c793b3b
New FLIR functional on all vehicles, laser designators added
YannikH Feb 20, 2021
851ef60
revert from txt until HEMTT
ampersand38 Feb 20, 2021
3102c49
copilot before dooguns
ampersand38 Feb 20, 2021
a991c53
copilot seats fixed
YannikH Feb 20, 2021
5797124
Turret syncing mostly fixed
YannikH Feb 20, 2021
5fe5017
Merge branch 'PBOPREFIX' into rc-0.3.0
ampersand38 Feb 20, 2021
26bf002
Merge branch 'FD-RALT-key-check' into rc-0.3.0
ampersand38 Feb 20, 2021
ddabdbe
Merge branch 'stringtable' into rc-0.3.0
ampersand38 Feb 20, 2021
4feb4ce
Merge branch 'viv' into rc-0.3.0
ampersand38 Feb 20, 2021
43fca87
Driver and missile cams
ampersand38 Feb 20, 2021
5474b07
add unload all cargo action
ampersand38 Feb 20, 2021
3961cc6
don't hide gunner seats on vtx_MH60S_GAU21L
ampersand38 Feb 21, 2021
3126ba9
move VTV to include file
ampersand38 Feb 21, 2021
43ce9a4
Hide minigun
ampersand38 Feb 21, 2021
4ed3080
cabin door animation
ampersand38 Feb 21, 2021
aaa64a3
formatting
ampersand38 Feb 21, 2021
8efb6ca
add slick bird
ampersand38 Feb 21, 2021
d3b4807
minor version
ampersand38 Feb 21, 2021
33f2cfc
indent size 2
ampersand38 Feb 21, 2021
e442903
add minigun hide to base class
ampersand38 Feb 21, 2021
430ccdd
but don't autohide the guns
ampersand38 Feb 21, 2021
7fe9cea
Reference
ampersand38 Feb 22, 2021
9440324
Add resources paa, tga, bin'd p3d
ampersand38 Feb 22, 2021
612d709
add bin'd p3d
ampersand38 Feb 22, 2021
fa26ad8
fix door blocked on non-ffv models
ampersand38 Feb 22, 2021
f15f858
ANIMSRC macro for MEDEVAC
ampersand38 Feb 22, 2021
d6cbb9b
base model no missile cam
ampersand38 Feb 22, 2021
45ba1e5
remove old copilot files
ampersand38 Feb 22, 2021
4c7fd82
cargoseat 23 [0,0,0] pylons misaligned in view pilot and view cargo
ampersand38 Feb 22, 2021
e69b8d9
MEDEVAC from base with door FFV
ampersand38 Feb 22, 2021
a921c3f
fix SFM no brakes
ampersand38 Feb 22, 2021
f806a9d
don't hide S gunner seats
ampersand38 Feb 22, 2021
681d7af
missileCam for pylon models
ampersand38 Feb 22, 2021
23a68c6
doorgun limits for pylons
ampersand38 Feb 22, 2021
e17b3f3
Restore doorguns on MH-60S (Pylons)
YannikH Feb 22, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ end_of_line = crlf
insert_final_newline = true
charset = utf-8
indent_style = space
indent_size = 4
indent_size = 2
trim_trailing_whitespace = true

[*.md]
Expand Down
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
*.bak
*.p3d
*.paa
*.tga
*.zip
*.cache
release/*
Expand All @@ -14,4 +11,3 @@ texHeaders.bin
*.swo
*.biprivatekey
Thumbs.db
addons/UH60/vtx_uh60.p3d
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p align="center">
<a href="">
<img src="https://img.shields.io/badge/Version-0.1.0-blue.svg?style=flat-square" alt="Zeus Enhanced Version">
<img src="https://img.shields.io/badge/Version-0.2.1-blue.svg?style=flat-square" alt="Zeus Enhanced Version">
</a>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=1745501605">
<img src="https://img.shields.io/badge/Steam-dev%20build-orange?logo=steam" alt="H-60 Pack">
Expand Down
20 changes: 1 addition & 19 deletions addons/MH60M/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,5 @@ class CfgPatches {
};

#include "CfgEventHandlers.hpp"

#define COPILOTVIEW \
initFov=1; \
minFov=0.25; \
maxFov=0.80000001; \
initAngleX=0; \
minAngleX=-75; \
maxAngleX=89; \
initAngleY=0; \
minAngleY=-150; \
maxAngleY=150; \
MOVE_LEFT = -0.2; \
MOVE_RIGHT = 0.5; \
minMoveY = -0.2; \
maxMoveY = 0.1; \
minMoveZ = -0.2; \
maxMoveZ = 0.25;

#include "config\cfgVehicles.hpp"
#include "config\cfgWeapons.hpp"
#include "config\cfgWeapons.hpp"
2 changes: 1 addition & 1 deletion addons/MH60M/config/Pylons.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class TransportPylonsComponent {
attachment[] = {};
};
class Default {
displayName = "30mm + Rocket";
displayName = "Default";
attachment[] = {"PylonWeapon_300Rnd_20mm_shells", "PylonRack_19Rnd_Rocket_Skyfire"};
};
class Interdiction {
Expand Down
48 changes: 0 additions & 48 deletions addons/MH60M/config/cargoTurrets.hpp

This file was deleted.

101 changes: 34 additions & 67 deletions addons/MH60M/config/cfgVehicles.hpp
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
#include "customInfo.hpp"
class VehicleSystemsTemplateLeftPilot;
class vtx_VehicleSystemsTemplateLeftPilot: VehicleSystemsTemplateLeftPilot {
class Components;
};
class VehicleSystemsTemplateRightPilot;
class vtx_VehicleSystemsTemplateRightPilot: VehicleSystemsTemplateRightPilot {
class Components;
};

class SensorTemplatePassiveRadar;
class SensorTemplateAntiRadiation;
class SensorTemplateActiveRadar;
Expand All @@ -18,64 +10,43 @@ class SensorTemplateLaser;
class SensorTemplateNV;
class SensorTemplateDataLink;
class CfgVehicles {
class Helicopter_Base_F;
class Helicopter_Base_H: Helicopter_Base_F {
class Turrets;
};
class Helicopter_Base_H;
class Heli_Transport_01_base_F: Helicopter_Base_H {
class Turrets: Turrets {
class CopilotTurret;
};
}; // Helicopter_Base_H
class Turrets;
}; // Heli_Transport_01_base_F
class vtx_H60_base: Heli_Transport_01_base_F {
class ViewPilot;
class vtx_templateFLIR;
class Components;
class AnimationSources;
class Turrets: Turrets
{
class MainTurret;
class CopilotTurret: CopilotTurret {
class Components;
};
class CopilotTurret;
};
class ViewPilot;
}; // Heli_Transport_01_base_F

}; // vtx_H60_base
class vtx_MH60M: vtx_H60_base {
class VTX_H60_HDTS_Common;
class pilotCamera: vtx_templateFLIR {};
driverWeaponsInfoType = "Rsc_MELB_Turret_UnitInfo";
class VTX_H60_HDTS_Copilot;
class VTX_H60_HDTS_CoPilot_Turret;
class VTX_H60_HDTS_Pilot;
scope = 2;
displayName = "MH-60M";
editorPreview = "z\vtx\addons\MH60M\Data\Preview\vtx_MH60M.jpg";
memoryPointDriverOptics = "pilotcamera_flir_pos";

transportSoldier=0;
cargoProxyIndexes[] = {};
cargoProxyIndexes[] = {12, 13, 14, 15, 16, 17, 20, 21, 22, 23};
cargoAction[] = {};

weapons[]={
"CMFlareLauncher"
};
magazines[]={
"60Rnd_CMFlareMagazine"
};
weapons[]={"CMFlareLauncher", "Laserdesignator_pilotcamera"};
magazines[]={"60Rnd_CMFlareMagazine", "Laserbatteries"};
class ViewPilot: ViewPilot
{
initAngleX=0;
};
class Components: Components {
#include "sensors.hpp"

class VehicleSystemsDisplayManagerComponentLeft: vtx_VehicleSystemsTemplateLeftPilot {
class Components: Components {
ADDGUNNER
};
};
class VehicleSystemsDisplayManagerComponentRight: vtx_VehicleSystemsTemplateRightPilot {
class Components: Components {
ADDGUNNER
};
};
}; // Components
class AnimationSources: AnimationSources {
class Cockpitdoors_Hide {
Expand Down Expand Up @@ -112,41 +83,31 @@ class CfgVehicles {
initPhase=1;
};
}; // AnimationSources
class vtx_templateFLIR;
class pilotCamera: vtx_templateFLIR {};
class CargoTurret;
class Turrets: Turrets
{
#include "copilotTurretSetup.hpp"
#include "doorguns_free.hpp"
#include "cargoTurrets.hpp"
class CopilotTurret: CopilotTurret {};
#include "\z\vtx\addons\UH60\config\turrets\doorguns.hpp"
#include "\z\vtx\addons\UH60\config\turrets\cargoTurrets.hpp"
};
hiddenSelectionsTextures[] = {"","","","","","","","","","","","","","","","","z\vtx\addons\MH60M\data\main_co.paa","z\vtx\addons\MH60M\Data\Misc_co.paa","z\vtx\addons\MH60M\data\tail_co.paa","","","","","","z\vtx\addons\UH60\data\FuelProbe\Fuel_probe_co.paa"};
#include "\z\vtx\addons\UH60\config\vehicleTransport.hpp"
}; // vtx_MH60M
class vtx_MH60M_DAP : vtx_MH60M {
class pilotCamera: vtx_templateFLIR {};
driverWeaponsInfoType = "Rsc_MELB_Turret_UnitInfo";
scope = 2;
displayName = "MH-60M DAP";
editorPreview = "z\vtx\addons\MH60M\Data\Preview\vtx_MH60M_DAP.jpg";
class vtx_templateFLIR;
class pilotCamera: vtx_templateFLIR {};
cargoProxyIndexes[] = {};
class ViewPilot: ViewPilot
{
initAngleX=0;
};
class Components: Components {
#include "Pylons.hpp"
#include "sensors.hpp"

class VehicleSystemsDisplayManagerComponentLeft: VehicleSystemsDisplayManagerComponentLeft {
class Components: Components {
ADDMISSILE
};
};
class VehicleSystemsDisplayManagerComponentRight: VehicleSystemsDisplayManagerComponentRight {
class Components: Components {
ADDMISSILE
};
};
#include "Pylons.hpp"
#include "sensors.hpp"
#include "missileCam.hpp"
}; // Components
class AnimationSources: AnimationSources {
class Gatling_1
Expand Down Expand Up @@ -194,7 +155,11 @@ class CfgVehicles {
animPeriod=1;
initPhase=1;
};

class GunnerSeats_Hide {
source="user";
animPeriod=1;
initPhase=1;
};
class CabinSeats_Hide {
source="user";
animPeriod=1;
Expand All @@ -211,16 +176,18 @@ class CfgVehicles {
}; // AnimationSources
class Turrets: Turrets
{
#include "copilotTurretSetup.hpp"
#include "cargoTurrets.hpp"
//#include "\z\vtx\addons\UH60\config\turrets\doorguns_pylons.hpp"
class CopilotTurret: CopilotTurret {};
#include "\z\vtx\addons\UH60\config\turrets\cargoTurrets.hpp"
};
hiddenSelectionsTextures[] = {"","","","","","","","","","","","","","","","","z\vtx\addons\MH60M\data\main_co.paa","z\vtx\addons\MH60M\Data\Misc_co.paa","z\vtx\addons\MH60M\data\tail_co.paa","","","","","","z\vtx\addons\UH60\data\FuelProbe\Fuel_probe_co.paa"};
weapons[] = {"CMFlareLauncher","vtx_MH60M_M134_minigun"};
magazines[] = {"60Rnd_CMFlareMagazine","5000Rnd_762x51_Belt"};
weapons[]={"CMFlareLauncher", "Laserdesignator_pilotcamera", "vtx_MH60M_M134_minigun"};
magazines[]={"60Rnd_CMFlareMagazine", "Laserbatteries", "5000Rnd_762x51_Belt"};
memoryPointGun[] = {"muzzle_1","muzzle_2"};
gunBeg[] = {"muzzle_1","muzzle_2"};
gunEnd[] = {"chamber_1","chamber_2"};
selectionFireAnim = "zasleh_12";
class VehicleTransport {};
}; // vtx_H60_base
}; // CfgVehicles

Expand Down
Loading