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
15,589 Commits 73 Branches 88 Tags 752 MiB
d56a3a6a95
Commit Graph

200 Commits

Author SHA1 Message Date
Dedmen Miller
81e02a7336 Refactor private ARRAY to private keyword (#5598) 
* Everything

* Fixed missing ;

* Fix missing ; and double private

* Fixed cannot isNull on number

* Turn _temparture back to isNil

* Fix error from merge
 2017-10-10 09:39:59 -05:00
jonpas
eb6e8c0b56 Cleanup optional argument headers (#5543) 2017-09-22 17:33:08 +02:00
PabstMirror
c7b804a685 Add ace_explosive support for orange dlc mines (#5486) 2017-09-10 09:44:57 -05:00
Phyma
48b9a61497 Fix Large IED defuse distance (#5261) 
* Fix for large-ied bug because underwater thing have changed

* Added size of IED in config and determine defuse range

* Added typo

* Added help text to wiki about defusing

* Better English

* Increased the defusal range on large bombs make it similar to small ieds

* Add wiki doc
 2017-06-09 12:52:55 -05:00
Phyma
ffaa195fe5 Conform function headers to coding guidelines (#5255) 
* Fixed headers to work with silentspike python script

* Fixed rest of the files

* Fixed ace-team
 2017-06-08 15:31:51 +02:00
PabstMirror
08217f460e Explosives - Add code handler for detonation (#5115) 
* Explosives - Add code handler for detonation

* Add info to wiki

* Fix cellphone in demo code, move example to wiki
 2017-05-10 11:28:44 -05:00
PabstMirror
5379503772 Fix deadman range, fix clacker transfer, use setShotParents (#4689) 2016-12-14 14:06:32 -06:00
commy2
370e746068 fix tripflares script error (#4647) 2016-11-09 13:02:48 -06: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
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
PabstMirror
f354bab3c2 Add Tripflare (#4152) 2016-08-13 11:29:01 +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
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
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
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02: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
BaerMitUmlaut
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
commy2
666a4030b5 make FUNC(scriptedExplosive) work in scheduled env, ref #3621 2016-03-29 13:21:13 +02: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
jonpas
ef95e278f9 Fix Cancel Action by moving it to MouseButtonDown display EH 2016-03-03 17:35:43 +01:00
esteldunedain
fba1a322ac Yet more fixes 2016-02-27 09:50:44 -03:00
esteldunedain
834cbb4d24 Debug stuff 2016-02-27 09:14:07 -03:00
esteldunedain
645ed3e63d Resync mine orientations in JIP. Fix #3317 2016-02-23 09:53:38 -03: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
VKing
f92b798586 Switch to select (is even slightly faster) 2016-02-07 13:09:01 +01: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
PabstMirror
78729e96ff Fix bad forceWalk params 2016-01-24 11:39:59 -06: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
VKing
4e8ea4f8e6 Fix detonate action pictures 2016-01-15 00:25:02 +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
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
cc8ac69feb Add function and action to detonate all explosives on a detonator 2016-01-05 23:47:01 +01:00
bux
977bda83e5 add 2 new events, add unit to place event 
defuse and explodeOnDefuse
 2016-01-01 21:47:39 +01:00
bux
2a6042bf61 add interaction position and defuse object position 
and reduce interaction distance
 2015-12-30 09:11:57 +01:00
commy2
411a8d58f3 fix more setVariable and getVariable capitalization 2015-11-30 17:53:57 +01:00
commy2
d037f00a92 fix forEachIndex capitalization 2015-11-30 17:25:16 +01:00
commy2
b3950bd7f0 fix forEach capitalization 2015-11-30 17:23:48 +01:00
commy2
a8228f60c2 fix configFile capitalization 2015-11-30 17:23:02 +01:00
commy2
d9b90258bc fix typeOf capitalization 2015-11-30 17:19:57 +01:00
commy2
ca9b909e75 fix CBA_fnc capitalization 2015-11-30 16:45:20 +01:00
VKing
069169cc72 Changed ACE_time back to time in comments where appropriate 2015-10-21 22:52:21 +02:00
PabstMirror
5add8d6789 #2537 - Delay one frame when selecting explosives 2015-09-22 11:31:58 -05:00
Michael Braun
5047d4de1c Switched to ACE_LOG<LEVEL>_# variation 2015-08-26 17:39:44 +02:00
Michael Braun
097506076f Fixed format usage in macros requiring ARR_# for it to work 2015-08-26 16:48:55 +02:00
Michael Braun
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +02:00
PabstMirror
cc9eee5609 Typo 2015-08-21 09:42:23 -05:00
PabstMirror
4c14dc7684 #2208 - Use ACE Message Display instead of sideChat 2015-08-19 17:25:45 -05:00
PabstMirror
61bc40a650 Opps 2015-08-16 02:05:34 -05:00
PabstMirror
b9638f749b SetPosition Event - Fix digging down (#1991) 2015-08-16 01:51:44 -05:00
PabstMirror
fc6cd34d33 params, cleanup 2015-08-15 14:35:33 -05:00
PabstMirror
7203bb2a3d Cleanup Debug, Limit Satchel Mass 2015-08-05 12:22:43 -05:00
PabstMirror
a6292db1e8 #2018 - Dead Mans Switch / unconscious 2015-08-05 11:54:45 -05:00
PabstMirror
9f078d405b Tweak Place when Prone 2015-07-25 02:10:33 -05:00
PabstMirror
bff629be9c Fix PositionAsl / Update mouse hints 2015-07-25 01:42:17 -05:00
PabstMirror
bc953b32bc More Stuff 2015-07-18 00:36:47 -05:00
PabstMirror
df90c4b88e More Attach Stuff 2015-07-16 23:59:31 -05:00
PabstMirror
1f4488253d Only attach some triggers 2015-07-15 23:52:47 -05:00
PabstMirror
7cc2628c53 Stuff 2015-07-15 03:18:19 -05:00
PabstMirror
104d1a1cc7 Attaching (Rotate to verticle) 2015-07-15 02:54:38 -05:00
PabstMirror
6130b5b373 Working Demo 2015-07-14 00:24:55 -05:00
AKALegman
c027db2e0e final fixes 2015-06-15 20:55:49 +01:00
AKALegman
0690e6f745 fixed conflicts 2015-06-14 09:36:03 +01:00
AKALegman
46ed9416ed improved explosives v2 2015-06-06 18:58:42 +01:00
AKALegman
f9a7ab5ae0 improved explosives 2015-06-06 10:11:00 +01:00
jonpas
541f1010a7 Merge branch 'master' into macroSTR 
Conflicts:
	addons/attach/functions/fnc_attach.sqf
	addons/captives/functions/fnc_moduleSurrender.sqf
	addons/common/CfgVehicles.hpp
	addons/explosives/CfgModule.hpp
	addons/hearing/CfgVehicles.hpp
	addons/interaction/CfgVehicles.hpp
	addons/map/CfgVehicles.hpp
	addons/microdagr/CfgVehicles.hpp
	addons/mk6mortar/CfgVehicles.hpp
	addons/nametags/CfgVehicles.hpp
	addons/nightvision/functions/fnc_changeNVGBrightness.sqf
	addons/respawn/CfgVehicles.hpp
	addons/switchunits/CfgVehicles.hpp
	addons/vehiclelock/CfgVehicles.hpp
	addons/winddeflection/stringtable.xml
 2015-06-02 22:14:32 +02:00
PabstMirror
23d300df52 Merge pull request #1417 from acemod/localDefuseObjects 
Explosives - Local defuse objects
 2015-05-30 15:46:07 -05:00
jonpas
d934c25b78 Merge branch 'master' into macroSTR 
Conflicts:
	addons/interact_menu/ACE_Settings.hpp
 2015-05-30 19:54:32 +02:00
jonpas
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
Garth L-H de Wet
529e200a4c Made explosives Zeus and AI compatible specifically in regards to Deadman's switches. 2015-05-28 17:56:45 +02:00
PabstMirror
5f2bee09e4 Create Defuse Helpers on demand 2015-05-27 14:09:06 -05:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
PabstMirror
adf29d75e3 Explosives - Local Defuse Helpers 2015-05-26 23:15:50 -05:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
Garth L-H de Wet
8edeb45d6d Changed the animation from medic to put when placing an explosive. Added a put animation when setting the trigger for an explosive. 2015-05-20 17:17:09 +02:00
ulteq
a6f4c68ef4 Removed obsolete comment 2015-05-01 13:50:01 +02:00
ulteq
940f8e8349 Cleanup++: 
*Removed spawn
*Added, moved and renamed some privates
 2015-05-01 11:38:09 +02:00
ulteq
e8264110bb Replaced sleep with waitAndExecute 2015-05-01 10:12:41 +02:00
ulteq
4eec4da37c Merge pull request #912 from acemod/explosiveFixAttachDeleteVehicleFix 
Explosive fix attach delete vehicle fix
 2015-04-29 21:32:28 +02:00
ulteq
608af39a67 Added proper dummy object cleanup code 2015-04-29 21:22:07 +02:00
ulteq
87d1f7c281 Fixes: https://github.com/acemod/ACE3/pull/909#issuecomment-97377112 2015-04-29 12:24:56 +02:00
Glowbal
7ca35bf823 prevent multiple detonators of same type to be displayed #835 
As per @CorruptedHeart suggestion.

> Just needs a
> if (getNumber (_config >> "ACE_Detonator") == 1 && {!(_x in _result)}) then {
 2015-04-29 10:44:10 +02:00
PabstMirror
e56838be36 Private Variables 2015-04-29 00:05:02 -05:00
PabstMirror
409851dd8c Attach the real explosive 2015-04-28 23:57:11 -05:00