Skip to content

Commit 2c45fe6

Browse files
authored
Merge pull request #680 from KillahPotatoes/v.0.96.7
v0.96.7 (not just a hotfix release anymore)
2 parents 5a6a385 + de05db3 commit 2c45fe6

File tree

435 files changed

+62225
-21472
lines changed

Some content is hidden

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

435 files changed

+62225
-21472
lines changed

.gitignore

+7-1
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,10 @@ Temporary Items
4747
.apdisk
4848

4949
# Build directory
50-
build/
50+
/build/
51+
/_tools/build/
52+
/_tools/node_modules/
53+
54+
# KP-Steam
55+
steam_appid.txt
56+
kp_steam*.log

.vscode/settings.json

+85
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
{
2+
"sqf.enableCBA": true,
3+
"sqf.enableACE3": true,
4+
"files.associations": {
5+
"*.hpp": "ext",
6+
"*.h": "ext",
7+
"*.inc": "ext",
8+
"*.cpp": "ext",
9+
"*.ext": "ext",
10+
"*.fsm": "ext"
11+
},
12+
"sqflint.ignoredVariables": [
13+
"_input0",
14+
"_thisArgs",
15+
"_thisId",
16+
"_thisType"
17+
],
18+
"psi-header.lang-config": [
19+
{
20+
"license": "Custom",
21+
"language": "sqf",
22+
"rootDirFileName": "description.ext",
23+
"begin": "/*",
24+
"prefix": " ",
25+
"end": "*/",
26+
"forceToTop": true
27+
},
28+
{
29+
"license": "Custom",
30+
"language": "ext",
31+
"rootDirFileName": "description.ext",
32+
"begin": "/*",
33+
"prefix": " ",
34+
"end": "*/",
35+
"forceToTop": true
36+
}
37+
],
38+
"psi-header.changes-tracking": {
39+
"isActive": true,
40+
"include": ["sqf", "ext"],
41+
"modDate": "Last Update:",
42+
"modDateFormat": "YYYY-MM-DD",
43+
"autoHeader": "manualSave"
44+
},
45+
"psi-header.license-text": [
46+
"MIT License - http://www.opensource.org/licenses/MIT"
47+
],
48+
"psi-header.templates": [
49+
{
50+
"language": "sqf",
51+
"template": [
52+
"File: <<filename>>",
53+
"Author: KP Liberation Dev Team - https://github.com/KillahPotatoes",
54+
"Date: <<filecreated('YYYY-MM-DD')>>",
55+
"Last Update:",
56+
"License: MIT License - http://www.opensource.org/licenses/MIT",
57+
"",
58+
"Description:",
59+
" No description added yet.",
60+
"",
61+
"Parameter(s):",
62+
" _localVariable - Description [DATATYPE, defaults to DEFAULTVALUE]",
63+
"",
64+
"Returns:",
65+
" Function reached the end [BOOL]"
66+
]
67+
},
68+
{
69+
"language": "ext",
70+
"template": [
71+
"File: <<filename>>",
72+
"Author: KP Liberation Dev Team - https://github.com/KillahPotatoes",
73+
"Date: <<filecreated('YYYY-MM-DD')>>",
74+
"Last Update:",
75+
"License: MIT License - http://www.opensource.org/licenses/MIT",
76+
"",
77+
"Description:",
78+
" No description added yet."
79+
]
80+
}
81+
],
82+
"todo-tree.general.statusBar": "tags",
83+
"todo-tree.tree.showCountsInTree": true,
84+
"todo-tree.tree.flat": true
85+
}

CHANGELOG.md

+537
Large diffs are not rendered by default.

LICENSE.md

+12
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@ MIT License
22

33
Copyright (c) 2015 [GreuhZbug](https://github.com/GreuhZbug), [Wyqer](https://github.com/Wyqer)
44

5+
-----
6+
7+
In this project there could be files with a different license than the
8+
general project license. In this case the file header will state the
9+
license. Folders could also contain a separate LICENSE file. In this
10+
case all content in that folder and all subfolders are published under
11+
that license instead.
12+
13+
* GNU General Public License v3.0 (\KP)
14+
15+
-----
16+
517
Permission is hereby granted, free of charge, to any person obtaining a copy
618
of this software and associated documentation files (the "Software"), to deal
719
in the Software without restriction, including without limitation the rights

0 commit comments

Comments
 (0)