Skip to content

Commit c3715c2

Browse files
ChrSacherChrSacher
authored
Merge pull request #147 from unitedoperations/dev
Dev to Master 1.0.8
2 parents 7c1dc1e + 9ee8f6d commit c3715c2

File tree

198 files changed

+3758
-4657
lines changed

Some content is hidden

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

198 files changed

+3758
-4657
lines changed

‎CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file.
33
The version number refer to VERSION define in script_mod.
44
The date refers to the date when changes have been merged into DEV branch.
55

6+
7+
## [1.0.8]
8+
### Added
9+
- PID Card System in the Briefing System
10+
- Added Virtual Firemission System from Tinfoil
11+
- Respawn Zones
12+
### Changed
13+
### Fixed
14+
- Endscreen not displaying casualties
15+
### Removed
16+
617
## [1.0.7]
718
### Added
819
- ACRE Vehicle Rack Preset now selectable

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<p align="center">
22
<a href="https://github.com/unitedoperations/UnitedOperationsFramework/releases">
3-
<img src="https://img.shields.io/badge/Version-1.0.7-blue.svg?style=flat-square" alt="Olsen Framework Version">
3+
4+
<img src="https://img.shields.io/badge/Version-1.0.8-blue.svg?style=flat-square" alt="UOFW Framework Version">
5+
46
</a>
57
<a href="https://github.com/unitedoperations/UnitedOperationsFramework/">
68
<img src="https://img.shields.io/github/issues/UnitedOperations/UnitedOperationsFramework.svg?style=flat-square" alt="Framework Issues">

‎uo_sys_framework/AOLimitModule/cfgFunctions/common/fn_Init.sqf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ EXEC_CHECK(CLIENT);
9797
SETMVAR(Display,_outSide);
9898
};
9999
} else {
100-
LOG("unit outside area");
100+
// LOG("unit outside area");
101101
if ((!(_startedInside) && {(_enteredZone)}) || {(_startedInside)}) then {
102-
LOG("unit outside area 2");
102+
// LOG("unit outside area 2");
103103
_outSide = true;
104104
_argNested set [3,_outSide];
105105
if !(_softAOMode) then {
@@ -129,9 +129,9 @@ EXEC_CHECK(CLIENT);
129129
SETMVAR(Display,_outSide);
130130
};
131131
} else {
132-
LOG("unit outside area b");
132+
// LOG("unit outside area b");
133133
if ((!(_startedInside) && {(_enteredZone)}) || {(_startedInside)}) then {
134-
LOG("unit outside area b 2");
134+
// LOG("unit outside area b 2");
135135
_outSide = true;
136136
_argNested set [3,_outSide];
137137
if !(_softAOMode) then {

‎uo_sys_framework/BriefingModule/cfg3DEN/Briefing/BluforMenu.hpp‎

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -654,3 +654,158 @@ class EGVAR(Briefing,Appendix_BLUFOR) {
654654
};
655655
};
656656
};
657+
658+
class EGVAR(Briefing,PID_Blufor) {
659+
displayName = "PID Cards";
660+
collapsed = 1;
661+
class Attributes {
662+
class EGVAR(Briefing,PID_Enabled_Blufor) {
663+
property = QEGVAR(Briefing,PID_Enabled_Blufor);
664+
displayName = "Enable PID Cards";
665+
tooltip = "Enables PID cards in the briefing";
666+
control = "CheckboxState";
667+
expression = SCENARIO_EXPRESSION;
668+
defaultValue = "false";
669+
};
670+
class EGVAR(Briefing,FriendlyPIDCardDescription_Blufor) {
671+
property = QEGVAR(Briefing,FriendlyPIDCardDescription_Blufor);
672+
displayName = "Friendly Forces Description";
673+
tooltip = "Additional information about the friendly forces to be displayed";
674+
control = "Edit";
675+
validate = "STRING";
676+
expression = SCENARIO_EXPRESSION;
677+
defaultValue = "''";
678+
};
679+
class EGVAR(Briefing,FriendlyPIDCardPath_Blufor) {
680+
property = QEGVAR(Briefing,FriendlyPIDCardPath_Blufor);
681+
displayName = "Friendly Forces Path";
682+
tooltip = "Path to PID Card for friendly forces in the mission folder";
683+
control = "Edit";
684+
validate = "STRING";
685+
expression = SCENARIO_EXPRESSION;
686+
defaultValue = "''";
687+
};
688+
// class EGVAR(Briefing,FriendlyPIDCard_Blufor) {
689+
// displayName = "Friendly Forces PID Card";
690+
// tooltip = "PID card for friendly forces";
691+
// property = QEGVAR(Briefing,FriendlyPIDCard_Blufor);
692+
// control = QEGVAR(Briefing,PIDCardSelectionAttribute);
693+
// typeName = "STRING";
694+
// expression = SCENARIO_EXPRESSION;
695+
// defaultValue = "'None'";
696+
// };
697+
698+
class EGVAR(Briefing,EnemyPIDCardDescription_Blufor) {
699+
property = QEGVAR(Briefing,EnemyPIDCardDescription_Blufor);
700+
displayName = "Enemy Forces Description";
701+
tooltip = "Additional information about the enemy forces to be displayed";
702+
control = "Edit";
703+
validate = "STRING";
704+
expression = SCENARIO_EXPRESSION;
705+
defaultValue = "''";
706+
};
707+
class EGVAR(Briefing,EnemyPIDCardPath_Blufor) {
708+
property = QEGVAR(Briefing,EnemyPIDCardPath_Blufor);
709+
displayName = "Enemy Forces Path";
710+
tooltip = "Path to PID Card for enemy forces in the mission folder";
711+
control = "Edit";
712+
validate = "STRING";
713+
expression = SCENARIO_EXPRESSION;
714+
defaultValue = "''";
715+
};
716+
// class EGVAR(Briefing,EnemyPIDCard_Blufor) {
717+
// displayName = "Enemy Forces PID Card";
718+
// tooltip = "PID Card for Enemy Forces";
719+
// property = QEGVAR(Briefing,EnemyPIDCard_Blufor);
720+
// control = QEGVAR(Briefing,PIDCardSelectionAttribute);
721+
// typeName = "STRING";
722+
// expression = SCENARIO_EXPRESSION;
723+
// defaultValue = "'None'";
724+
// };
725+
726+
class EGVAR(Briefing,AdditionalPIDCardDescription_Blufor) {
727+
property = QEGVAR(Briefing,AdditionalPIDCardDescription_Blufor);
728+
displayName = "Additional Forces Description";
729+
tooltip = "Additional information about the additional forces to be displayed";
730+
control = "Edit";
731+
validate = "STRING";
732+
expression = SCENARIO_EXPRESSION;
733+
defaultValue = "''";
734+
};
735+
class EGVAR(Briefing,AdditionalPIDCardPath_Blufor) {
736+
property = QEGVAR(Briefing,AdditionalPIDCardPath_Blufor);
737+
displayName = "Additional Forces Path";
738+
tooltip = "Path to PID Card for additional forces in the mission folder";
739+
control = "Edit";
740+
validate = "STRING";
741+
expression = SCENARIO_EXPRESSION;
742+
defaultValue = "''";
743+
};
744+
// class EGVAR(Briefing,AdditionalPIDCard_Blufor) {
745+
// displayName = "Additional Forces PID Card";
746+
// tooltip = "PID Card for additional forces";
747+
// property = QEGVAR(Briefing,AdditionalPIDCard_Blufor);
748+
// control = QEGVAR(Briefing,PIDCardSelectionAttribute);
749+
// typeName = "STRING";
750+
// expression = SCENARIO_EXPRESSION;
751+
// defaultValue = "'None'";
752+
// };
753+
754+
class EGVAR(Briefing,CivilianPIDCardDescription_Blufor) {
755+
property = QEGVAR(Briefing,CivilianPIDCardDescription_Blufor);
756+
displayName = "Civilian Forces Description";
757+
tooltip = "Civilian information about the civilian forces to be displayed";
758+
control = "Edit";
759+
validate = "STRING";
760+
expression = SCENARIO_EXPRESSION;
761+
defaultValue = "''";
762+
};
763+
class EGVAR(Briefing,CivilianPIDCardPath_Blufor) {
764+
property = QEGVAR(Briefing,CivilianPIDCardPath_Blufor);
765+
displayName = "Civilian Forces Path";
766+
tooltip = "Path to PID card for civilian forces in the mission folder";
767+
control = "Edit";
768+
validate = "STRING";
769+
expression = SCENARIO_EXPRESSION;
770+
defaultValue = "''";
771+
};
772+
// class EGVAR(Briefing,CivilianPIDCard_Blufor) {
773+
// displayName = "Civilian Forces PID Card";
774+
// tooltip = "PID card for civilian forces";
775+
// property = QEGVAR(Briefing,CivilianPIDCard_Blufor);
776+
// control = QEGVAR(Briefing,PIDCardSelectionAttribute);
777+
// typeName = "STRING";
778+
// expression = SCENARIO_EXPRESSION;
779+
// defaultValue = "'None'";
780+
// };
781+
782+
class EGVAR(Briefing,HVTPIDCardDescription_Blufor) {
783+
property = QEGVAR(Briefing,HVTPIDCardDescription_Blufor);
784+
displayName = "HVT Description";
785+
tooltip = "Additional information about the HVT to be displayed";
786+
control = "Edit";
787+
validate = "STRING";
788+
expression = SCENARIO_EXPRESSION;
789+
defaultValue = "''";
790+
};
791+
class EGVAR(Briefing,HVTPIDCardPath_Blufor) {
792+
property = QEGVAR(Briefing,HVTPIDCardPath_Blufor);
793+
displayName = "HVT Path";
794+
tooltip = "Path to PID card for HVT in the mission folder";
795+
control = "Edit";
796+
validate = "STRING";
797+
expression = SCENARIO_EXPRESSION;
798+
defaultValue = "''";
799+
};
800+
// class EGVAR(Briefing,HVTPIDCard_Blufor) {
801+
// displayName = "HVT PID Card";
802+
// tooltip = "PID card for HVT";
803+
// property = QEGVAR(Briefing,HVTPIDCard_Blufor);
804+
// control = QEGVAR(Briefing,PIDCardSelectionAttribute);
805+
// typeName = "STRING";
806+
// expression = SCENARIO_EXPRESSION;
807+
// defaultValue = "'None'";
808+
// };
809+
};
810+
};
811+

‎uo_sys_framework/BriefingModule/cfg3DEN/Briefing/CivMenu.hpp‎

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -654,3 +654,157 @@ class EGVAR(Briefing,Appendix_Civ) {
654654
};
655655
};
656656
};
657+
658+
class EGVAR(Briefing,PID_Civfor) {
659+
displayName = "PID Cards";
660+
collapsed = 1;
661+
class Attributes {
662+
class EGVAR(Briefing,PID_Enabled_Civfor) {
663+
property = QEGVAR(Briefing,PID_Enabled_Civfor);
664+
displayName = "Enable PID Cards";
665+
tooltip = "Enables PID cards in the briefing";
666+
control = "CheckboxState";
667+
expression = SCENARIO_EXPRESSION;
668+
defaultValue = "false";
669+
};
670+
class EGVAR(Briefing,FriendlyPIDCardDescription_Civfor) {
671+
property = QEGVAR(Briefing,FriendlyPIDCardDescription_Civfor);
672+
displayName = "Friendly Forces Description";
673+
tooltip = "Additional information about the friendly forces to be displayed";
674+
control = "Edit";
675+
validate = "STRING";
676+
expression = SCENARIO_EXPRESSION;
677+
defaultValue = "''";
678+
};
679+
class EGVAR(Briefing,FriendlyPIDCardPath_Civfor) {
680+
property = QEGVAR(Briefing,FriendlyPIDCardPath_Civfor);
681+
displayName = "Friendly Forces Path";
682+
tooltip = "Path to PID Card for friendly forces in the mission folder";
683+
control = "Edit";
684+
validate = "STRING";
685+
expression = SCENARIO_EXPRESSION;
686+
defaultValue = "''";
687+
};
688+
// class EGVAR(Briefing,FriendlyPIDCard_Civfor) {
689+
// displayName = "Friendly Forces PID Card";
690+
// tooltip = "PID card for friendly forces";
691+
// property = QEGVAR(Briefing,FriendlyPIDCard_Civfor);
692+
// control = QEGVAR(Briefing,PIDCardSelectionAttribute);
693+
// typeName = "STRING";
694+
// expression = SCENARIO_EXPRESSION;
695+
// defaultValue = "'None'";
696+
// };
697+
698+
class EGVAR(Briefing,EnemyPIDCardDescription_Civfor) {
699+
property = QEGVAR(Briefing,EnemyPIDCardDescription_Civfor);
700+
displayName = "Enemy Forces Description";
701+
tooltip = "Additional information about the enemy forces to be displayed";
702+
control = "Edit";
703+
validate = "STRING";
704+
expression = SCENARIO_EXPRESSION;
705+
defaultValue = "''";
706+
};
707+
class EGVAR(Briefing,EnemyPIDCardPath_Civfor) {
708+
property = QEGVAR(Briefing,EnemyPIDCardPath_Civfor);
709+
displayName = "Enemy Forces Path";
710+
tooltip = "Path to PID Card for enemy forces in the mission folder";
711+
control = "Edit";
712+
validate = "STRING";
713+
expression = SCENARIO_EXPRESSION;
714+
defaultValue = "''";
715+
};
716+
// class EGVAR(Briefing,EnemyPIDCard_Civfor) {
717+
// displayName = "Enemy Forces PID Card";
718+
// tooltip = "PID Card for Enemy Forces";
719+
// property = QEGVAR(Briefing,EnemyPIDCard_Civfor);
720+
// control = QEGVAR(Briefing,PIDCardSelectionAttribute);
721+
// typeName = "STRING";
722+
// expression = SCENARIO_EXPRESSION;
723+
// defaultValue = "'None'";
724+
// };
725+
726+
class EGVAR(Briefing,AdditionalPIDCardDescription_Civfor) {
727+
property = QEGVAR(Briefing,AdditionalPIDCardDescription_Civfor);
728+
displayName = "Additional Forces Description";
729+
tooltip = "Additional information about the additional forces to be displayed";
730+
control = "Edit";
731+
validate = "STRING";
732+
expression = SCENARIO_EXPRESSION;
733+
defaultValue = "''";
734+
};
735+
class EGVAR(Briefing,AdditionalPIDCardPath_Civfor) {
736+
property = QEGVAR(Briefing,AdditionalPIDCardPath_Civfor);
737+
displayName = "Additional Forces Path";
738+
tooltip = "Path to PID Card for additional forces in the mission folder";
739+
control = "Edit";
740+
validate = "STRING";
741+
expression = SCENARIO_EXPRESSION;
742+
defaultValue = "''";
743+
};
744+
// class EGVAR(Briefing,AdditionalPIDCard_Civfor) {
745+
// displayName = "Additional Forces PID Card";
746+
// tooltip = "PID Card for additional forces";
747+
// property = QEGVAR(Briefing,AdditionalPIDCard_Civfor);
748+
// control = QEGVAR(Briefing,PIDCardSelectionAttribute);
749+
// typeName = "STRING";
750+
// expression = SCENARIO_EXPRESSION;
751+
// defaultValue = "'None'";
752+
// };
753+
754+
class EGVAR(Briefing,CivilianPIDCardDescription_Civfor) {
755+
property = QEGVAR(Briefing,CivilianPIDCardDescription_Civfor);
756+
displayName = "Civilian Forces Description";
757+
tooltip = "Civilian information about the civilian forces to be displayed";
758+
control = "Edit";
759+
validate = "STRING";
760+
expression = SCENARIO_EXPRESSION;
761+
defaultValue = "''";
762+
};
763+
class EGVAR(Briefing,CivilianPIDCardPath_Civfor) {
764+
property = QEGVAR(Briefing,CivilianPIDCardPath_Civfor);
765+
displayName = "Civilian Forces Path";
766+
tooltip = "Path to PID card for civilian forces in the mission folder";
767+
control = "Edit";
768+
validate = "STRING";
769+
expression = SCENARIO_EXPRESSION;
770+
defaultValue = "''";
771+
};
772+
// class EGVAR(Briefing,CivilianPIDCard_Civfor) {
773+
// displayName = "Civilian Forces PID Card";
774+
// tooltip = "PID card for civilian forces";
775+
// property = QEGVAR(Briefing,CivilianPIDCard_Civfor);
776+
// control = QEGVAR(Briefing,PIDCardSelectionAttribute);
777+
// typeName = "STRING";
778+
// expression = SCENARIO_EXPRESSION;
779+
// defaultValue = "'None'";
780+
// };
781+
782+
class EGVAR(Briefing,HVTPIDCardDescription_Civfor) {
783+
property = QEGVAR(Briefing,HVTPIDCardDescription_Civfor);
784+
displayName = "HVT Description";
785+
tooltip = "Additional information about the HVT to be displayed";
786+
control = "Edit";
787+
validate = "STRING";
788+
expression = SCENARIO_EXPRESSION;
789+
defaultValue = "''";
790+
};
791+
class EGVAR(Briefing,HVTPIDCardPath_Civfor) {
792+
property = QEGVAR(Briefing,HVTPIDCardPath_Civfor);
793+
displayName = "HVT Path";
794+
tooltip = "Path to PID card for HVT in the mission folder";
795+
control = "Edit";
796+
validate = "STRING";
797+
expression = SCENARIO_EXPRESSION;
798+
defaultValue = "''";
799+
};
800+
// class EGVAR(Briefing,HVTPIDCard_Civfor) {
801+
// displayName = "HVT PID Card";
802+
// tooltip = "PID card for HVT";
803+
// property = QEGVAR(Briefing,HVTPIDCard_Civfor);
804+
// control = QEGVAR(Briefing,PIDCardSelectionAttribute);
805+
// typeName = "STRING";
806+
// expression = SCENARIO_EXPRESSION;
807+
// defaultValue = "'None'";
808+
// };
809+
};
810+
};

0 commit comments

Comments
 (0)