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

[Release] Stage 1.5.1 #137

Merged
merged 26 commits into from
Jan 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
1b77e06
[Chore] Update Release GitHub Action (#96)
dgibso29 Jan 22, 2022
b0b916f
fixed ending dialog population breaking on double defined entries (#98)
Joecuronium Jan 27, 2022
a18c11b
[Add] - Visible framework version (#99)
Bubbus Jan 29, 2022
397d374
[Feature] - Add Gearscript ACE gun-bag support. (#102)
Bubbus Apr 12, 2022
0a0bec0
[Feature] - Disable ACE advanced car damage by default. (#105)
Bubbus Apr 13, 2022
218d4c7
[Feature] - Improve ceasefire side relations (#101)
Cre8or Apr 13, 2022
b3aab6e
Update pull_request_template.md
dgibso29 Jun 13, 2022
7fc6f53
[Improve] Overhauled default medical settings (#108)
Joecuronium Jun 14, 2022
c0a68a9
[FIX] Zeus being unable to properly update crate gear via module (#111)
Joecuronium Jun 14, 2022
f9cb440
Fixed default BLUFOR and INDFOR loadouts so PCMLs in crates are loade…
Joecuronium Jun 14, 2022
22873ee
[Improve Gearscript] Resupply crates now have space to drop stuff (#109)
Joecuronium Jun 14, 2022
4986865
Update readme.md
dgibso29 Jun 20, 2022
ca7111e
Fixed Fatal damage source (#112)
Joecuronium Jun 26, 2022
4724501
Update gear_blufor.sqf (#115)
Joecuronium Jul 12, 2022
b09fdf0
Changed default vehicle lock to "Locked for players" for framework sp…
Joecuronium Sep 19, 2022
9c5aa10
[Bugfix] Compatibility for new ACE gearstrings (#120)
Joecuronium Oct 11, 2022
0b99ede
[Update] Add new default addon settings. (#122)
Bubbus Oct 11, 2022
32d756a
[Chore] Release 1.4.2 Hotfix -> Dev (#126)
dgibso29 Oct 11, 2022
8ff70b3
[Improve] Fix PAK Stitch Exploit Pending ACE PR Merge (#128)
dgibso29 Oct 16, 2022
77c93cf
[Chore] Update Medical Setting CBA Presets (#127)
dgibso29 Oct 16, 2022
eaac075
Update zen_modules.sqf (#134)
dgibso29 Nov 30, 2022
238ef47
[Refactor] - New respawn system. (#135)
Bubbus Dec 11, 2022
5608f8f
Merge remote-tracking branch 'remotes/origin/release' into develop
Bubbus Dec 11, 2022
ccb6fda
Re-added addon defaults which were introduced in 11895c92373ba19307e8…
Bubbus Jan 1, 2023
9f8d554
Removed stray chat/console debug statements.
Bubbus Jan 1, 2023
5cd1dd0
Merge remote-tracking branch 'remotes/origin/release' into develop
Bubbus Jan 1, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions components/respawn/fn_createRedeployObject.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

params [["_object", nil, [objNull]], ["_target", missionNamespace], ["_respawnName", "", [""]], ["_condition", "true", [""]]];

diag_log "WOWEE 1";
diag_log str _this;

if (isNull _object) exitWith {};

if (isServer) then
Expand Down Expand Up @@ -35,9 +32,6 @@ CLIENT_ONLY;
{
params ["_object", "_target", "_respawnName", "_condition"];

diag_log "WOWEE 2";
diag_log str _this;

_object addAction
[
"Redeploy to new location",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,3 @@ while {true} do
};

};

systemChat "run thru";
150 changes: 145 additions & 5 deletions mission.sqm
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ class EditorData
class Camera
{
pos[]={178.00185,82.294258,80.690353};
dir[]={0.47211882,-0.53882009,0.69769388};
up[]={0.30197152,0.84242088,0.44625136};
aside[]={0.82820106,-1.4901161e-008,-0.56043106};
dir[]={0.29152194,-0.48410493,0.82502103};
up[]={0.16128644,0.87500936,0.45644826};
aside[]={0.94287199,-6.2340405e-008,-0.33316392};
};
};
binarizationWanted=0;
Expand Down Expand Up @@ -224,7 +224,7 @@ class CustomAttributes
singleType="ARRAY";
class value
{
items=135;
items=139;
class Item0
{
class data
Expand Down Expand Up @@ -1305,6 +1305,38 @@ class CustomAttributes
value="zhc_dynsim_override";
};
};
class Item135
{
class data
{
singleType="STRING";
value="ims_bluntweapon";
};
};
class Item136
{
class data
{
singleType="STRING";
value="ace_marker_flags_placeanywhere";
};
};
class Item137
{
class data
{
singleType="STRING";
value="ace_overheating_cookoffcoef";
};
};
class Item138
{
class data
{
singleType="STRING";
value="ace_vehicle_damage_enabled";
};
};
};
};
};
Expand All @@ -1315,7 +1347,7 @@ class CustomAttributes
singleType="ARRAY";
class value
{
items=135;
items=139;
class Item0
{
class data
Expand Down Expand Up @@ -4961,6 +4993,114 @@ class CustomAttributes
};
};
};
class Item135
{
class data
{
singleType="ARRAY";
class value
{
items=2;
class Item0
{
class data
{
singleType="BOOL";
value=1;
};
};
class Item1
{
class data
{
singleType="SCALAR";
value=1;
};
};
};
};
};
class Item136
{
class data
{
singleType="ARRAY";
class value
{
items=2;
class Item0
{
class data
{
singleType="BOOL";
value=1;
};
};
class Item1
{
class data
{
singleType="SCALAR";
value=1;
};
};
};
};
};
class Item137
{
class data
{
singleType="ARRAY";
class value
{
items=2;
class Item0
{
class data
{
singleType="SCALAR";
value=0;
};
};
class Item1
{
class data
{
singleType="SCALAR";
value=1;
};
};
};
};
};
class Item138
{
class data
{
singleType="ARRAY";
class value
{
items=2;
class Item0
{
class data
{
singleType="BOOL";
value=1;
};
};
class Item1
{
class data
{
singleType="SCALAR";
value=1;
};
};
};
};
};
};
};
};
Expand Down