Commit Graph

59 Commits

Author SHA1 Message Date
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
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
8158a3e841 Fixed small errors caused by working blind. 2015-03-31 19:26:38 +02:00
9c13a87d83 Merge branch 'master' into explosiveInteraction 2015-03-31 17:21:55 +02:00
37fe824426 Added pickup action to put down explosives. 2015-03-31 17:12:12 +02:00
05896a55ea fix authors 2015-03-24 19:40:48 +01:00
60c50e0daf Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons 2015-03-24 19:12:23 +01:00
a823fb2dca Tweaks on action names to:
- Remove >> for submenus
- Split long action names in two lines
2015-03-24 00:16:32 -03:00
20362e8dc9 Cleanup exception names 2015-03-23 15:22:26 -05:00
ba42ec831b second batch of icons 2015-03-23 20:02:35 +01:00
386fee4694 Replace place list menu by dynamically created actions 2015-03-19 13:31:45 -03:00
bed312dcee Use MACRO_ADDITEM from main instead of redefining 2015-03-11 17:36:40 -05:00
ece4c8e0bc Merge branch 'master' into explosiveInteraction 2015-03-09 20:07:42 +02:00
47eec69ebe Removed old config entries 2015-03-01 01:33:38 -03:00
2b0cfac8e4 Removed obsolote code from ace_interaction (#109) 2015-02-28 23:00:24 -03:00
9d1b1e1b12 Explosives are now placed first and then the trigger is set afterwards. 2015-02-20 03:28:16 +02:00
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
910a6a16ab Split out the EPEContactStart code into its own function since it was quite long. 2015-02-20 00:44:54 +02:00
96404bc42a Fixed isNull check not working. Fixed audio not being found. 2015-02-19 15:59:14 +02:00
f5a6f6f404 Fixed various points raised in the PR. 2015-02-19 15:30:01 +02:00
89a81dbed1 Forgotten function added. 2015-02-19 12:40:21 +02:00
00643c3c83 Ensured actual fuse time is used instead of simply 1. 2015-02-19 12:39:13 +02:00
8c83320675 Separated dialing phone code into separate function to neaten up the original function. 2015-02-19 12:32:41 +02:00
e592f233f3 Merge branch 'master' into IEDSupport 2015-02-19 12:26:38 +02:00
4d38e19f8c Should avoid potential conflicts of IED codes. 2015-02-04 02:19:56 +02:00
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
f2ef53168b Added the cellphone as a item. 2015-02-04 02:15:31 +02:00
357927902d Fixed incorrect variable getting in openPlaceUI function. 2015-02-04 02:14:55 +02:00
18fa6f9850 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into aceSettings 2015-02-03 17:48:24 -03:00
74d0ae95ff Change ACE_Settings from modules 2015-02-03 02:53:02 -03:00
c96882dd02 Fixed incorrect header comment for explosives. 2015-02-02 11:42:14 +02:00
2440e4fa69 Fixed incorrect indenting with headers in explosives. 2015-02-02 10:35:17 +02:00
eafc9e659c Fixed the headers of the explosives system to be the correct style. 2015-02-01 20:38:15 +02:00
981978d043 ACE_Settings: replace all ACE_Parameters 2015-01-30 19:06:25 -03:00
9631154926 Set ADDON variable in XEH_preInit 2015-01-29 01:38:46 -06:00
bf791e32c4 Merge pull request #93 from KoffeinFlummi/progresBarNew
#87 - New Progress Bar
2015-01-27 19:28:51 -06:00
bf452b2c24 Create README.md 2015-01-26 13:42:07 +01:00
5e932f8c71 Replace calls to progressBar
Mag repack
Defuse
Swap Barrel
2015-01-26 00:24:33 -06:00
6e8c394903 Standardize Config Version Stuff 2015-01-18 01:32:07 -06:00
4926b6970b fixes typos 2015-01-17 13:45:56 -03:00
fefb599a55 explosives: change addPerFrameHandler to waitAndExecute 2015-01-17 03:09:51 -03:00
800e16edc5 explosives: fix timer in case the game pauses 2015-01-17 02:14:09 -03:00
a4a4ca39f6 explosives: fixed timer #26 2015-01-15 17:06:38 -03:00
f06da9a8c1 explosives: missing include 2015-01-15 16:57:27 -03:00
1d5201c0d7 explosives: Fix #32 2015-01-15 16:13:12 -03:00
de8ca47e88 change some core to common 2015-01-14 14:28:04 +01:00
c16c5e756c explosives: fixes 2015-01-14 10:13:04 -03:00
167497ec2f small fixes for explosives and interaction 2015-01-14 10:11:46 -03:00
2df8f4f1fb Cleanup old AGM 2015-01-13 19:57:15 -06:00
66eeba7df1 Fixed small errors that expressed themselves when getting explosives in game. 2015-01-13 23:49:27 +02:00