-
Notifications
You must be signed in to change notification settings - Fork 739
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
Crew Served Weapons - Final Integration #7042
Merged
Merged
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
b1d5bbe
Adds Crew Served Static Weapons (#5652)
TheCandianVendingMachine abe2ce2
Implement M47 Dragon (#6773)
TheCandianVendingMachine 7b13a75
RHS CSW compatability (#7082)
TheCandianVendingMachine 8763184
CSW/Dragon cleanup and rearm compat (#7068)
PabstMirror 70ba6b6
small config fix
PabstMirror 3e97d99
Merge branch 'master' into cswSuperBranch
PabstMirror File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -51,6 +51,7 @@ Bla1337 | |
| BlackPixxel <[email protected]> | ||
| BlackQwar | ||
| Brakoviejo | ||
| Brandon (TCVM) <[email protected]> | ||
| Brisse <[email protected]> | ||
| Brostrom.A | Evul <[email protected]> | ||
| BullHorn <[email protected]> | ||
|
|
||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| ambient[]={1,1,1,1.000000}; | ||
| diffuse[]={1,1,1,1.000000}; | ||
| forcedDiffuse[]={0.000000,0.000000,0.000000,0.000000}; | ||
| emmisive[]={0.000000,0.000000,0.000000,1.000000}; | ||
| specular[]={1,1,1,1.000000}; | ||
| specularPower=40.000000; | ||
| PixelShaderID="super"; | ||
| VertexShaderID="super"; | ||
| class Stage1 | ||
| { | ||
| texture = "z\ace\addons\apl\data\csw_nsv_nohq.paa"; | ||
| uvSource="tex"; | ||
| class uvTransform | ||
| { | ||
| aside[]={1.000000,0.000000,0.000000}; | ||
| up[]={0.000000,1.000000,0.000000}; | ||
| dir[]={0.000000,0.000000,0.000000}; | ||
| pos[]={0.000000,0.000000,0.000000}; | ||
| }; | ||
| }; | ||
| class Stage2 | ||
| { | ||
| texture="a3\weapons_f\Data\DetailMaps\metal_detail_dt.paa"; | ||
| uvSource="tex"; | ||
| class uvTransform | ||
| { | ||
| aside[]={8.0000,0.000000,0.000000}; | ||
| up[]={0.000000,8.0000,0.000000}; | ||
| dir[]={0.000000,0.000000,0.000000}; | ||
| pos[]={0.000000,0.000000,0.000000}; | ||
| }; | ||
| }; | ||
| class Stage3 | ||
| { | ||
| texture="#(argb,8,8,3)color(0,0,0,0,MC)"; | ||
| uvSource="tex"; | ||
| class uvTransform | ||
| { | ||
| aside[]={1.000000,0.000000,0.000000}; | ||
| up[]={0.000000,1.000000,0.000000}; | ||
| dir[]={0.000000,0.000000,0.000000}; | ||
| pos[]={0.000000,0.000000,0.000000}; | ||
| }; | ||
| }; | ||
| class Stage4 | ||
| { | ||
| texture = "#(argb,8,8,3)color(1,1,1,1,AS)"; | ||
| uvSource="tex"; | ||
| class uvTransform | ||
| { | ||
| aside[]={1.000000,0.000000,0.000000}; | ||
| up[]={0.000000,1.000000,0.000000}; | ||
| dir[]={0.000000,0.000000,0.000000}; | ||
| pos[]={0.000000,0.000000,0.000000}; | ||
| }; | ||
| }; | ||
| class Stage5 | ||
| { | ||
| texture = "z\ace\addons\apl\data\csw_nsv_smdi.paa"; | ||
| uvSource="tex"; | ||
| class uvTransform | ||
| { | ||
| aside[]={1.000000,0.000000,0.000000}; | ||
| up[]={0.000000,1.000000,0.000000}; | ||
| dir[]={0.000000,0.000000,0.000000}; | ||
| pos[]={0.000000,0.000000,0.000000}; | ||
| }; | ||
| }; | ||
| class Stage6 | ||
| { | ||
| texture = "#(ai,32,128,1)fresnel(3.38,5.33)"; | ||
| uvSource="tex"; | ||
| class uvTransform | ||
| { | ||
| aside[]={1.000000,0.000000,0.000000}; | ||
| up[]={0.000000,1.000000,0.000000}; | ||
| dir[]={0.000000,0.000000,0.000000}; | ||
| pos[]={0.000000,0.000000,0.000000}; | ||
| }; | ||
| }; | ||
| class Stage7 | ||
| { | ||
| texture="a3\data_f\env_land_co.paa"; | ||
| uvSource="tex"; | ||
| class uvTransform | ||
| { | ||
| aside[]={1.000000,0.000000,0.000000}; | ||
| up[]={0.000000,1.000000,0.000000}; | ||
| dir[]={0.000000,0.000000,0.000000}; | ||
| pos[]={0.000000,0.000000,0.000000}; | ||
| }; | ||
| }; | ||
| class StageTI { | ||
| texture = "a3\data_f\default_vehicle_ti_ca.paa"; | ||
| }; |
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| ambient[] = {1.0,1.0,1.0,1.0}; | ||
| diffuse[] = {1.0,1.0,1.0,1.0}; | ||
| forcedDiffuse[] = {0.0,0.0,0.0,0.0}; | ||
| emmisive[] = {0.0,0.0,0.0,1.0}; | ||
| specular[] = {0.545,0.545,0.545,1.0}; | ||
| specularPower = 100.0; | ||
| PixelShaderID = "Super"; | ||
| VertexShaderID = "Super"; | ||
| class Stage1 | ||
| { | ||
| texture = "z\ace\addons\apl\data\csw_spg9_nohq.paa"; | ||
| uvSource = "tex"; | ||
| class uvTransform | ||
| { | ||
| aside[] = {1.0,0.0,0.0}; | ||
| up[] = {0.0,1.0,0.0}; | ||
| dir[] = {0.0,0.0,1.0}; | ||
| pos[] = {0.0,0.0,0.0}; | ||
| }; | ||
| }; | ||
| class Stage2 | ||
| { | ||
| texture = "a3\weapons_f\Data\DetailMaps\metal_detail_dt.paa"; | ||
| uvSource = "tex"; | ||
| class uvTransform | ||
| { | ||
| aside[] = {8.0,0.0,0.0}; | ||
| up[] = {0.0,2.0,0.0}; | ||
| dir[] = {0.0,0.0,1.0}; | ||
| pos[] = {0.0,0.0,0.0}; | ||
| }; | ||
| }; | ||
| class Stage3 | ||
| { | ||
| texture = "#(argb,8,8,3)color(0,0,0,0,MC)"; | ||
| uvSource = "tex"; | ||
| class uvTransform | ||
| { | ||
| aside[] = {1.0,0.0,0.0}; | ||
| up[] = {0.0,1.0,0.0}; | ||
| dir[] = {0.0,0.0,1.0}; | ||
| pos[] = {0.0,0.0,0.0}; | ||
| }; | ||
| }; | ||
| class Stage4 | ||
| { | ||
| texture = "#(argb,8,8,3)color(1,1,1,1,AS)"; | ||
| uvSource = "tex"; | ||
| class uvTransform | ||
| { | ||
| aside[] = {1.0,0.0,0.0}; | ||
| up[] = {0.0,1.0,0.0}; | ||
| dir[] = {0.0,0.0,1.0}; | ||
| pos[] = {0.0,0.0,0.0}; | ||
| }; | ||
| }; | ||
| class Stage5 | ||
| { | ||
| texture = "z\ace\addons\apl\data\csw_spg9_smdi.paa"; | ||
| uvSource = "tex"; | ||
| class uvTransform | ||
| { | ||
| aside[] = {1.0,0.0,0.0}; | ||
| up[] = {0.0,1.0,0.0}; | ||
| dir[] = {0.0,0.0,1.0}; | ||
| pos[] = {0.0,0.0,0.0}; | ||
| }; | ||
| }; | ||
| class Stage6 | ||
| { | ||
| texture = "#(ai,32,128,1)fresnel(1.89,1.02)"; | ||
| uvSource = "tex"; | ||
| class uvTransform | ||
| { | ||
| aside[] = {1.0,0.0,0.0}; | ||
| up[] = {0.0,1.0,0.0}; | ||
| dir[] = {0.0,0.0,1.0}; | ||
| pos[] = {0.0,0.0,0.0}; | ||
| }; | ||
| }; | ||
| class Stage7 | ||
| { | ||
| texture="a3\data_f\env_land_co.paa"; | ||
| uvSource = "tex"; | ||
| class uvTransform | ||
| { | ||
| aside[] = {1.0,0.0,0.0}; | ||
| up[] = {0.0,1.0,0.0}; | ||
| dir[] = {0.0,0.0,1.0}; | ||
| pos[] = {0.0,0.0,0.0}; | ||
| }; | ||
| }; |
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| ambient[]={1.000000,1.000000,1.000000,1.000000}; | ||
| diffuse[]={1.000000,1.000000,1.000000,1.000000}; | ||
| forcedDiffuse[]={0.000000,0.000000,0.000000,0.000000}; | ||
| emmisive[]={0.000000,0.000000,0.000000,1.000000}; | ||
| specular[]={0.3000000,0.3000000,0.3000000,1.000000}; | ||
| specularPower=100.000000; | ||
| PixelShaderID="NormalMapSpecularDIMap"; | ||
| VertexShaderID="NormalMap"; | ||
| class Stage1 | ||
| { | ||
| texture="z\ace\addons\apl\data\csw_tow_merge_nohq.paa"; | ||
| uvSource="tex"; | ||
| class uvTransform | ||
| { | ||
| aside[]={1.000000,0.000000,0.000000}; | ||
| up[]={0.000000,1.000000,0.000000}; | ||
| dir[]={0.000000,0.000000,0.000000}; | ||
| pos[]={0.000000,0.000000,0.000000}; | ||
| }; | ||
| }; | ||
| class Stage2 | ||
| { | ||
| texture="z\ace\addons\apl\data\csw_tow_merge_smdi.paa"; | ||
| uvSource="tex"; | ||
| class uvTransform | ||
| { | ||
| aside[]={1.000000,0.000000,0.000000}; | ||
| up[]={0.000000,1.000000,0.000000}; | ||
| dir[]={0.000000,0.000000,0.000000}; | ||
| pos[]={0.000000,0.000000,0.000000}; | ||
| }; | ||
| }; |
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| ambient[] = {1.0,1.0,1.0,1.0}; | ||
| diffuse[] = {1.0,1.0,1.0,1.0}; | ||
| forcedDiffuse[] = {0.0,0.0,0.0,0.0}; | ||
| emmisive[] = {0.0,0.0,0.0,0.0}; | ||
| specular[] = {0.3,0.3,0.3,1.0}; | ||
| specularPower = 256.0; | ||
| PixelShaderID = "NormalMapSpecularDIMap"; | ||
| VertexShaderID = "NormalMap"; | ||
| class Stage1 | ||
| { | ||
| texture = "z\ace\addons\apl\data\csw_tripod_ags_nohq.paa"; | ||
| uvSource = "tex"; | ||
| class uvTransform | ||
| { | ||
| aside[] = {1.0,0.0,0.0}; | ||
| up[] = {0.0,1.0,0.0}; | ||
| dir[] = {0.0,0.0,0.0}; | ||
| pos[] = {0.0,0.0,0.0}; | ||
| }; | ||
| }; | ||
| class Stage2 | ||
| { | ||
| texture = "z\ace\addons\apl\data\csw_tripod_ags_smdi.paa"; | ||
| uvSource = "tex"; | ||
| class uvTransform | ||
| { | ||
| aside[] = {1.0,0.0,0.0}; | ||
| up[] = {0.0,1.0,0.0}; | ||
| dir[] = {0.0,0.0,0.0}; | ||
| pos[] = {0.0,0.0,0.0}; | ||
| }; | ||
| }; |
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| #define _ARMA_ | ||
|
|
||
| ambient[] = {1,1,1,1.0}; | ||
| diffuse[] = {1,1,1,1.0}; | ||
| forcedDiffuse[] = {0.0,0.0,0.0,0.0}; | ||
| emmisive[] = {0.0,0.0,0.0,1.0}; | ||
| specular[] = {1,1,1,1.0}; | ||
| specularPower = 40.0; | ||
| PixelShaderID = "super"; | ||
| VertexShaderID = "super"; | ||
| class Stage1 | ||
| { | ||
| texture = "z\ace\addons\apl\data\m3tripod_nohq.paa"; | ||
| uvSource = "tex"; | ||
| class uvTransform | ||
| { | ||
| aside[] = {1.0,0.0,0.0}; | ||
| up[] = {0.0,1.0,0.0}; | ||
| dir[] = {0.0,0.0,0.0}; | ||
| pos[] = {0.0,0.0,0.0}; | ||
| }; | ||
| }; | ||
| class Stage2 | ||
| { | ||
| texture = "a3\weapons_f\Data\DetailMaps\metal_detail_dt.paa"; | ||
| uvSource = "tex"; | ||
| class uvTransform | ||
| { | ||
| aside[] = {8.0,0.0,0.0}; | ||
| up[] = {0.0,8.0,0.0}; | ||
| dir[] = {0.0,0.0,0.0}; | ||
| pos[] = {0.0,0.0,0.0}; | ||
| }; | ||
| }; | ||
| class Stage3 | ||
| { | ||
| texture = "#(argb,8,8,3)color(0,0,0,0,MC)"; | ||
| uvSource = "tex"; | ||
| class uvTransform | ||
| { | ||
| aside[] = {1.0,0.0,0.0}; | ||
| up[] = {0.0,1.0,0.0}; | ||
| dir[] = {0.0,0.0,0.0}; | ||
| pos[] = {0.0,0.0,0.0}; | ||
| }; | ||
| }; | ||
| class Stage4 | ||
| { | ||
| texture = "#(argb,8,8,3)color(1,1,1,1,AS)"; | ||
| uvSource = "tex"; | ||
| class uvTransform | ||
| { | ||
| aside[] = {1.0,0.0,0.0}; | ||
| up[] = {0.0,1.0,0.0}; | ||
| dir[] = {0.0,0.0,0.0}; | ||
| pos[] = {0.0,0.0,0.0}; | ||
| }; | ||
| }; | ||
| class Stage5 | ||
| { | ||
| texture = "z\ace\addons\apl\data\m3tripod_SMDI.paa"; | ||
| uvSource = "tex"; | ||
| class uvTransform | ||
| { | ||
| aside[] = {1.0,0.0,0.0}; | ||
| up[] = {0.0,1.0,0.0}; | ||
| dir[] = {0.0,0.0,0.0}; | ||
| pos[] = {0.0,0.0,0.0}; | ||
| }; | ||
| }; | ||
| class Stage6 | ||
| { | ||
| texture = "#(ai,32,128,1)fresnel(3.38,5.33)"; | ||
| uvSource = "tex"; | ||
| class uvTransform | ||
| { | ||
| aside[] = {1.0,0.0,0.0}; | ||
| up[] = {0.0,1.0,0.0}; | ||
| dir[] = {0.0,0.0,0.0}; | ||
| pos[] = {0.0,0.0,0.0}; | ||
| }; | ||
| }; | ||
| class Stage7 | ||
| { | ||
| texture = "a3\data_f\env_land_co.paa"; | ||
| uvSource = "tex"; | ||
| class uvTransform | ||
| { | ||
| aside[] = {1.0,0.0,0.0}; | ||
| up[] = {0.0,1.0,0.0}; | ||
| dir[] = {0.0,0.0,0.0}; | ||
| pos[] = {0.0,0.0,0.0}; | ||
| }; | ||
| }; | ||
| class StageTI | ||
| { | ||
| texture = "a3\data_f\default_vehicle_ti_ca.paa"; | ||
| }; | ||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should be 0,0,1, it's a matrix.
it's wrong everywhere -.-