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
2,100 Commits 73 Branches 88 Tags 752 MiB
d9e78e511e
Commit Graph

74 Commits

Author SHA1 Message Date
Jo David
33a14076fc Merge branch 'master' of https://github.com/acemod/ACE3 into translations 
Conflicts:
	addons/captives/stringtable.xml
	addons/medical/stringtable.xml
 2015-04-10 09:01:24 +02:00
PabstMirror
26d282c224 Explosives: Fix cursor interaction menu breaking 2015-04-09 22:46:19 -05:00
PabstMirror
253614d442 Explosives: cancel placement when opening interact 
"zoomtemp" doesn't work for me, so this gives an additional way to
cancel.  It was also possible to start planting multiple explosives.
made a small change to make QGVAR(PlantingExplosive) always reset
 2015-04-09 14:48:27 -05:00
esteldunedain
765ae4ee64 Merge branch 'master' into tabCleanup 
Conflicts:
	addons/explosives/functions/fnc_addClacker.sqf
	addons/explosives/functions/fnc_detonateExplosive.sqf
	addons/explosives/functions/fnc_getPlacedExplosives.sqf
	addons/explosives/functions/fnc_openDetonateUI.sqf
	addons/explosives/functions/fnc_openPlaceUI.sqf
	addons/explosives/functions/fnc_openTransmitterUI.sqf
	addons/explosives/functions/fnc_openTriggerSelectionUI.sqf
	addons/explosives/functions/fnc_placeExplosive.sqf
	addons/explosives/functions/fnc_place_Approve.sqf
	addons/explosives/functions/fnc_setPosition.sqf
 2015-04-07 15:00:56 -03:00
bux578
92da20ce62 translations 
#367
 2015-04-07 10:02:33 +02:00
Garth L-H de Wet
513ab25f54 Merge branch 'master' into explosiveInteraction 
Conflicts:
	addons/explosives/functions/fnc_placeExplosive.sqf
 2015-04-06 22:30:27 +02:00
Garth L-H de Wet
9d7d71b1b1 Changed the tabs to 4 spaces. Hopefully. 2015-04-06 22:20:11 +02:00
Garth "L-H" de Wet
e0b4efd9f1 Merge pull request #280 from KoffeinFlummi/explosiveInteraction 
Explosive interaction
 2015-04-06 22:12:04 +02:00
Garth L-H de Wet
44c597f7c5 Explosives, 2 spaces to 4 space tab. 2015-04-06 22:10:00 +02:00
jaynus
1bb6be5654 Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
Nou
6541600d44 Switch everything to use modelToWorldVisual instead of modelToWorld. 2015-04-03 15:26:27 -07:00
Garth L-H de Wet
7c73f7479e Used a more suitable icon for taking explosives. 2015-04-03 09:51:32 +02:00
Garth L-H de Wet
703bc24657 Made picking up explosives use the new AddToInventory function from common. 2015-04-02 21:44:33 +02:00
Garth L-H de Wet
452947148a Random clean ups and explosive can now detonate with their object. 
Defuse object doesn't get cleaned up on it's own. But if a player comes near it with interact menu on it will get cleaned up.
 2015-04-01 20:43:18 +02:00
Garth L-H de Wet
7d5555a2e0 Renamed functions to be more inline with their purpose. 
Removed legacy code.
 2015-04-01 19:09:19 +02:00
Garth L-H de Wet
c020128f0e Made explosives use children action points rather than the listbox at all points. 
Added the ability to defuse on explosives. "on explosives", there is a helper object that handles defusing.

Known issue, it appears that the attachTo explosives don't detonate. This means the currently approach should be changed to a object variable method, instead of an attached object method.
 2015-03-31 23:20:32 +02:00
Garth L-H de Wet
613257141b Merge branch 'removedExpPlaceMenu' into explosiveInteraction 
Conflicts:
	addons/explosives/CfgVehicles.hpp
	addons/explosives/functions/fnc_openPlaceUI.sqf
 2015-03-31 19:29:09 +02:00
Garth L-H de Wet
8158a3e841 Fixed small errors caused by working blind. 2015-03-31 19:26:38 +02:00
Garth L-H de Wet
9c13a87d83 Merge branch 'master' into explosiveInteraction 2015-03-31 17:21:55 +02:00
Garth L-H de Wet
37fe824426 Added pickup action to put down explosives. 2015-03-31 17:12:12 +02:00
bux578
05896a55ea fix authors 2015-03-24 19:40:48 +01:00
bux578
60c50e0daf Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons 2015-03-24 19:12:23 +01:00
Nicolás Badano
a823fb2dca Tweaks on action names to: 
- Remove >> for submenus
- Split long action names in two lines
 2015-03-24 00:16:32 -03:00
PabstMirror
20362e8dc9 Cleanup exception names 2015-03-23 15:22:26 -05:00
bux578
ba42ec831b second batch of icons 2015-03-23 20:02:35 +01:00
Nicolás Badano
386fee4694 Replace place list menu by dynamically created actions 2015-03-19 13:31:45 -03:00
PabstMirror
bed312dcee Use MACRO_ADDITEM from main instead of redefining 2015-03-11 17:36:40 -05:00
Garth L-H de Wet
ece4c8e0bc Merge branch 'master' into explosiveInteraction 2015-03-09 20:07:42 +02:00
Nicolás Badano
47eec69ebe Removed old config entries 2015-03-01 01:33:38 -03:00
Nicolás Badano
2b0cfac8e4 Removed obsolote code from ace_interaction (#109) 2015-02-28 23:00:24 -03:00
Garth L-H de Wet
9d1b1e1b12 Explosives are now placed first and then the trigger is set afterwards. 2015-02-20 03:28:16 +02:00
Garth L-H de Wet
88af894f55 Added a SetTrigger action to placement items in preparation for changes over to a set trigger after place system as opposed to before. 2015-02-20 00:45:31 +02:00
Garth L-H de Wet
910a6a16ab Split out the EPEContactStart code into its own function since it was quite long. 2015-02-20 00:44:54 +02:00
Garth L-H de Wet
96404bc42a Fixed isNull check not working. Fixed audio not being found. 2015-02-19 15:59:14 +02:00
Garth L-H de Wet
f5a6f6f404 Fixed various points raised in the PR. 2015-02-19 15:30:01 +02:00
Garth L-H de Wet
89a81dbed1 Forgotten function added. 2015-02-19 12:40:21 +02:00
Garth L-H de Wet
00643c3c83 Ensured actual fuse time is used instead of simply 1. 2015-02-19 12:39:13 +02:00
Garth L-H de Wet
8c83320675 Separated dialing phone code into separate function to neaten up the original function. 2015-02-19 12:32:41 +02:00
Garth L-H de Wet
e592f233f3 Merge branch 'master' into IEDSupport 2015-02-19 12:26:38 +02:00
Garth L-H de Wet
4d38e19f8c Should avoid potential conflicts of IED codes. 2015-02-04 02:19:56 +02:00
Garth L-H de Wet
749d068d2d Added IED handling (for the player and support for AI). Can dial an IED and it will ring before exploding. 2015-02-04 02:16:47 +02:00
Garth L-H de Wet
f2ef53168b Added the cellphone as a item. 2015-02-04 02:15:31 +02:00
Garth L-H de Wet
357927902d Fixed incorrect variable getting in openPlaceUI function. 2015-02-04 02:14:55 +02:00
Nicolás Badano
18fa6f9850 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into aceSettings 2015-02-03 17:48:24 -03:00
Nicolás Badano
74d0ae95ff Change ACE_Settings from modules 2015-02-03 02:53:02 -03:00
Garth L-H de Wet
c96882dd02 Fixed incorrect header comment for explosives. 2015-02-02 11:42:14 +02:00
Garth L-H de Wet
2440e4fa69 Fixed incorrect indenting with headers in explosives. 2015-02-02 10:35:17 +02:00
Garth L-H de Wet
eafc9e659c Fixed the headers of the explosives system to be the correct style. 2015-02-01 20:38:15 +02:00
Nicolás Badano
981978d043 ACE_Settings: replace all ACE_Parameters 2015-01-30 19:06:25 -03:00
PabstMirror
9631154926 Set ADDON variable in XEH_preInit 2015-01-29 01:38:46 -06:00