Skip to content

Commit 26ca6d2

Browse files
WyqerWyqer
authored
Merge pull request #561 from KillahPotatoes/v0.97S9
Merge v0.97 Sprint 9
2 parents 2db5b63 + 5cbbec4 commit 26ca6d2

File tree

148 files changed

+7185
-3050
lines changed

Some content is hidden

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

148 files changed

+7185
-3050
lines changed

‎.vscode/settings.json‎

Lines changed: 201 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,40 +12,230 @@
1212
"BIS_fnc_reviveInit",
1313
"CBA_Settings_fnc_init",
1414
"KPLIB_eden_boxspawn",
15-
"KPLIB_eden_startbase",
1615
"KPLIB_eden_potatospawn",
16+
"KPLIB_eden_startbase",
1717
"KPLIB_param_arsenalType",
1818
"KPLIB_param_clearVehicleCargo",
19+
"KPLIB_param_commanderZeusMode",
1920
"KPLIB_param_copyDistance",
21+
"KPLIB_param_crateVolume",
2022
"KPLIB_param_debug",
2123
"KPLIB_param_fobRange",
24+
"KPLIB_param_limitedZeusCeiling",
25+
"KPLIB_param_limitedZeusRadius",
2226
"KPLIB_param_mobileRespawn",
2327
"KPLIB_param_presetArsenal",
24-
"KPLIB_param_presetF",
28+
"KPLIB_param_presetC",
2529
"KPLIB_param_presetE",
30+
"KPLIB_param_presetF",
2631
"KPLIB_param_presetR",
27-
"KPLIB_param_presetC",
28-
"KPLIB_param_reviveMode",
32+
"KPLIB_param_reviveBleedOutDuration",
2933
"KPLIB_param_reviveDuration",
30-
"KPLIB_param_reviveRequiredTrait",
34+
"KPLIB_param_reviveForceRespawnDuration",
3135
"KPLIB_param_reviveMedicSpeedMultiplier",
36+
"KPLIB_param_reviveMode",
3237
"KPLIB_param_reviveRequiredItems",
38+
"KPLIB_param_reviveRequiredTrait",
3339
"KPLIB_param_reviveUnconsciousStateMode",
34-
"KPLIB_param_reviveBleedOutDuration",
35-
"KPLIB_param_reviveForceRespawnDuration",
3640
"KPLIB_param_saveInterval",
3741
"KPLIB_param_sectorActRange",
3842
"KPLIB_param_sectorCap",
3943
"KPLIB_param_sectorCapRange",
4044
"KPLIB_param_stamina",
41-
"KPLIB_param_commanderZeusMode",
4245
"KPLIB_param_subCommanderZeusMode",
43-
"KPLIB_param_limitedZeusRadius",
44-
"KPLIB_param_limitedZeusCeiling",
46+
"KPLIB_param_timeMulti",
4547
"KPLIB_param_zeusFobIcons",
4648
"KPLIB_param_zeusLocationIcons",
47-
"KPLIB_param_timeMulti",
49+
"KPLIB_param_permission",
4850
"KPLIB_plm_groups",
51+
"KPLIB_preset_addBoatE",
52+
"KPLIB_preset_addBoatF",
53+
"KPLIB_preset_addHeliE",
54+
"KPLIB_preset_addHeliF",
55+
"KPLIB_preset_airBuildingE",
56+
"KPLIB_preset_airBuildingF",
57+
"KPLIB_preset_alphabetE",
58+
"KPLIB_preset_alphabetF",
59+
"KPLIB_preset_arsenalBoxE",
60+
"KPLIB_preset_arsenalBoxF",
61+
"KPLIB_preset_boatsE",
62+
"KPLIB_preset_boatsF",
63+
"KPLIB_preset_boatsPlE",
64+
"KPLIB_preset_boatsPlF",
65+
"KPLIB_preset_crateAmmoE",
66+
"KPLIB_preset_crateAmmoF",
67+
"KPLIB_preset_crateFuelE",
68+
"KPLIB_preset_crateFuelF",
69+
"KPLIB_preset_crateSupplyE",
70+
"KPLIB_preset_crateSupplyF",
71+
"KPLIB_preset_decoE",
72+
"KPLIB_preset_decoF",
73+
"KPLIB_preset_decoPlE",
74+
"KPLIB_preset_decoPlF",
75+
"KPLIB_preset_fobBoxE",
76+
"KPLIB_preset_fobBoxF",
77+
"KPLIB_preset_fobBuildingE",
78+
"KPLIB_preset_fobBuildingF",
79+
"KPLIB_preset_fobTruckE",
80+
"KPLIB_preset_fobTruckF",
81+
"KPLIB_preset_heliAttackE",
82+
"KPLIB_preset_heliAttackF",
83+
"KPLIB_preset_heliAttackPlE",
84+
"KPLIB_preset_heliAttackPlF",
85+
"KPLIB_preset_heliTransE",
86+
"KPLIB_preset_heliTransF",
87+
"KPLIB_preset_heliTransPlC",
88+
"KPLIB_preset_heliTransPlE",
89+
"KPLIB_preset_heliTransPlF",
90+
"KPLIB_preset_jetsE",
91+
"KPLIB_preset_jetsF",
92+
"KPLIB_preset_jetsPlE",
93+
"KPLIB_preset_jetsPlF",
94+
"KPLIB_preset_lockedVehPlF",
95+
"KPLIB_preset_logiBuildingE",
96+
"KPLIB_preset_logiBuildingF",
97+
"KPLIB_preset_logiTruckE",
98+
"KPLIB_preset_logiTruckF",
99+
"KPLIB_preset_logisticE",
100+
"KPLIB_preset_logisticF",
101+
"KPLIB_preset_logisticPlC",
102+
"KPLIB_preset_logisticPlE",
103+
"KPLIB_preset_logisticPlF",
104+
"KPLIB_preset_mortarE",
105+
"KPLIB_preset_mortarF",
106+
"KPLIB_preset_nameE",
107+
"KPLIB_preset_nameF",
108+
"KPLIB_preset_planeTransE",
109+
"KPLIB_preset_planeTransF",
110+
"KPLIB_preset_planeTransPlC",
111+
"KPLIB_preset_planeTransPlE",
112+
"KPLIB_preset_planeTransPlF",
113+
"KPLIB_preset_potatoE",
114+
"KPLIB_preset_potatoF",
115+
"KPLIB_preset_respawnTruckE",
116+
"KPLIB_preset_respawnTruckF",
117+
"KPLIB_preset_rsAntiAirE",
118+
"KPLIB_preset_rsAntiAirF",
119+
"KPLIB_preset_rsAntiTankE",
120+
"KPLIB_preset_rsAntiTankF",
121+
"KPLIB_preset_rsAutorifleManE",
122+
"KPLIB_preset_rsAutorifleManF",
123+
"KPLIB_preset_rsCrewmanHeliE",
124+
"KPLIB_preset_rsCrewmanHeliF",
125+
"KPLIB_preset_rsCrewmanVehE",
126+
"KPLIB_preset_rsCrewmanVehF",
127+
"KPLIB_preset_rsEngineerE",
128+
"KPLIB_preset_rsEngineerF",
129+
"KPLIB_preset_rsGrenadierE",
130+
"KPLIB_preset_rsGrenadierF",
131+
"KPLIB_preset_rsHeavyGunnerE",
132+
"KPLIB_preset_rsHeavyGunnerF",
133+
"KPLIB_preset_rsLightAtE",
134+
"KPLIB_preset_rsLightAtF",
135+
"KPLIB_preset_rsMarksmanE",
136+
"KPLIB_preset_rsMarksmanF",
137+
"KPLIB_preset_rsMedicE",
138+
"KPLIB_preset_rsMedicF",
139+
"KPLIB_preset_rsOfficerE",
140+
"KPLIB_preset_rsOfficerF",
141+
"KPLIB_preset_rsParatrooperE",
142+
"KPLIB_preset_rsParatrooperF",
143+
"KPLIB_preset_rsPilotHeliE",
144+
"KPLIB_preset_rsPilotHeliF",
145+
"KPLIB_preset_rsPilotJetE",
146+
"KPLIB_preset_rsPilotJetF",
147+
"KPLIB_preset_rsRiflemanE",
148+
"KPLIB_preset_rsRiflemanF",
149+
"KPLIB_preset_rsSharpshooterE",
150+
"KPLIB_preset_rsSharpshooterF",
151+
"KPLIB_preset_rsSquadLeaderE",
152+
"KPLIB_preset_rsSquadLeaderF",
153+
"KPLIB_preset_rsSurvivorE",
154+
"KPLIB_preset_rsSurvivorF",
155+
"KPLIB_preset_rsTeamLeaderE",
156+
"KPLIB_preset_rsTeamLeaderF",
157+
"KPLIB_preset_sfDiverE",
158+
"KPLIB_preset_sfDiverF",
159+
"KPLIB_preset_sfExplosiveE",
160+
"KPLIB_preset_sfExplosiveF",
161+
"KPLIB_preset_sfLightAtE",
162+
"KPLIB_preset_sfLightAtF",
163+
"KPLIB_preset_sfMarksmanE",
164+
"KPLIB_preset_sfMarksmanF",
165+
"KPLIB_preset_sfMedicE",
166+
"KPLIB_preset_sfMedicF",
167+
"KPLIB_preset_sfRiflemanE",
168+
"KPLIB_preset_sfRiflemanF",
169+
"KPLIB_preset_sfSharpshooterE",
170+
"KPLIB_preset_sfSharpshooterF",
171+
"KPLIB_preset_sfSniperE",
172+
"KPLIB_preset_sfSniperF",
173+
"KPLIB_preset_sfSpotterE",
174+
"KPLIB_preset_sfSpotterF",
175+
"KPLIB_preset_sfTeamLeaderE",
176+
"KPLIB_preset_sfTeamLeaderF",
177+
"KPLIB_preset_slotHeliE",
178+
"KPLIB_preset_slotHeliF",
179+
"KPLIB_preset_slotJetE",
180+
"KPLIB_preset_slotJetF",
181+
"KPLIB_preset_specOpsE",
182+
"KPLIB_preset_specOpsF",
183+
"KPLIB_preset_specOpsPlE",
184+
"KPLIB_preset_specOpsPlF",
185+
"KPLIB_preset_staticAaBigE",
186+
"KPLIB_preset_staticAaBigF",
187+
"KPLIB_preset_staticAaBigRadarE",
188+
"KPLIB_preset_staticAaBigRadarF",
189+
"KPLIB_preset_staticAaE",
190+
"KPLIB_preset_staticAaF",
191+
"KPLIB_preset_staticAtE",
192+
"KPLIB_preset_staticAtF",
193+
"KPLIB_preset_staticsE",
194+
"KPLIB_preset_staticsF",
195+
"KPLIB_preset_staticsPlE",
196+
"KPLIB_preset_staticsPlF",
197+
"KPLIB_preset_storageLargeE",
198+
"KPLIB_preset_storageLargeF",
199+
"KPLIB_preset_storageSmallE",
200+
"KPLIB_preset_storageSmallF",
201+
"KPLIB_preset_unitsE",
202+
"KPLIB_preset_unitsF",
203+
"KPLIB_preset_unitsPlC",
204+
"KPLIB_preset_unitsPlE",
205+
"KPLIB_preset_unitsPlF",
206+
"KPLIB_preset_unitsPlR",
207+
"KPLIB_preset_vehAntiAirE",
208+
"KPLIB_preset_vehAntiAirF",
209+
"KPLIB_preset_vehAntiAirPlE",
210+
"KPLIB_preset_vehAntiAirPlF",
211+
"KPLIB_preset_vehArtyE",
212+
"KPLIB_preset_vehArtyF",
213+
"KPLIB_preset_vehArtyPlE",
214+
"KPLIB_preset_vehArtyPlF",
215+
"KPLIB_preset_vehHeavyApcE",
216+
"KPLIB_preset_vehHeavyApcF",
217+
"KPLIB_preset_vehHeavyApcPlE",
218+
"KPLIB_preset_vehHeavyApcPlF",
219+
"KPLIB_preset_vehHeavyE",
220+
"KPLIB_preset_vehHeavyF",
221+
"KPLIB_preset_vehHeavyPlE",
222+
"KPLIB_preset_vehHeavyPlF",
223+
"KPLIB_preset_vehLightArmedE",
224+
"KPLIB_preset_vehLightArmedF",
225+
"KPLIB_preset_vehLightArmedPlE",
226+
"KPLIB_preset_vehLightArmedPlF",
227+
"KPLIB_preset_vehLightArmedPlR",
228+
"KPLIB_preset_vehLightUnarmedE",
229+
"KPLIB_preset_vehLightUnarmedF",
230+
"KPLIB_preset_vehLightUnarmedPlC",
231+
"KPLIB_preset_vehLightUnarmedPlE",
232+
"KPLIB_preset_vehLightUnarmedPlF",
233+
"KPLIB_preset_vehTransE",
234+
"KPLIB_preset_vehTransF",
235+
"KPLIB_preset_vehTransPlC",
236+
"KPLIB_preset_vehTransPlE",
237+
"KPLIB_preset_vehTransPlF",
238+
"KPLIB_preset_vehTransPlR",
49239
"KPR_fnc_getPlaytime",
50240
"KPR_fnc_getRankName",
51241
"KPR_fnc_getScore",

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Changelog
22

33
## 0.97.0 (in Development)
4-
* **Fully rewritten the mission code from scratch.**
4+
* **Fully rewritten the mission code from scratch.** (Details in the [Dev-Blogs](https://github.com/KillahPotatoes/KP-Liberation/issues?utf8=%E2%9C%93&q=label%3Adev-blog))
55
* Added: Functions library via CfgFunctions.
66
* Added: Admin dialog with various functionalities for server admins.
77
* Added: Free camera view for building.

‎Missionframework/KPGUI/KPGUI_classes.hpp‎

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
File: KPGUI_classes.hpp
55
Author: Wyqer - https://github.com/KillahPotatoes
66
Date: 2018-09-13
7-
Last Update: 2018-11-10
7+
Last Update: 2018-12-14
8+
89
License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
910
1011
Description:
@@ -35,8 +36,7 @@
3536
*/
3637

3738
// Scrollbar
38-
class KPGUI_PRE_ScrollBar
39-
{
39+
class KPGUI_PRE_ScrollBar {
4040
color[] = {1, 1, 1, 0.6};
4141
colorActive[] = {1, 1, 1, 1};
4242
colorDisabled[] = {1, 1, 1, 0.3};
@@ -86,7 +86,7 @@ class KPGUI_PRE_CloseCross {
8686
fade = 0;
8787
access = 0;
8888
type = 11;
89-
style = 48;
89+
style = 48 + 2048;
9090
color[] = {1, 1, 1, 0.75};
9191
colorBackground[] = {0, 0, 0, 0};
9292
colorText[] = {1, 1, 1, 0.75};
@@ -114,6 +114,13 @@ class KPGUI_PRE_CloseCross {
114114
action = "closeDialog 0";
115115
};
116116

117+
// Help or version info icon
118+
class KPGUI_PRE_VersionIcon: KPGUI_PRE_CloseCross {
119+
text = "\A3\Ui_f\data\Map\Markers\Military\unknown_CA.paa";
120+
tooltip = "";
121+
action = "";
122+
}
123+
117124
// General background for the dialog area
118125
class KPGUI_PRE_Background {
119126
deletable = 0;
@@ -214,6 +221,11 @@ class KPGUI_PRE_ActivePicture: KPGUI_PRE_ActiveText {
214221
style = 48;
215222
};
216223

224+
// Active Picture which keeps aspect ratio
225+
class KPGUI_PRE_ActivePictureRatio: KPGUI_PRE_ActivePicture {
226+
style = 48 + 2048;
227+
};
228+
217229
// Picture which keeps aspect ratio
218230
class KPGUI_PRE_PictureRatio: KPGUI_PRE_Picture {
219231
style = 48 + 2048;
@@ -955,6 +967,12 @@ class KPGUI_PRE_DialogCross: KPGUI_PRE_CloseCross {
955967
y = KP_GETY_CROSS(KP_Y_VAL);
956968
};
957969

970+
// Version info
971+
class KPGUI_PRE_DialogVersionIcon: KPGUI_PRE_VersionIcon {
972+
x = safeZoneX + safeZoneW * (KP_X_VAL + KP_WIDTH_VAL - 0.04);
973+
y = KP_GETY_CROSS(KP_Y_VAL);
974+
};
975+
958976
// Background
959977
class KPGUI_PRE_DialogBackground: KPGUI_PRE_Background {
960978
x = KP_GETX(KP_X_VAL,KP_WIDTH_VAL,0,1);
@@ -987,6 +1005,12 @@ class KPGUI_PRE_DialogCrossL: KPGUI_PRE_CloseCross {
9871005
y = KP_GETY_CROSS(KP_Y_VAL_L);
9881006
};
9891007

1008+
// Version info
1009+
class KPGUI_PRE_DialogVersionIconL: KPGUI_PRE_VersionIcon {
1010+
x = safeZoneX + safeZoneW * (KP_X_VAL_L + KP_WIDTH_VAL_L - 0.04);
1011+
y = KP_GETY_CROSS(KP_Y_VAL_L);
1012+
};
1013+
9901014
// Background
9911015
class KPGUI_PRE_DialogBackgroundL: KPGUI_PRE_Background {
9921016
x = KP_GETX(KP_X_VAL_L,KP_WIDTH_VAL_L,0,1);
@@ -1019,6 +1043,12 @@ class KPGUI_PRE_DialogCrossC: KPGUI_PRE_CloseCross {
10191043
y = KP_GETY_CROSS(KP_Y_VAL_C);
10201044
};
10211045

1046+
// Version info
1047+
class KPGUI_PRE_DialogVersionIconC: KPGUI_PRE_VersionIcon {
1048+
x = safeZoneX + safeZoneW * (KP_X_VAL_C + KP_WIDTH_VAL_C - 0.04);
1049+
y = KP_GETY_CROSS(KP_Y_VAL_C);
1050+
};
1051+
10221052
// Background
10231053
class KPGUI_PRE_DialogBackgroundC: KPGUI_PRE_Background {
10241054
x = KP_GETX(KP_X_VAL_C,KP_WIDTH_VAL_C,0,1);
@@ -1051,6 +1081,12 @@ class KPGUI_PRE_DialogCross_LeftPanel: KPGUI_PRE_CloseCross {
10511081
y = KP_GETY_CROSS(KP_Y_VAL_LP);
10521082
};
10531083

1084+
// Version info
1085+
class KPGUI_PRE_DialogVersionIcon_LeftPanel: KPGUI_PRE_VersionIcon {
1086+
x = safeZoneX + safeZoneW * (KP_X_VAL_LP + KP_WIDTH_VAL_LP - 0.04);
1087+
y = KP_GETY_CROSS(KP_Y_VAL_LP);
1088+
};
1089+
10541090
// Background
10551091
class KPGUI_PRE_DialogBackground_LeftPanel: KPGUI_PRE_Background {
10561092
x = KP_GETX(KP_X_VAL_LP,KP_WIDTH_VAL_LP,0,1);

‎Missionframework/KPGUI/KPGUI_defines.hpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
File: KPGUI_defines.hpp
55
Author: Wyqer - https://github.com/KillahPotatoes
66
Date: 2018-07-10
7-
Last Update: 2018-12-05
7+
Last Update: 2018-12-14
88
License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
99
1010
Description:
@@ -141,6 +141,3 @@
141141

142142
#define KP_WIDTH_VAL_LP 0.2
143143
#define KP_HEIGHT_VAL_LP (1 - 2 * KP_Y_VAL_LP - KP_HEIGTH_TITLE - KP_HEIGTH_BUTTON - 2 * KP_SPACING_Y)
144-
145-
// Classes include
146-
#include "KPGUI_classes.hpp"

0 commit comments

Comments
 (0)