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

v0.96.8 #789

Draft
wants to merge 143 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
143 commits
Select commit Hold shift + click to select a range
cf850ac
WIP state of config organizing
Wyqer May 10, 2020
3c3307e
Organized config file
Wyqer May 10, 2020
24dc898
`GRLIB_` prefix to `KPLIB_`
Wyqer May 10, 2020
9e5937c
`KP_liberation_` prefix to `KPLIB_`
Wyqer May 10, 2020
5666f79
Update Changelog
Wyqer May 10, 2020
e6a8641
Adjust description.ext maxPlayers to count HCs
Wyqer May 10, 2020
040921e
Reorganized arsenal presets and preset variables
Wyqer May 11, 2020
b4f37a7
Merge pull request #783 from KillahPotatoes/0.96.8-Files_and_variable…
Wyqer May 11, 2020
d23f03a
Removed not used deathscreen hpp and paa
Wyqer May 11, 2020
48c27c3
Equalize variable names in opfor presets
Wyqer May 15, 2020
9e1b28e
Headers and variable name changes in enemy presets
Wyqer May 15, 2020
fbd29bc
changed preset file names to lowercase
Wyqer May 15, 2020
de8a5f1
Delete CUP_AFRF_MSV.sqf
Wyqer May 15, 2020
2e28bc2
Delete CUP_BAF_Desert.sqf
Wyqer May 15, 2020
253d3fb
Delete CUP_BAF_Woodland.sqf
Wyqer May 15, 2020
e1fabd9
Delete CUP_CDF.sqf
Wyqer May 15, 2020
64b3323
Delete CUP_ChDKZ.sqf
Wyqer May 15, 2020
d4ec653
Delete CUP_SLA.sqf
Wyqer May 15, 2020
c71dcf3
Delete SLA.sqf
Wyqer May 15, 2020
90eaa28
Delete CUP_ACR_Desert.sqf
Wyqer May 15, 2020
7ceccfe
Delete CUP_ACR_Woodland.sqf
Wyqer May 15, 2020
dd34b31
Delete CUP_BAF_Desert.sqf
Wyqer May 15, 2020
0e261f1
Delete CUP_BAF_Woodland.sqf
Wyqer May 15, 2020
3e4fa74
Delete CUP_CDF.sqf
Wyqer May 15, 2020
7e8bcc8
Delete CUP_ChDKZ.sqf
Wyqer May 15, 2020
4c1187e
Delete CUP_SLA.sqf
Wyqer May 15, 2020
02217a3
Delete CUP_USA_Desert.sqf
Wyqer May 15, 2020
c9aff9c
Delete CUP_USA_Woodland.sqf
Wyqer May 15, 2020
facff27
Delete CUP_USMC_Desert.sqf
Wyqer May 15, 2020
20792d1
Delete CUP_USMC_Woodland.sqf
Wyqer May 15, 2020
7198479
Delete CUP_NAPA.sqf
Wyqer May 15, 2020
1de3a3a
Delete RACS.sqf
Wyqer May 15, 2020
48c5949
Fixed not updating opforCount in FSM
Wyqer May 17, 2020
b2f0437
Update Changelog
Wyqer May 17, 2020
f86a6b1
Adjustments after variable name changes
Wyqer May 17, 2020
8331eb4
Renamed sector arrays
Wyqer May 17, 2020
ba02c3b
Fix FOB truck get FOB box mass set
Wyqer May 17, 2020
c42a284
Equalize variable name of fob array
Wyqer May 17, 2020
d3230c5
Headers for presets
Wyqer May 18, 2020
dbc1be2
Moved FOB hunting templates
Wyqer May 18, 2020
7318707
Update stringtable.xml
MJVEVERUSKA May 21, 2020
ba787c4
Add changelog entry
veteran29 May 22, 2020
46c8764
Merge pull request #793 from MJVEVERUSKA/v0.96.8
veteran29 May 22, 2020
6c14fe4
Added `param` prefix to param variables
Wyqer May 22, 2020
c54263c
Changelog update
Wyqer May 22, 2020
4c90f2e
Update Changelog
Wyqer May 22, 2020
e32ad09
Missionstart log output preset strings updated
Wyqer May 22, 2020
6bc2d71
`save_is_loaded` to `KPLIB_saveLoaded`
Wyqer May 23, 2020
6897ca6
`combat_readiness` to `KPLIB_enemyReadiness`
Wyqer May 23, 2020
04b3791
stat variable name for opfor vehicles reset
Wyqer May 23, 2020
98b5745
Adjusted indentation in save_manager
Wyqer May 23, 2020
baa0f53
Lower the chance for unarmed BRDM in GM East enemy preset
veteran29 May 23, 2020
b7784b3
Update stringtable.xml
MJVEVERUSKA May 23, 2020
abfec23
Merge pull request #796 from MJVEVERUSKA/v0.96.8
Wyqer May 25, 2020
de06401
Merge pull request #795 from KillahPotatoes/v0.96.8-gm-east
Wyqer May 25, 2020
579e2d6
Merge branch 'v0.96.8' into 0.96.8-param_prefixes
Wyqer May 25, 2020
3b93646
Civilian preset variable rename
Wyqer May 25, 2020
4b8380b
Player preset variable rename
Wyqer May 25, 2020
3882919
Resistance preset variable rename
Wyqer May 25, 2020
dbf9947
Code adjustments due to preset variable rename
Wyqer May 25, 2020
8aaac8b
Merge pull request #798 from KillahPotatoes/0.96.8-preset_variables_r…
Wyqer May 25, 2020
6027817
Merge branch 'v0.96.8' into 0.96.8-param_prefixes
Wyqer May 26, 2020
7f0e6fc
Merge pull request #794 from KillahPotatoes/0.96.8-param_prefixes
Wyqer May 27, 2020
956d964
Removed RHS T-14 in presets
Wyqer Jun 3, 2020
a6fb990
Missing `};` in civinfo_escort.sqf
Wyqer Jun 22, 2020
ee0124d
Missing `}` in civinfo_task.sqf
Wyqer Jun 23, 2020
554ad8f
first version of the crate carrying
Dubjunk Jul 8, 2020
b2a8914
crate carrying v2
Dubjunk Jul 8, 2020
a0369f4
updatet crate postition while carrying
Dubjunk Jul 8, 2020
dee28f5
changelog update
Dubjunk Jul 10, 2020
26af6e8
Merge branch 'v0.96.8-carry_ressouce_crates' of https://github.com/Ki…
Dubjunk Jul 10, 2020
7b04b24
Merge branch 'v0.96.71' into v0.96.8
Wyqer Aug 5, 2020
16cea46
Update CHANGELOG.md
Wyqer Aug 5, 2020
d08a01f
Renamed objectinits, created KPLIB_whitelist file
Wyqer Aug 6, 2020
e2ce53d
Increased task draw distance in description
Wyqer Aug 6, 2020
ff3e831
Changed variable name for param key and init done
Wyqer Aug 6, 2020
144cdbf
Merge branch 'master' into v0.96.8
Wyqer Sep 16, 2020
3509824
Variable names in new arsenal presets updated
Wyqer Sep 16, 2020
667dbba
Some more variable adjustments from backport 7a
Wyqer Sep 20, 2020
eabe07e
Collision ignore list for building to classnameLists
Wyqer Sep 20, 2020
81c8ab6
suggestions by @Wyqer
Dubjunk Sep 23, 2020
81c56e6
Fixed chernarus winter/summer ignored buildings
Wyqer Sep 23, 2020
737eeac
[v0.96.8] update Italian localization
k4s0 Sep 23, 2020
c1f67b7
Merge pull request #832 from k4s0/v0.96.8
Wyqer Sep 25, 2020
9e3188e
Update Changelog
Wyqer Sep 25, 2020
81affed
Support CBA Optics and MRT Accesories
veteran29 Sep 26, 2020
0bd3fa1
Fix hardcoded class in MRT Accessory support
veteran29 Sep 26, 2020
7d2fc42
minor bugfix
nicoman35 Sep 26, 2020
a34ee35
Merge pull request #834 from nicoman35/v0.96.8
Wyqer Sep 26, 2020
ec13e5a
some minor fixes
Dubjunk Sep 30, 2020
71f815e
Merge branch 'v0.96.8' into v0.96.8-carry_ressouce_crates
Dubjunk Sep 30, 2020
357b8a2
Update mission.sqm
Oct 27, 2020
54ac026
Merge pull request #844 from spawnAjak/patch-2
Wyqer Oct 30, 2020
4a957d6
Update setUnitLoadout to CBA_fnc_setLoadout
Thatguy553 Oct 30, 2022
604b7e2
Replace kill manager with cba server event
some-evil-kitty Oct 14, 2023
d90dd18
fix formatting
some-evil-kitty Oct 14, 2023
14e91b3
change logic of cleanup
some-evil-kitty Oct 14, 2023
92ba009
fix missing ; and missing param
some-evil-kitty Oct 20, 2023
3a572cb
Initial Commit
some-evil-kitty Oct 21, 2023
a2fa9c4
docblocked
some-evil-kitty Oct 21, 2023
d09f767
caught more MPKilled's, killed them
some-evil-kitty Oct 24, 2023
677e127
fixed spawnvehicle, which was breaking spawn battlegroup
some-evil-kitty Oct 24, 2023
6de426b
Build tool - update package-lock.json
veteran29 Oct 28, 2023
b3c628e
Refactor build tool into a subdirectory, move build output to repo root
veteran29 Oct 28, 2023
e0bd26a
Build tool - Silent npm install, npm audit fix
veteran29 Oct 28, 2023
3bf33f6
Cleanup .gitignore
veteran29 Oct 28, 2023
fa3b660
VSCode - Add tasks/script for dev setup and game launch
veteran29 Oct 28, 2023
f129132
Fix CI
veteran29 Oct 28, 2023
2ff7d65
Unify build output naming
veteran29 Oct 28, 2023
750ea91
Add changelog entries
veteran29 Oct 28, 2023
91ac6b2
Merge pull request #944 from KillahPotatoes/v0.96.8-tools
veteran29 Oct 28, 2023
d5babab
Code formatting, remove unused variables
veteran29 Oct 28, 2023
f83a807
Revert to MPKilled, use localEvent
veteran29 Oct 28, 2023
0124e3c
Add missing params, minor formatting
veteran29 Oct 28, 2023
fe0682f
Merge remote-tracking branch 'origin/v0.96.8' into v0.96.8-carry_ress…
veteran29 Oct 28, 2023
661ffea
Fix crates floating after detach
veteran29 Oct 28, 2023
c5d26ba
Optimize crate carry/drop actions
veteran29 Oct 28, 2023
7cd55b0
Prevent players from getting into vehicles while carrying
veteran29 Oct 28, 2023
0de9560
Prevent weaponization of crates
veteran29 Oct 28, 2023
4b5ed81
Merge pull request #813 from KillahPotatoes/v0.96.8-carry_ressouce_cr…
veteran29 Oct 28, 2023
28c19bb
Fix vehicle unlock check error
veteran29 Oct 28, 2023
5a52036
Add scriptName to KPLIB script for easier debugging
veteran29 Oct 28, 2023
ed3b899
Add more scriptName to KPLIB scripts for easier debugging
veteran29 Oct 28, 2023
d1136d9
Merge pull request #945 from KillahPotatoes/v0.96.8-script-names
veteran29 Oct 28, 2023
e4d4f8d
Merge branch 'v0.96.8' into v0.96.8-pr-killManager
some-evil-kitty Oct 29, 2023
6cc1b74
Merge pull request #939 from KillahPotatoes/v0.96.8-pr-killManager
some-evil-kitty Oct 29, 2023
f558dae
Merge branch 'v0.96.8' into pr/920
some-evil-kitty Nov 19, 2023
560384a
Docblocked second time
some-evil-kitty Nov 19, 2023
26ddd1e
Conflict resolving
some-evil-kitty Nov 19, 2023
912a035
Merge pull request #920 from Thatguy553/master
some-evil-kitty Nov 19, 2023
1a9dcca
Merge branch 'v0.96.8' into battlegroup-ai
some-evil-kitty Mar 11, 2024
07b9ee9
Merge branch 'v0.96.8' into v0.96.8-cba_optics
some-evil-kitty Mar 11, 2024
38a220e
Merge pull request #840 from KillahPotatoes/v0.96.8-cba_optics
some-evil-kitty Mar 11, 2024
0ad5bcb
Apply suggestions from code review
veteran29 Mar 14, 2024
9f939f3
Update Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf
veteran29 Mar 14, 2024
b121f66
Update Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf
veteran29 Mar 14, 2024
b44cd41
Update Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf
some-evil-kitty Mar 14, 2024
79ab7fd
Fix indent
veteran29 Mar 14, 2024
98bafd5
Merge branch 'v0.96.8' into battlegroup-ai
some-evil-kitty Mar 14, 2024
86d299c
Merge pull request #942 from KillahPotatoes/battlegroup-ai
some-evil-kitty Mar 15, 2024
50a987c
Update README.md (#958)
prisonerMO Aug 21, 2024
8a6d78a
Update tags in 0.96.8 (#961)
PiG13BR Aug 27, 2024
36fe3df
fix undefined var (#962)
some-evil-kitty Sep 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ jobs:
steps:
- uses: actions/checkout@master

- uses: docker://node:10-alpine
- uses: docker://node:20-alpine
name: Setup Node

- name: Install dependencies
working-directory: _tools
working-directory: _tools/build-tool
run: npm install

- name: Assemble and pack
working-directory: _tools
working-directory: _tools/build-tool
run: npx gulp

- uses: actions/upload-artifact@master
with:
name: PBO-Files
path: _tools/build/pbo
path: build/pbo

52 changes: 4 additions & 48 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,55 +1,11 @@
# Windows image file caches
Thumbs.db
ehthumbs.db
# dev mission.sqm
/Missionframework/mission.sqm

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# Windows shortcuts
*.lnk

# =========================
# Operating System Files
# =========================

# OSX
# =========================

.DS_Store
.AppleDouble
.LSOverride

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
# Tools local configs
/_tools/config.ps1

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

# KP-Steam
steam_appid.txt
Expand Down
22 changes: 22 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "Launch game",
"type": "shell",
"command": "powershell -c '. ${workspaceFolder}/_tools/vscode/Run-Game.ps1'",
"problemMatcher": [],
"group": {
"kind": "build"
}
},
{
"label": "Setup",
"type": "shell",
"command": "powershell -c '. ${workspaceFolder}/_tools/vscode/Invoke-Setup.ps1'",
"problemMatcher": []
}
]
}
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,24 @@
# Changelog

## 0.96.8 (TBD)
* Added: Czech translation. Thanks to [MJVEVERUSKA](https://github.com/MJVEVERUSKA)
* Added: Ability to carry ressource crates.
* Added: Scripts/configs to setup and run development environment from VSCode tasks
* Updated: Italian localization. Thanks to [k4s0](https://github.com/k4s0)
* Tweaked: Splitted the config file in separate files, as it was getting quite big.
* Tweaked: Unified the prefix of all variables to `KPLIB_`.
* Tweaked: Arsenal presets are now in the presets folder.
* Tweaked: Blacklist and arsenal extension are now own files in presets/arsenal.
* Tweaked: Renamed blufor/opfor to players/enemies, to possibly avoid further confusion with using an opfor faction for a player preset.
* Tweaked: Parameter value variables are having a `param` prefix now.
* Tweaked: Comments/structure of the config file. Also added some category prefix sorting to some config variables.
* Tweaked: GM East enemy preset, lower the chance for unarmed BRDM.
* Tweaked: Moved mission build tool into subdirectory
* Fixed: Description.ext stated 34 players while there are also 3 additional HC slots, so 37 in total.
* Fixed: Sector monitor got stuck after sector cap was reached until restarting the server.
* Fixed: FOB truck got mass set, but should've just apply to FOB boxes.
* Fixed: Chernarus Winter (and summer) weren't recognized for ignored buildings list for civ rep loss.

## 0.96.7a (2020-09-12)
* Added: Contact DLC static weapon backpacks to default blacklist.
* Added: Czech translation. Thanks to [MJVEVERUSKA](https://github.com/MJVEVERUSKA)
Expand Down
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
2 changes: 1 addition & 1 deletion Missionbasefiles/kp_liberation.pja310/mission.sqm
Original file line number Diff line number Diff line change
Expand Up @@ -3827,7 +3827,7 @@ class Mission
dataType="Marker";
position[]={6960.8052,0,11203.651};
name="capture_45";
text="Applejakerie Village";
text="Ajak's Village";
type="n_art";
colorName="ColorEAST";
id=714;
Expand Down
Loading