Commit Graph

170 Commits

Author SHA1 Message Date
nomisum
ada07758c5 Explosives - Add Event for tripflare triggering (#6663)
* Add Event for tripflare triggering

_flare might be useful to delete / replace flare
_position is already available, so why not send it too

* added documentation

also added missing wirecutter event
2018-11-09 12:27:43 -06:00
mharis001
4c047702c8 Improve mouse hint (#6652) 2018-11-01 12:46:46 -05:00
mharis001
0fd1a4c39e Convert CBA_fnc_uniqueUnitItems to common fnc_uniqueItems (#6593) 2018-09-22 21:59:16 -05:00
mharis001
8648ccaba5 Explosives - Optimize creating explosive place actions (#6413)
* Optimize explosive actions

* Optimize hasExplosives function

* Readability parentheses

* bump

* testing...

* last try

* for science

* fix for sqf_validator
2018-09-21 22:54:24 -05: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
mharis001
803d497d8a Improve checking of unit items (#6350)
* Add uniqueItems function

* Optimize dogtag children actions function

* Optimize getDetonators item search

* Store CfgWeapons lookup in getDetonators

* Update items to use new function

* Update items to use new function 2

* More optimization of uniqueItems function

* Update items to use new function 3
2018-09-17 14:03:28 -05:00
commy2
66da48fcdb
Merge pull request #6402 from mharis001/explosives-timer
Explosives - New Timer UI
2018-09-13 06:39:50 +02:00
PabstMirror
f2a57797da Make sure explosive is still valid when updating timer 2018-09-12 23:07:39 -05:00
Josuan Albin
9f85a53711 Fix error in setupExplosive with CBA 3.8.0 (#6476)
* Fix error in setupExplosive with CBA 3.8.0

getFov has a param check now, this function was passing args to it and causing an error.

* Fix getFov call in attach and viewDistance modules
2018-07-31 17:36:22 -05:00
mharis001
a84daca959 Explosives - Optimize interactEH function (#6406)
* Optimize explosives interactEH

* Use local player variable and distanceSqr
2018-07-13 12:04:55 -05:00
commy2
613c088124
bump 2018-06-25 08:42:43 +02:00
commy2
b7e3646697 don't make Explosives close one display at death 2018-06-25 00:08:15 +02:00
Unknown
bbbfabec03 Add new explosive timer UI 2018-06-22 15:41:43 -04:00
SilentSpike
4bb16c043c
Optimise cellphone IED function slightly (#6005)
* Optimise cellphone IED function slightly
* Fix distribution and use CBA function
2018-01-02 16:18:12 +00:00
commy2
bcf834d2c7
Merge pull request #5894 from acemod/ownerEvent-instead-of-local-logic
use ownerEvent instead of game logics
2018-01-02 16:16:58 +01:00
Jo David
54320eb451 Fix(explosives): Selecting a cellphone as an IEDs trigger would throw an error (#5963)
* move code var to outer scope

* run closeDialog only for the player
2017-12-26 17:20:43 -06:00
commy2
1a28d69b9e remove obsolete mine jip synch (#5895) 2017-12-12 18:01:47 +01:00
Dystopian
36b61fdb6e Block adv. throwing when player is busy (#5534)
* Add throw blocking status effect

* Add concertina_wire and tripod support

* Add launcher in hands support

* Disable effect sending more than once

* Fix EFUNC using, add trace

* Disable vanilla throw blocking

* Improve status handling

* Fix rearm status key
2017-12-07 11:26:21 -06:00
PabstMirror
cd30b09b4f Convert ACE_settings to CBA_settings (#4895)
* Convert ACE_settings to CBA_settings

* Run Modules Globaly, BWC for SetSetting

* Add support for string settings

* ACE_ServerSettings warning

* Add handler for global setting being changed

* Add deprecated and replaced not to Settings Framework doc

* Remove options menu UI, Move Debug and HeadBug Fix to Options in Pause Menu

* Change modules scope to 1

* Disable debug
2017-11-11 20:21:55 +01:00
jonpas
d598906205 Fix defused UXOs being able to be defused again and detected by mine detector (#5623) 2017-10-15 13:13:16 +02:00
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