Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,149 Commits 73 Branches 88 Tags 752 MiB
f942231358
Commit Graph

206 Commits

Author SHA1 Message Date
Jo David
4ba5a3954e Remove Redundancy in flashbangExplosionEh (#6749) 2018-12-29 11:29:29 -06:00
Jo David
cf1910eb79
Changed: Remove ear ringing from flashbang explosions when wearing protective gear (e.g. ComTacs) (#6746) 
* Remove ear ringing from flashbangs when wearing protective gear, reduce strength by damageCoefficent
 2018-12-28 14:46:13 +01:00
alef
de83f2c2b7 Italian translation updates (#6738) 
* Fix wrong order shown in addon category list

Just put 'ACE' at begin

* Typo

* Add/Fix: arsenal, nightvision and others.

common, explosives, maverick, gforces, pylons, hearing, marksers, repair,
flashlights, nametags, interaction, vehicles, medical_menu, medical_ai,
interact_menu, medical

* Italian translation update

Remove BOM. Colors uppercase for consistency.

Revert "Remove BOM. Colors uppercase for consistency."

This reverts commit 0fa9c35f9e46437438a384cee37cb8d3e5322433.

Revert "Italian translation update"

This reverts commit d53e56ce70a606e773aa6fe2a53485aeb5419974.

Re-add Italy

* fix polish
 2018-12-17 12:10:06 -06:00
Jakub Ochalski
91182482db Polish Translation (#6730) 
Did the missing parts of the Polish translation.
 2018-12-11 16:50:36 -06:00
PabstMirror
f81f5830c5
Illumination Flares (#4506) 
* Illumination Flares

* add M992 IR flare

* update debug script

* comments
 2018-12-06 20:28:13 -06:00
Filip Maciejewski
5e07d894f8 Remove BOM from stringtables 2018-10-07 11:30:15 +02:00
Dedmen Miller
e2ac18a05d [WIP] Fix script errors reporting wrong line numbers (#6407) 
* advanced_ballistics

* advanced_fatigue

* advanced_throwing

* ai

* aircraft

* arsenal

* atragmx

* attach

* backpacks

* ballistics

* captives

* cargo

* chemlights

* common

* concertina_wire

* cookoff

* dagr

* disarming

* disposable

* dogtags

* dragging

* explosives

* fastroping

* fcs

* finger

* frag

* gestures

* gforces

* goggles

* grenades

* gunbag

* hearing

* hitreactions

* huntir

* interact_menu

* interaction

* inventory

* kestrel4500

* laser

* laserpointer

* logistics_uavbattery

* logistics_wirecutter

* magazinerepack

* map

* map_gestures

* maptools

* markers

* medical

* medical_ai

* medical_blood

* medical_menu

* microdagr

* minedetector

* missileguidance

* missionmodules

* mk6mortar

* modules

* movement

* nametags

* nightvision

* nlaw

* optics

* optionsmenu

* overheating

* overpressure

* parachute

* pylons

* quickmount

* rangecard

* rearm

* recoil

* refuel

* reload

* reloadlaunchers

* repair

* respawn

* safemode

* sandbag

* scopes

* slideshow

* spectator

* spottingscope

* switchunits

* tacticalladder

* tagging

* trenches

* tripod

* ui

* vector

* vehiclelock

* vehicles

* viewdistance

* weaponselect

* weather

* winddeflection

* yardage450

* zeus

* arsenal defines.hpp

* optionals

* DEBUG_MODE_FULL 1

* DEBUG_MODE_FULL 2

* Manual fixes

* Add SQF Validator check for #include after block comment

* explosives fnc_openTimerUI

* fix uniqueItems
 2018-09-17 14:19:29 -05:00
Dissyu
e5a15d200f Traditional Chinese update (#6408) 
Traditional Chinese update
 2018-06-27 14:16:11 -05:00
commy2
66fc592dbe
destruction vs effect 2017-12-31 13:36:55 +01:00
commy2
ed97be0e06
radius vs area 2017-12-31 13:33:42 +01:00
JoramD
fcba14ef71 Tweaked affected area for objects 2017-12-24 12:06:18 +01:00
JoramD
f0eb7dd479 Tweaked effect size of AN-M14 2017-12-24 11:30:02 +01:00
SilentSpike
b1f5caacbb Improve cook off settings UX (#5351) 
* Improve cookoff setting UX

- Adds second eden attribute to boxes/vehicles to toggle the ammunition
  cookoff itself
- Removes the cookoff toggle from boxes (they only care about ammunition
  cookoff)

* Fix attribute default values

* Update incendiary box ignition code
 2017-12-06 13:13:10 -06:00
God of Monkeys
72e48c04f0 Update Chinese stringtable content (#5637) 
Update Chinese stringtable content
 2017-10-18 12:01:29 -05:00
classic
d5aeec11ea Update the Jpn translation (#5586) 
* Update the Jpn translation

few tweak to translation

* Update the Jpn translation

couple tweak

* Update the Jpn translation

added more simplify translation

* Update the Jpn translation

few tweak and fix miss translation

* Update the Jpn translation

Added missing symbol and few tweak

* Update the Jpn translation

added shortest word because text is protruding the button

* Update the Jpn translation

fix miss translation and some tweaks

* Update the Jpn translation

just few tweak

* Update the Jpn translation

fix miss translation

* Update the Jpn translation

just a little tweak

* Update the Jpn translation

just a tweak

* Update the Jpn translation

added more simply translation

* Update the Jpn translation

tweaked to some entry

* Update the Jpn translation

tweak to few entry

* Update the Jpn translation

fix for miss translation

* Update the Jpn translation

fix miss translation

* Update the Jpn translation

some tweaks to translation

* Update the Jpn translation

fix miss translation

* fix the Jpn translation

fix the kanji
 2017-10-04 16:30:11 +02:00
jonpas
5cf7569711 Correct new Chinese stringtable identifiers (#5334) 2017-07-08 09:48:39 -05:00
GodofMonkeys
60131ee589 Add Chinese Traditional & Simplified Localization (#5295) 
Add Chinese Traditional & Simplified Localization
 2017-06-22 16:46:00 +02:00
Andrea Verano
e3fd1612e2 Italian translation (Add & Fix) (#5193) 
Added Italian translation for:
-advanced fatigue
-advanced throwing
-cook off
-dogtags
-gunbag
-ui-scopes and much more...

Fixed a lot of grammatical errors
 2017-05-23 13:44:17 -05:00
PabstMirror
cd5dcf56fe Use correct TransportX type for ace items (#5168) 
* Use correct TransportX type for ace items

* Fix messing with flare colors
 2017-05-18 17:23:01 -05:00
NorXAengell
1be278fbda French translation to "Advanced throwing" and "Advanced fatigue" (#4415) 
* French translation of "Advanced fatigue" and "Advanced throwing"

Full translation of "Advanced fatigue" and "Advanced throwing".

* New batch of translation/correction
 2017-02-11 15:16:56 -06:00
BaerMitUmlaut
0a05401e74 Fix cookoff locality issues (#4799) 
* Fix locality issue with box cookoff

* Add grenade fired EHs on hcs and dedis
 2017-01-02 17:55:44 -06:00
jtj5283449
d4855a7ff3 Korean Translation v1.0 (#4794) 
* Add files via upload

* Add files via upload

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml.

* Fix encoding
 2017-01-02 17:52:01 -06:00
PabstMirror
a3c50a6c76 Add dev macro to quickly recompile functions (#4699) 2016-11-23 13:35:25 -06:00
commy2
8822cb1b90 emulate frag grenade ai behaviour for incendiaries (#4534) 2016-10-11 19:04:08 +02:00
Glowbal
059980b1a5 Add ammo cookoff (#4376) 
* Add Ammo cookoff

* Remove tabs

* Add initial ammo box cook-off

Does not include a fire effect, mostly just a proof of concept.

Should probably also add further potential cook-off conditons (if hit by tracer for example).

* Add burning effects to ammo box cook off

- Add burning effect while ammo box is cooking off
- Add setting to enable/disable ammo boxes cooking off
- Clear magazine cargo while box is burning

Currently the box will burn for 60 seconds hardcoded, this is to allow time for the ammunition to cook off (since boxes sink into the ground and dissapear when destroyed). Perhaps we can implement a way to burn until all ammo is expended.

* Improve ammo cookoff

* Integrate ammo cookoff with the incendiary grenade

* Disable ammo cook off underwater

* Optimize fnc_detonateAmmunition

I say optimize, the only real performance optimization is using `vectorMultiply`. The rest is readability optimization though!

* Improve ammo box cook off

- Remove unnecessary light source (fire particles provide lighting)
- Add randomness to cook off time
- Cook off begins with fire effect rather than smoke

* Add tracer induced ammo box cook off

Due to limitations in the way arma handles tracer rounds (there's no way to check if an individual projectile is a tracer), only magazines with a high enough tracer density (at least 1 in 4) can cause cook off this way. However this is deemed an acceptable approximation since the chance of this happening should be quite low anyway.

* Decrease amount of explosions from ammo cookoff

* Add is local check for remote event
 2016-10-06 22:37:38 +02:00
commy2
05d30c5573 convert log macros to cba versions (#4282) 
* convert log macros to cba versions

* Add changes to AB

* remove obsolete macro
 2016-10-02 12:55:31 +02:00
KoffeinFlummi
72899643bd Merge branch 'master' into japanesestringtables 2016-09-27 20:54:17 +02:00
commy2
e7bc2e9d62 remove deprecated code for 3.8.0 (#4457) 
* remove deprecated scroll wheel event handler

* remove deprecated ace hash functions

* remove deprecated execNextFrame

* remove deprecated insertionSort

* remove deprecated getConfigType

* remove deprecated binocularMagazine

* remove deprecated wait(Until)AndExecute

* remove old ass and deprecated alternative syntax setHitPointDamage

* remove deprecated event handlers (#4459)

* remove deprecated event handlers#

* remove ACE_newEvents

* Remove old ACE PlayerEventHandler wrappers
 2016-09-24 22:31:10 +02:00
Grzegorz
a63dcb49d0 PL Translation 3.7.1 (#4395) 
* translate advanced fatigue

* translate advanced throwing

* translate cargo

* translate chemlights

* translate cookoff

* translate explosives

* translate fastroping

* translate gforce

* translate googles

* translate grenades

* translate gunbag

* translate maptools

* translate medical

* translate medical_ai

* translate minedetector

* translate nametags

* translate overheating

* translate repair

* translate tagging

* translate ui

* translate zeus
 2016-09-18 22:00:13 +02:00
PabstMirror
32b7ef7b85 Skip incindinary effects if projectile is null 2016-09-17 13:09:03 -05:00
classicarma
7f208e094d translate grenades 2016-09-17 01:46:51 +09:00
commy2
3cea9e727d fix a comment 2016-09-16 14:00:43 +02:00
commy2
d200eadb46 incendiary and cookoff improvements 2016-09-16 13:08:19 +02:00
PabstMirror
1a4ed7b7b4 Grenades - disable throw mode / keybind if advThrow (#4350) 2016-09-06 21:54:42 +02:00
[OMCB]kaban
64cf8aa95a Russain Translations Update (#4286) 2016-08-27 10:36:00 +02:00
commy2
5b3d424509 always destroy engine, effect only requires cookoff 2016-08-13 12:44:38 +02:00
commy2
d0d407a2c5 only do engine burning effect if cookoff is enabled 2016-08-13 12:39:52 +02:00
commy2
9a93dffc3b port A2 incendiary grenades 2016-08-13 11:49:36 +02:00
Glowbal
96a08dfc01 Merge pull request #3923 from voiperr/grenadesounds 
Grenade + Chemlight Sounds
 2016-07-12 13:37:40 +02:00
commy2
3fdc0dd521 Merge pull request #3955 from acemod/add_name 
add 'name' to components
 2016-06-20 19:25:58 +02:00
BaerMitUmlaut
88b58216ee Added beautified component names 2016-06-20 11:44:36 +02:00
commy2
c481ddedaf add 'name' to components 2016-06-19 09:38:39 +02:00
Josuan Albin
7c9dcf6bdb Merge branch 'pr/3480' 
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/cargo/stringtable.xml
	addons/flashlights/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/main/stringtable.xml
	addons/map/stringtable.xml
 2016-06-18 16:26:46 +02:00
voiper
f28f90b624 Use isEqualTo. 2016-06-16 12:21:40 -07:00
voiper
3070b2ac6e Sounds are sourced from configs. 
Used impactGroundSoft[] as shortcut.
 2016-06-15 18:16:28 -07:00
voiper
c0e412211e More realistic chemlight impact sounds. 2016-06-13 18:07:46 -07:00
voiper
b45a17001c Merge remote-tracking branch 'origin/master' into grenadesounds 2016-06-12 14:54:14 -07:00
voiper
38b98802de Add grenade, chemlight, and handflare priming sounds. 
Remove default clinking sounds.
 2016-06-07 17:22:48 -07:00
SilentSpike
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
PabstMirror
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
jonpas
95573ee711 Stringtable URL (#3855) 
* Move url into stringtable to display it properly, Add some missing author and url entries

* Fix main

* Remove duplicate author
 2016-06-01 23:45:51 +02:00
jonpas
1354826d56 Put semi-colon to the correct place 2016-06-01 14:11:32 +02:00
jonpas
1331265e65 Move url into a macro 2016-06-01 13:49:10 +02:00
jonpas
6730d016c2 Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility 2016-06-01 13:27:02 +02:00
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
jonpas
7a307393a4 Merge branch 'master' into useQuotedPathMacros 2016-05-30 21:14:17 +02:00
jonpas
b54d1985f1 QGVAR and fix gforces, goggles, grenades, hearing, interact_menu 2016-05-25 01:57:41 +02:00
SilentSpike
207d6612da Remove duplicate ACE_newEvents entries 2016-05-24 15:06:17 +01:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
SilentSpike
108ff4f644 Replace ACE event system calls with CBA counterparts 
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
 2016-05-22 16:47:39 +01:00
jonpas
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
Alessandro Foresi
e97c7c0f65 Translation: IT completed (with BOM) 2016-03-27 21:22:15 +02:00
NorXAengell
772c4cc100 Another batch of translations and corrections (Fr) 2016-03-01 02:27:19 +01:00
commy2
9712f9c1a4 manual merge 2016-02-22 16:24:10 +01:00
commy2
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
commy2
73d5b3c77b relace ace_common_fnc_canUseWeapon with CBA_fnc_canUseWeapon 2016-02-20 22:41:24 +01:00
ChairborneIT
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
esteldunedain
6fd8d8da04 Merge branch 'master' into changeHearingDefaults 
Conflicts:
	addons/grenades/functions/fnc_flashbangExplosionEH.sqf
 2016-02-20 16:59:00 -03:00
esteldunedain
f2566afc73 Another 5m of effect 2016-02-19 15:22:24 -03:00
esteldunedain
b420512139 Fix reduction based on looking away from the grenade 2016-02-19 12:34:50 -03:00
esteldunedain
9e5f52d161 Make units heavily affected by the blast turn away from the light. 2016-02-19 12:33:49 -03:00
esteldunedain
0f7853f6c6 Increase the maximum range for blinding effect to 25m, but with a high falloff. Close #1539 2016-02-19 12:18:22 -03:00
esteldunedain
648a0259ec Improve flashbang effects. Make sure the light effect is rendered even if the grenade explodes further than 20m from the player. Increase the amount of hearing damage. 2016-02-19 12:02:29 -03:00
PabstMirror
8fed9325c9 Fix flashbang 2016-02-16 13:02:25 -06:00
esteldunedain
0b9695ce70 Apply the ufeh to ACE_Grenades 2016-02-06 17:20:30 -03:00
PabstMirror
7fc84c60dd Flashbangs - pass pos instead of obj reference 
Fix #3205
 2016-02-03 17:53:24 -06:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
commy2
e56e18bff3 Code cleanup 1.54 2016-01-06 22:42:02 +01:00
PabstMirror
cae9f436f6 Merge branch 'release' 2015-12-08 15:14:33 -06:00
ProfessorCZ
cf41ac5fba Czech Translations - Update 2015-12-04 22:28:10 -06:00
PabstMirror
43a168f0b9 Flashbangs - Make event radius match effect radius 2015-12-04 15:16:17 -06:00
VKing
069169cc72 Changed ACE_time back to time in comments where appropriate 2015-10-21 22:52:21 +02:00
commy2
cd839a0ddc remove superfluous brackets 2015-09-26 22:42:47 +02:00
commy2
6cc920dc34 Code Cleanup Grenades, fix dedicated server AI thrown flasbangs do nothing 2015-09-26 22:39:12 +02:00
Glowbal
7e5ab07e32 Merge pull request #2387 from acemod/FixHCPPE 
Fix that PPEffects Throw a error on HC
 2015-09-15 21:04:37 +02:00
jokoho48
b7e02da1cc remove if (!hasInterface) from PFH 
move ! in ()
 2015-09-11 16:58:26 +02:00
KoffeinFlummi
83aa2cc68c Merge branch 'release' into french 2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be Update French translations 2015-09-10 19:14:51 +02:00
jokoho48
defbdf1b1a fix that HC throw a issue if PPEffect was used/applyed 2015-09-09 17:05:48 +02:00
commy2
46d741281b Merge pull request #2358 from acemod/322flashbangexplosive 
sort flashbang under explosive grenades, not misc grenades
 2015-09-05 13:40:24 +02:00
commy2
a187be7255 sort flashbang under explosive grenades 2015-09-03 13:23:15 +02:00
commy2
fbf00b9aa5 correct comment 2015-09-03 02:55:40 +02:00
commy2
83424cdcab header for fnc_flare 2015-09-02 00:03:16 +02:00
commy2
7ce606740c make flares work in mp 2015-09-01 23:56:25 +02:00
commy2
be56fd7d46 scripted approach to hand flares, fix #1079 2015-09-01 23:19:49 +02:00
commy2
b1fbbcc49f bouncing flashbangs, fix #1907 2015-09-01 12:46:15 +02:00
PabstMirror
7c276d9d25 Grenade Cleanup 2015-08-14 20:25:27 -05:00
jokoho48
7bf7066cfd Code cleanup of grenades module. 2015-08-13 22:36:58 +02:00
PabstMirror
040f4a92a0 #1696 - Flashbangs make big boom 2015-07-10 21:39:35 -05:00