Commit Graph

14763 Commits

Author SHA1 Message Date
Mateusz Cyraniak
a43af828b4
SOG Compat - Fix M1919 ammo not showing in arsenal (#8815)
vn_m1919_v_250_mag magazine has scopeArsenal attribute set to 0 so compat needs to address it.
2022-02-08 18:05:58 -06:00
GhostIsSpooky
f7f497f0ac
Medical Status - Add isDamageAllowed check to setDead (#8803)
* add delay & logs

* add remote support

* isDamageAllowed check

* add internal comment to setDead event

* remove remote setDead EH

* remove unnecessary changes

* Add comments and move check below the event
2022-02-06 17:36:28 +01:00
GhostIsSpooky
70d637bcb6
fix stringtables (#8809) 2022-02-03 17:19:11 -06:00
Filip Maciejewski
df40f63b5f
Cookoff - Fix invalid function name in example (#8808) 2022-02-01 13:54:01 -06:00
GhostIsSpooky
5b89daf277
fix CPR treatment condition (#8762) 2022-01-31 13:40:03 -06:00
GhostIsSpooky
1013e1a2cc
Cargo - Improve config and fnc_getNameItem (#8777)
* change macro, block rename statics

* change macro, block rename statics

* revert noRename, improve getName function

* fix derp
2022-01-30 12:12:52 -06:00
Broström.A | Evul
00f35a3dae
Cargo - Add ability to disabled rename on object level (#8740)
* Rename can be disabled on object level

- Added ability to stop renaming on object level

_Needs testing_

* Fixed extra ()

* Forgot one of the )

* Update cargo-framework.md

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-01-30 12:04:39 -06:00
Serg Vergun
f21a5e49d7
Add ability to define startup delay via config for AllVehicles (#8744) 2022-01-30 12:03:52 -06:00
GhostIsSpooky
9ff5d34ce7
Common - Add cache to fnc_isModLoaded (#8794)
* add isModLoaded cache

* add missing brackets

* missed one

* Update fnc_handlePunjiTrapDamage.sqf

* Update fnc_isModLoaded.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-01-30 11:56:20 -06:00
GhostIsSpooky
82e59f0578
RHS Compats - Add [CSW] prefix to magazines (#8798)
* afrf csw prefix

* rhsusf magazines

* fix stringtable erros

* fix stringtables, second attempt

* missing STR_

* Add missing hyphen and capitalize F

Co-authored-by: Serg Vergun <1197314+severgun@users.noreply.github.com>
2022-01-30 11:55:46 -06:00
Bailey Danyluk
7958f1dd9b
change name (#8805) 2022-01-30 11:54:30 -06:00
Whigital
1ea81f09a5
Fix RHS LMGs being classed as closed bolt systems (#8793) 2022-01-25 19:33:05 -06:00
mharis001
b368e09b45
Medical GUI - Improve descriptions for blood loss and damage color settings (#8779) 2022-01-24 17:38:06 -05:00
GhostIsSpooky
936dd5d978
Medical Treatment - Add ellipsis to 'Stitching' string (#8745)
* add ellipsis to stitching string

* japanese is weird

Co-authored-by: Brett <brett@bmandesigns.com>

Co-authored-by: Brett <brett@bmandesigns.com>
2022-01-19 17:50:53 -06:00
GhostIsSpooky
bd8ba24ee3
Mk6 Mortar - Add [CSW] prefix to magazines (#8780)
* add csw prefix to magazines

* Update addons/mk6mortar/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

Co-authored-by: Jo David <github@jonathandavid.de>
2022-01-19 17:35:27 -06:00
Brandon Danyluk
97f3bb3a7a Only play sound when Spike is launcher. Change onFired to missileguidance 2022-01-14 13:28:40 -07:00
jtj5283449
4d53d9ce44
Translation - Korean v2.0 (#8768)
* Add files via upload

* Add files via upload

* Delete stringtable.xml

* Delete advanced_ballistics directory

* Add files via upload

* Add files via upload

* Add files via upload

* Normalize line endings

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-01-12 14:41:09 -06:00
Drofseh
79c0510056
Overheating - Fix set temperature functions (#8770)
* Fix set temperature functions

* fix example
2022-01-12 12:41:50 -06:00
Eduard Schwarzkopf
3aab21da43
Translations - Add german translations (#8771)
* Added german translations for common

* Added german translations for fire

* Added german translations

* Added german translations

* Update on german translation

Co-authored-by: Jo David <github@jonathandavid.de>

* Updated german translation

Co-authored-by: Jo David <github@jonathandavid.de>
2022-01-12 12:35:56 -06:00
Brandon Danyluk
c2ef6b8acc Merge branch 'missileDynamics' of github.com:TheCandianVendingMachine/ACE3 into missileDynamics 2022-01-09 22:53:19 -07:00
Brandon Danyluk
ad2842b8f2 fix undefined array 2022-01-09 22:53:00 -07:00
GhostIsSpooky
4b108bc3ed
Fire - Add ellipsis & decapitalize 'patting down fire' string (#8753)
* Add ellipsis & decapitalize 'patting down fire'

* japanese is weird

Co-authored-by: Brett <brett@bmandesigns.com>

Co-authored-by: Brett <brett@bmandesigns.com>
2022-01-05 23:10:59 -06:00
GhostIsSpooky
285d0a0ac6
Medical - Capitalize 'Crushed Tissue' strings 2022-01-05 23:09:53 -06:00
PabstMirror
5f8131d2e6
Update setting-up-the-development-environment.md (#8765) 2022-01-05 23:09:21 -06:00
PabstMirror
e318e853b2 Some minor fixes 2022-01-05 22:49:21 -06:00
Brandon Danyluk
20ad6283b7 more SACLOS tweaks 2022-01-01 21:28:54 -07:00
Brandon Danyluk
9452de5f07 Merge branch 'master' of https://github.com/acemod/ACE3 into missileDynamics 2022-01-01 19:37:49 -07:00
Brandon Danyluk
5b4e29a796 Merge branch 'missileDynamics' of github.com:TheCandianVendingMachine/ACE3 into missileDynamics 2022-01-01 19:11:39 -07:00
Brandon Danyluk
745a47fb6e Config changes 2022-01-01 19:11:20 -07:00
Brandon Danyluk
d8554eba13 Stringtable addition 2022-01-01 18:35:48 -07:00
Brandon Danyluk
7bb7b6fb78 enhance target designation 2022-01-01 18:20:59 -07:00
Serg Vergun
af86109c2b
General - Utilize isNotEqualTo command (#8732)
* Utilize isNotEqualTo command

* fix pr validation
2021-12-18 17:15:32 -06:00
Ellis Nielsen
5332059738
SOG Compat - Remove Vanilla systems left in CfgVehicles (#8708)
* init commit

* review changes

* removed Land_vn_building_base import

* case sensitive includes

* changed to use script_component.hpp

* config style

* config style

* config style

* config style

* revert to define

* defines.hpp

* defines.hpp

Co-authored-by: commy2 <commy-2@gmx.de>
2021-12-18 17:14:15 -06:00
mihuan-0
ce6e0d48a1
Translations - Add missing Simplified Chinese translation and change a few existing ones (#8731)
* Add files via upload

* Delete stringtable.xml

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Apply suggestions from code review

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-12-18 17:13:43 -06:00
Whigital
c6ed114758
Compats - Fix RHSUSF water Jerry Can having refuel actions (#8717) 2021-12-17 18:35:41 +01:00
Whigital
efa1980990
Compats - Add SOG helmet hearing and dust protection (#8718) 2021-12-17 10:48:22 -06:00
Brandon Danyluk
fd5b8a27f1 tweak navigation to allow for <200m shots 2021-12-13 17:15:00 -07:00
Brandon Danyluk
becc9d24ff Tweak how targets are acquired. Fix velocity calculation 2021-12-13 15:51:10 -07:00
Brandon Danyluk
e91b8bc2df Tweak target acquisition. Reset target after shooting 2021-12-13 15:15:36 -07:00
Brandon Danyluk
8da028b626 Handle pre-tracking 2021-12-12 01:26:40 -07:00
Brandon Danyluk
7460bb335e misc updates 2021-12-11 22:16:08 -07:00
Brandon Danyluk
7d009d26ca remove debug 2021-12-11 22:03:10 -07:00
Brandon Danyluk
c6c313a573 fix bug with angles close to 0 2021-12-11 22:02:52 -07:00
Brandon Danyluk
36f148ded4 Allow multiple cameras to exist at once. Fix script error 2021-12-11 21:24:55 -07:00
Brandon Danyluk
f9ea835c59 add spike ATGM 2021-12-11 20:55:03 -07:00
Filip Maciejewski
e0df864a5d
Map Tools - Improve modded maps support (#8729) 2021-12-07 22:06:15 +01:00
TyroneMF
59fe345f60
Documentation - Add dependencies page (#8706)
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-12-02 15:40:46 +01:00
TyroneMF
2f2280494f
Slideshow - Add support for texture selections (#8702)
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2021-11-28 02:11:46 +01:00
PabstMirror
8cea7f4007
RHS Compats - Fix various UBCs (#8688) 2021-11-28 02:11:39 +01:00
PabstMirror
53f8577122
Tools - Increase timeout on sqfvmChecker.py (#8703) 2021-11-26 22:49:37 -06:00