Skip to content

Commit

Permalink
Merge pull request #680 from KillahPotatoes/v.0.96.7
Browse files Browse the repository at this point in the history
v0.96.7 (not just a hotfix release anymore)
  • Loading branch information
Wyqer authored May 10, 2020
2 parents 5a6a385 + de05db3 commit 2c45fe6
Show file tree
Hide file tree
Showing 435 changed files with 62,225 additions and 21,472 deletions.
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,10 @@ Temporary Items
.apdisk

# Build directory
build/
/build/
/_tools/build/
/_tools/node_modules/

# KP-Steam
steam_appid.txt
kp_steam*.log
85 changes: 85 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
{
"sqf.enableCBA": true,
"sqf.enableACE3": true,
"files.associations": {
"*.hpp": "ext",
"*.h": "ext",
"*.inc": "ext",
"*.cpp": "ext",
"*.ext": "ext",
"*.fsm": "ext"
},
"sqflint.ignoredVariables": [
"_input0",
"_thisArgs",
"_thisId",
"_thisType"
],
"psi-header.lang-config": [
{
"license": "Custom",
"language": "sqf",
"rootDirFileName": "description.ext",
"begin": "/*",
"prefix": " ",
"end": "*/",
"forceToTop": true
},
{
"license": "Custom",
"language": "ext",
"rootDirFileName": "description.ext",
"begin": "/*",
"prefix": " ",
"end": "*/",
"forceToTop": true
}
],
"psi-header.changes-tracking": {
"isActive": true,
"include": ["sqf", "ext"],
"modDate": "Last Update:",
"modDateFormat": "YYYY-MM-DD",
"autoHeader": "manualSave"
},
"psi-header.license-text": [
"MIT License - http://www.opensource.org/licenses/MIT"
],
"psi-header.templates": [
{
"language": "sqf",
"template": [
"File: <<filename>>",
"Author: KP Liberation Dev Team - https://github.com/KillahPotatoes",
"Date: <<filecreated('YYYY-MM-DD')>>",
"Last Update:",
"License: MIT License - http://www.opensource.org/licenses/MIT",
"",
"Description:",
" No description added yet.",
"",
"Parameter(s):",
" _localVariable - Description [DATATYPE, defaults to DEFAULTVALUE]",
"",
"Returns:",
" Function reached the end [BOOL]"
]
},
{
"language": "ext",
"template": [
"File: <<filename>>",
"Author: KP Liberation Dev Team - https://github.com/KillahPotatoes",
"Date: <<filecreated('YYYY-MM-DD')>>",
"Last Update:",
"License: MIT License - http://www.opensource.org/licenses/MIT",
"",
"Description:",
" No description added yet."
]
}
],
"todo-tree.general.statusBar": "tags",
"todo-tree.tree.showCountsInTree": true,
"todo-tree.tree.flat": true
}
537 changes: 537 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@ MIT License

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

-----

In this project there could be files with a different license than the
general project license. In this case the file header will state the
license. Folders could also contain a separate LICENSE file. In this
case all content in that folder and all subfolders are published under
that license instead.

* GNU General Public License v3.0 (\KP)

-----

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
Expand Down
Loading

0 comments on commit 2c45fe6

Please sign in to comment.