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,418 Commits 73 Branches 88 Tags 752 MiB
59fe345f60
Commit Graph

504 Commits

Author SHA1 Message Date
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
classicarma
4fabf8b1f1 translate exolosives 2016-09-17 01:44:45 +09:00
BaerMitUmlaut
b1f91f8cf5 Use directCall on tripflare effect 2016-09-08 21:22:32 +02:00
Glowbal
b489750d5b Minor optimizations using private, params, and isEqualType (#4323) 
* Optimizations with private, params, and isEqualType

* Fixed tab being used instead of space

* Fixed tabs inserted by notepad++

* More usage of new private syntax and params

- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax

* clean up and formatting
 2016-09-04 16:44:22 +02:00
[OMCB]kaban
64cf8aa95a Russain Translations Update (#4286) 2016-08-27 10:36:00 +02:00
Glowbal
d911dab5a7 Merge pull request #4191 from acemod/fix-4181 
add explosive devices to missing units, close #4181
 2016-08-20 12:25:56 +02:00
PabstMirror
f354bab3c2 Add Tripflare (#4152) 2016-08-13 11:29:01 +02:00
[OMCB]kaban
8fc2cbd0ef Russian Translations - Update (#4217) 2016-08-13 11:25:43 +02:00
PabstMirror
be3afe6eb3 Increase defuse range for underwater mines (#4195) 
Fix #4144
- Adds a 2nd defuse helper with increased range
 2016-08-02 18:29:31 -05:00
commy2
9a468c4068 add explosive devices to missing units, close #4181 2016-07-30 13:15:45 +02:00
Ozan Eğitmen
8f80cd59c8 Use GVAR where applicable 2016-07-20 07:15:18 +03:00
commy2
8a4514f8e7 use a function to do gestures 2016-07-12 16:16:01 +02:00
PabstMirror
74da791610 Proper fix for naval mines 2016-07-10 17:29:19 -05:00
PabstMirror
721bc205ef Allow defusing naval mines 
Fix #4074
- Workaround for naval mines not working with deactivate
- Add "isNotSwimming" exception to defuse progress bar
 2016-07-10 13:49:06 -05:00
Glowbal
eca5263df8 Merge pull request #3998 from acemod/apexUBC 
Fix UBC for 1.62 Apex
 2016-06-29 12:04:21 +02:00
PabstMirror
ed0823e40f Fix UBC for 1.62 Apex 2016-06-25 21:07:30 -05:00
esteldunedain
6f65155060 Rename the explosive orientations events again: 
- ace_explosives_clientRequestOrientations -> ace_explosives_sendOrientations
- ace_explosives_serverSendOrientations -> ace_explosives_orientationsSent
 2016-06-24 12:02:10 -03:00
esteldunedain
18f09b9310 Rename events: 
- ace_addedHeartRateAdjustment -> ace_heartRateAdjustmentAdded
- ace_cargoAddedByClass -> ace_cargoByClassAdded
- ace_enteredCardiacArrest -> ace_cardiacArrestEntered
- ace_itemAddedToTriageCard -> ace_triageCardItemAdded
- ace_reload_linkedAmmo ->  ace_reload_ammoLinked
- ace_reload_returnedAmmo -> ace_reload_ammoReturned
- ace_treatmentSuccess ->  ace_treatmentSucceded
- ace_common_engineOn -> ace_common_setEngine
- ace_explosives_clientRequestOrientations -> ace_explosives_requestOrientations
- ace_explosives_serverSendOrientations -> ace_explosives_sendOrientations
- ace_interaction_lampTurnOff -> ace_interaction_setLampOff
- ace_interaction_lampTurnOn -> ace_interaction_setLampOn
- ace_overheating_spareBarrelsLoadCoolest -> ace_overheating_loadCoolestSpareBarrel
- ace_overheating_spareBarrelsSendTemperatureHint -> ace_overheating_sendSpareBarrelTemperatureHint
Close #3533
 2016-06-24 10:45:13 -03:00
PabstMirror
fe5dd3fe76 Cleanup some undefined functions and strings 2016-06-20 13:58:37 -05: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
d26f133733 Add missing french entries in stringtables and update older ones 
Take changes from #3480 and completed empty entries
 2016-06-19 01:18:12 +02:00
Glowbal
8c9b31b1c7 Merge pull request #3815 from acemod/cbaEventSystem 
Deprecate ACE events framework
 2016-06-09 14:20:26 +02:00
jonpas
9287214781 Move Defuse action to main action 2016-06-07 00:51:06 +02:00
SilentSpike
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
Jonathan Pereira
b64b7e431e Translated remaining strings 2016-06-03 23:11:40 -03:00
Glowbal
694503c01b Fix medical events 2016-06-03 20:57:21 +02:00
Glowbal
fa2cf55156 Fix medical related events 2016-06-03 20:22:34 +02:00
PabstMirror
77baeda976 Merge branch 'master' into huehuehue 2016-06-03 00:01:13 -05:00
PabstMirror
db78dd53a8 Cleanup Merge and remoteFnc events 2016-06-02 19:59:18 -05:00
PabstMirror
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
jonpas
590d4fa70b Merge branch 'master' into abolishExecRemoteFnc 2016-06-02 14:28:43 +02: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
commy2
e7fa02d0d9 Merge pull request #3812 from acemod/cbaDelayedExecFnc 
Use new CBA delayed execution functions and deprecate ACE functions
 2016-05-30 21:02:29 +02:00
commy2
272775445f Merge pull request #3670 from acemod/useQuotedFuncMacros 
Use new quoted function macros
 2016-05-30 21:00:23 +02:00
jonpas
99675417c6 QGVAR and fix events in concertina_wire, disarming and explosives 2016-05-25 01:51:58 +02: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
d902d1182a Replace ace_common_fnc_execRemoteFunc with events 2016-05-21 23:55:48 +02:00
Glowbal
dbe70a7094 Merge pull request #3761 from acemod/cleanupExplosiveSync 
Fix explosive sync on dedicated server
 2016-05-07 22:46:35 +02:00
Ozan Eğitmen
b8abec0c61 Fix Capitalization of ACE Settings classes. (#3627) 2016-05-07 22:14:56 +02:00
PabstMirror
28c65c4bed Fix explosive sync on dedi 2016-05-05 14:36:56 -05:00
Glowbal
83a8c488d9 Merge pull request #3751 from acemod/wipeoutWhitespace 
Cleaned up excessive whitespace
 2016-05-04 11:46:56 +02:00
BaerMitUmlaut
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
ProfessorCZ
7d0fcde9fa CZ Translate - Update 
04/30/2016
 2016-04-30 00:57:24 +02:00
PabstMirror
9bd66bc40f Cleanup scopeCurator 2016-04-21 15:07:13 -05:00
PabstMirror
c432ce714e Make explosives helpers hidden in eden. 2016-04-21 13:56:32 -05:00
jonpas
ccaec31a90 Use new QFUNC and QEFUNC macros 2016-04-08 20:43:26 +02:00
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
bux578
076803951d Merge pull request #3628 from alef/translation/15bn/alef 
Italian translation
 2016-03-31 06:54:31 +02:00
commy2
666a4030b5 make FUNC(scriptedExplosive) work in scheduled env, ref #3621 2016-03-29 13:21:13 +02:00
Alessandro Foresi
e97c7c0f65 Translation: IT completed (with BOM) 2016-03-27 21:22:15 +02:00
Alessandro Foresi
e5a7578f92 Translation: IT completed (no BOM) 2016-03-27 21:20:15 +02:00
Thomas Kooi
daceaa9dd8 Merge branch 'master' into settingsNameDescp 2016-03-18 14:48:11 +01:00
Thomas Kooi
60af0d3162 Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR 
Standardize GVAR array brackets in configs.
 2016-03-08 18:19:50 +01:00
PabstMirror
b5e95f3945 Add some names/descriptions to settings configs 2016-03-08 01:17:40 -06:00
commy2
a9578ab473 Merge pull request #3524 from acemod/fixCancelAction 
Fix Cancel (RMB) Action
 2016-03-06 19:16:40 +01:00
jonpas
858c68f8d7 Don't use modifier for rotation where not needed 2016-03-06 16:54:27 +01:00
jonpas
52007fab6a Add sanity checks, fix explosives checks 2016-03-06 12:06:17 +01:00
Nicolás Badano
9f205b4a54 Merge pull request #3509 from acemod/fix3379 
Increase interaction distance with explosives from 1m to 1.5m.
 2016-03-05 22:08:31 -03:00
jonpas
ef95e278f9 Fix Cancel Action by moving it to MouseButtonDown display EH 2016-03-03 17:35:43 +01:00
esteldunedain
e0493458c0 Reduce interaction distance for defusing back to 1m 2016-03-02 16:19:38 -03:00
esteldunedain
928a9b9485 Increase interaction distance with explosives from 1m to 1.5m. Fix #3379 2016-03-02 15:25:41 -03:00
jonpas
4918dbacb0 Replace and depreacate EFUNC(common,addScrollWheelEventHandler) with MouseZChanged Display EH 2016-03-02 17:33:46 +01:00
commy2
fa3913752b replace XEH_ENABLED macro with actual class, fix #3482, fix #3483 2016-03-01 17:05:00 +01:00
Jonathan Pereira
309f48ee0b Added remaining PT-BR translarions 2016-03-01 08:56:43 -03:00
VKing
8bb7b072d4 Standardize grammar of GVAR arrays in configs to place the square brackets outside the GVAR macro. 
This prevents any possible confusion when the GVARs are used in code.
 2016-02-28 15:18:15 +01:00
BlackWindowS
c61e7b5104 Tweaked & added translations 
Translation of almost every STR to French
 2016-02-28 14:48:04 +01:00
esteldunedain
188941a9b7 Filter the GVAR(explosivesOrientations) list before sending it 2016-02-27 10:07:51 -03:00
esteldunedain
fba1a322ac Yet more fixes 2016-02-27 09:50:44 -03:00
esteldunedain
823eb116ae more fixes 2016-02-27 09:37:57 -03:00
esteldunedain
8280335d07 Fix event name typo 2016-02-27 09:26:42 -03:00
esteldunedain
b9e1028f23 Merge branch 'fix3317' of github.com:KoffeinFlummi/ACE3 into fix3317 2016-02-27 09:14:16 -03:00
esteldunedain
834cbb4d24 Debug stuff 2016-02-27 09:14:07 -03:00
esteldunedain
db4974eae2 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into fix3317 
Conflicts:
	addons/medical/CfgEden.hpp
	addons/repair/CfgEden.hpp
 2016-02-27 08:48:57 -03:00
jonpas
10abe5cd57 Merge branch 'master' into German-translations 2016-02-27 01:36:07 +01:00
NorXAengell
0006f72663 Minor correction in explosive 2016-02-26 19:38:51 +01:00
NorXAengell
ea461446f9 Translation Fr 2016-02-26 19:24:53 +01:00
System98
48d312cb8e Add german translations 
- add missing german translations
- small fixes to existing texts
- remove unused strings in "medical" addon
 2016-02-25 18:10:26 +01:00
esteldunedain
71707bc81a Some spanish translations for 3.5.0 2016-02-25 10:54:19 -03:00
Nicolas Diego Badano
5af4e1ca25 Fix trace 2016-02-24 12:17:48 -03:00
Nicolas Diego Badano
c6f6e4e9f7 Let this finally fix it please 2016-02-24 12:14:47 -03:00
esteldunedain
b32732cad0 Delete the logic and group after used 2016-02-23 19:29:18 -03:00
esteldunedain
66fa18888e Use the logic directly to determine client 2016-02-23 18:53:33 -03:00
esteldunedain
f9ef100fad Broadcast client 2016-02-23 11:56:46 -03:00
esteldunedain
056244602d Get the client ID from a new logic object 2016-02-23 10:09:55 -03:00
esteldunedain
645ed3e63d Resync mine orientations in JIP. Fix #3317 2016-02-23 09:53:38 -03:00
commy2
0f7bfc0f66 Merge pull request #3389 from acemod/precompileongamestart 
precompile on game start
 2016-02-22 16:00:19 +01:00
commy2
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
licht-im-Norden87
d4cca14929 explosives 2016-02-20 23:19:51 +01:00
ChairborneIT
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
Thomas Kooi
14b526d417 Merge pull request #3272 from acemod/deadmanBombVest 
Deadman switch - trigger explosives in inventory
 2016-02-20 17:11:06 +01:00
PabstMirror
ed653456e5 Merge pull request #3338 from acemod/translations156merge 
Fix Merge Conflicts on More Italian Translations
 2016-02-19 15:09:40 -06:00
bux578
93e655588b Merge pull request #3294 from gienkov/pltranslations 
pl translation
 2016-02-18 19:38:43 +01:00
PabstMirror
dccc1d33fd Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge 2016-02-17 12:30:03 -06:00
gienkov
d5dd718b8d fix endlines 2016-02-09 12:01:13 +01:00
gienkov
fafd25dee7 pl translation 2016-02-09 11:50:35 +01:00
VKing
f92b798586 Switch to select (is even slightly faster) 2016-02-07 13:09:01 +01:00
PabstMirror
9b3ca2822f Change german stringtable 2016-02-05 14:46:30 -06:00
PabstMirror
deac4395c1 Deadman switch - trigger explosives in inventory 
Also allow manual triggering of the deadman device
 2016-02-05 11:40:11 -06:00
Thomas Kooi
8c9523e36b Merge pull request #3151 from acemod/explosives_cleanup_plus_minetriggers 
Various explosives enhancements
 2016-02-04 19:56:27 +01:00
Thomas Kooi
e0946c3fc5 Merge pull request #3106 from acemod/explEvents 
Explosive events, fix #3104
 2016-02-04 19:52:10 +01:00
ProfessorCZ
61611d0ec7 Czech Translation - Update 
Update
 2016-02-03 18:31:31 +01:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
PabstMirror
78729e96ff Fix bad forceWalk params 2016-01-24 11:39:59 -06:00
VKing
9501c54530 Fix #3203 IEDs magically changing shape 2016-01-22 14:21:25 +01:00
VKing
68531bd4a9 Merge branch 'master' into explosives_cleanup_plus_minetriggers 2016-01-22 14:15:45 +01:00
PabstMirror
04bccf47d7 Replace all use of deprecated commands 2016-01-19 09:39:07 -06:00
Thomas Kooi
33479ffcae Merge pull request #3146 from acemod/Explosives_DetonateTrigger 
Function to detonate explosives via script
 2016-01-19 09:38:43 +01:00
Thomas Kooi
46f832379a Merge pull request #3120 from acemod/explosives_actionmenu_cleanup 
Clean up explosive interaction menu
 2016-01-19 09:32:26 +01:00
VKing
e3123b3f56 Local check before setPosition 2016-01-16 01:13:01 +01:00
VKing
17aaf477fe Standardize displayName for the M26/Mk26/M152/whatever this is 2016-01-15 11:47:40 +01:00
VKing
cfea80bec8 Animate preplaced bottom attack SLAMs 2016-01-15 10:49:22 +01:00
VKing
248eb2143b Fix inconsistent detonator pictures for some IEDs 2016-01-15 10:20:49 +01:00
VKing
0078ad862a Remove redundant entries. 
Not removing them as it can be useful to have a reminder that those classes exist.
 2016-01-15 09:33:01 +01:00
VKing
4e8ea4f8e6 Fix detonate action pictures 2016-01-15 00:25:02 +01:00
VKing
05c80c2368 Gah stop that you jerk! 2016-01-15 00:04:12 +01:00
VKing
ed8b437a8f Prep function 2016-01-14 23:58:31 +01:00
VKing
32b33d7792 How the feck did this happen 2016-01-14 23:58:07 +01:00
VKing
8bdb2cb7f7 GVAR it. 2016-01-14 23:05:56 +01:00
VKing
575f37c8fd Add fnc_connectExplosive to add editor explosives to unit triggers 2016-01-14 23:05:26 +01:00
VKing
099648b6b6 Russian translation as suggested 2016-01-14 18:51:14 +01:00
VKing
73e093ec07 Make stringtable a little more translatable 2016-01-13 22:39:37 +01:00
VKing
2c26d3836b Some fixes for the zeus modules 2016-01-13 22:39:14 +01:00
VKing
1ae21ad354 Change SLAM bottom attack ammo to be more bottom attacky 2016-01-13 15:41:20 +01:00
VKing
b87a6327ee Fix Zeus modules not showing up 2016-01-13 15:40:39 +01:00
VKing
058ea4e8f4 Actual editor mines 2016-01-13 01:03:50 +01:00
VKing
f90dd9fed8 Allow SLAMs to use long range transmitter 2016-01-13 00:14:17 +01:00
VKing
46643d44d0 Add editor/zeus modules for different trigger options 2016-01-13 00:13:56 +01:00
VKing
a07d456476 Change small IEDs to use smaller pressure plates 2016-01-12 23:17:10 +01:00
VKing
61f288c9cc Rename custom classes with ACE_ prefix 2016-01-12 23:16:49 +01:00
VKing
4fc7c3065e Rename to fnc_scriptedExplosive 2016-01-11 23:41:33 +01:00
VKing
01dd663337 Add fnc_detonateExplosiveTrigger 2016-01-11 23:36:34 +01:00
VKing
9985988987 Change ACE_Player to _unit 2016-01-06 18:05:06 +01:00
PabstMirror
4c229c92f5 Add Stringtable Entry 2016-01-05 17:29:01 -06:00
PabstMirror
b6dce03c90 Fix Header 2016-01-05 17:16:47 -06:00
VKing
1706ca0adc Move detonate actions from "Detonate" layer to "Explosives" layer. 
Remove inconsistent ">>" from explosive actions.
 2016-01-06 00:06:06 +01:00
VKing
cc8ac69feb Add function and action to detonate all explosives on a detonator 2016-01-05 23:47:01 +01:00
Alessandro Foresi
c16d97cad0 Merge branch 'master' into translation/15bn/alef 2016-01-03 12:23:27 +01:00
bux
977bda83e5 add 2 new events, add unit to place event 
defuse and explodeOnDefuse
 2016-01-01 21:47:39 +01:00
licht-im-Norden87
2d64d54d98 Update German Stringtable 
Iam sure there was a translation some time ago. Someone must have deleted it.

spelling mistake

Update Stringtable

100% some of them already existed in german language

Update stringtable.xml

spelling mistake

Update stringtable.xml

Iam not sure if SSWT is a Scharfschützenzweibein. However, it was used before, i just adpated it.

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Handelt es sich bei dem Modell den auch um das Produkt von Sharpshooters® http://shop.centermassinc.com/Sharpshooters-Sniper-Weapon-Tripod-Kit-764737932766.htm bzw ist ads erkennbar. Ich persönlich halte die Bezeichnung SSWT-Kit für ein wenig ungünstig.

Update stringtable.xml
 2015-12-31 14:17:13 -06:00