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,541 Commits 73 Branches 88 Tags 752 MiB
c292f0ed31
Commit Graph

105 Commits

Author SHA1 Message Date
PabstMirror
b192be0b70 Fix merge, cbaEvents, macros, cleanup 2017-05-18 12:42:02 -05:00
PabstMirror
46c041e6bc Merge branch 'rearm_supply' of https://github.com/GitHawk/ACE3 into GitHawk-rearm_supply 
Conflicts:
	addons/attach/functions/fnc_getChildrenAttachActions.sqf
	addons/common/functions/fnc_dumpArray.sqf
	addons/common/functions/fnc_removeAllEventHandlers.sqf
	addons/common/functions/fnc_removeEventHandler.sqf
	addons/common/functions/fnc_serverEvent.sqf
	addons/common/functions/fnc_waitUntilAndExecute.sqf
	addons/explosives/functions/fnc_scriptedExplosive.sqf
	addons/finger/config.cpp
	addons/frag/config.cpp
	addons/interact_menu/functions/fnc_handlePlayerChanged.sqf
	addons/laser/functions/fnc_laserOn.sqf
	addons/laser/functions/fnc_seekerFindLaserSpot.sqf
	addons/laser/functions/fnc_unitTurretCanLockLaser.sqf
	addons/laser/functions/fnc_vanillaLaserSeekerHandler.sqf
	addons/laser_selfdesignate/functions/fnc_findLaserSource.sqf
	addons/laser_selfdesignate/functions/fnc_laserHudDesignateOff.sqf
	addons/main/config.cpp
	addons/main/script_mod.hpp
	addons/map/functions/fnc_flashlightGlow.sqf
	addons/maptools/functions/fnc_addLineMarker.sqf
	addons/maptools/functions/fnc_canDraw.sqf
	addons/maptools/functions/fnc_cancelDrawing.sqf
	addons/maptools/functions/fnc_copyMapReceiveMarkers.sqf
	addons/maptools/functions/fnc_copyMapRemoteSend.sqf
	addons/maptools/functions/fnc_copyMapStart.sqf
	addons/maptools/functions/fnc_handleKeyDown.sqf
	addons/maptools/functions/fnc_handleMouseZChanged.sqf
	addons/maptools/functions/fnc_removeLineMarker.sqf
	addons/maptools/functions/fnc_updateLineMarker.sqf
	addons/missileguidance/functions/fnc_checkLos.sqf
	addons/missileguidance/functions/fnc_checkSeekerAngle.sqf
	addons/overheating/CfgWeapons.hpp
	addons/overheating/functions/fnc_swapBarrelCallback.sqf
	addons/rearm/XEH_postInit.sqf
	addons/rearm/XEH_respawn.sqf
	addons/rearm/functions/fnc_canRearm.sqf
	addons/rearm/functions/fnc_dropAmmo.sqf
	addons/rearm/functions/fnc_getMaxMagazines.sqf
	addons/rearm/functions/fnc_grabAmmo.sqf
	addons/rearm/functions/fnc_pickUpAmmo.sqf
	addons/rearm/functions/fnc_rearmEntireVehicleSuccess.sqf
	addons/rearm/functions/fnc_rearmEntireVehicleSuccessLocal.sqf
	addons/rearm/functions/fnc_rearmSuccess.sqf
	addons/rearm/functions/fnc_rearmSuccessLocal.sqf
	addons/rearm/functions/fnc_storeAmmo.sqf
	addons/repair/functions/fnc_useItem.sqf
	addons/tagging/CfgVehicles.hpp
	addons/ui/ACE_UI.hpp
	optionals/tracers/config.cpp
 2017-05-17 18:21:11 -05:00
PabstMirror
f69148bdc0 Disable rearm,refuel on dead vehicles (#5158) 2017-05-13 17:36:53 -05:00
PabstMirror
3ce0865913 Add getInteractionDistance and fix VTOL refuel/arm (#4882) 2017-02-10 12:34:51 -06: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
Glowbal
4251831e2e Merge pull request #4009 from acemod/fixRearmEvents 
Fix rearm events
 2016-06-28 20:33:56 +02:00
PabstMirror
8bd3332b0e rearm - Skip selectWeapon on nil 
Should fix #4006
 2016-06-27 00:00:25 -05:00
PabstMirror
8ecd8a49cc Fix rearm events 2016-06-26 23:37:23 -05:00
Glowbal
12a1f10a29 Merge pull request #3944 from acemod/funcHeaders 
Cleanup Function Headers Titles
 2016-06-18 11:57:43 +02:00
jonpas
03e923aa68 Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
Githawk
0723df7dea Replace execRemoteFnc with CBA events in rearm 2016-06-18 11:44:36 +02:00
GitHawk
bc90a85bcd Improvements 2016-06-07 10:26:22 +02:00
Githawk
9cfa2f11d9 Stuff 
Arguments, Return Value, (optional)
 2016-06-06 20:42:20 +02:00
Githawk
ef4e232664 Merge remote-tracking branch 'master' into rearm_supply 2016-06-06 20:28:27 +02:00
Githawk
a2b9678b15 Object event 2016-06-06 19:51:00 +02:00
SilentSpike
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
jonpas
331c3c70cb Verify and fix cargo, nametags, rearm, reload, repair, ui, Convert infoDisplayChanged in common and mk6mortar Rsc's 2016-05-24 18:58:27 +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
GitHawk
d0509830e3 Some things 
Made params nicer, replaced some forEach and used params in XEH_respawn
 2016-05-12 14:55:40 +02:00
BaerMitUmlaut
82f8eb758c Removed remaining usage of player (#3710) 2016-05-07 22:27:33 +02:00
GitHawk
29cd940fd0 Added server events 2016-03-07 07:15:01 +01:00
Githawk
8dc99a4a4e Replacing execRemoteFnc with events 2016-03-06 11:14:34 +01:00
GitHawk
349b05a89b Removed forgotten diag_log 2016-02-29 15:21:33 +01:00
Githawk
8e6b4f4ffb More docu fixes 2016-02-27 21:14:23 +01:00
Githawk
3e2b01afca Another minor fix 2016-02-27 21:12:50 +01:00
Githawk
3d7c51bdf1 Cleanup 2016-02-27 21:05:19 +01:00
Githawk
734c8b1962 Minor fix 2016-02-27 20:45:04 +01:00
Githawk
91c6341bc8 Implementation 2016-02-27 20:31:07 +01:00
GitHawk
279541676e Expanded module and string table 2016-02-26 11:30:22 +01:00
GitHawk
6deecb0559 Add missing bracket 2016-02-25 10:25:57 +01:00
GitHawk
2f183548b6 Added API 2016-02-25 10:18:31 +01:00
Thomas Kooi
427b14e3ba Merge pull request #3245 from GitHawk/rearm_fix 
Fixing setVehicleAmmo for rearm
 2016-02-20 17:08:37 +01:00
Githawk
c38b028c3a Fixing driver gun 
Magazines from driver gun don't get removed
 2016-02-11 19:06:37 +01:00
Githawk
475351fcfa Some bracket errors 2016-02-01 20:21:20 +01:00
Githawk
cc624f58dd Fixes and updates 2016-02-01 20:05:53 +01:00
PabstMirror
04bccf47d7 Replace all use of deprecated commands 2016-01-19 09:39:07 -06:00
IngoKauffmann
763df43fbc Added possibility to disallow rearm 
> vehicle setVariable ["ace_rearm_disabled", true, true];
Also added ammo compatibility for RHS Mi24 with turret
 2015-11-23 17:08:06 +01:00
IngoKauffmann
5a453a7074 Fixed flying 
Moved attached ammo further away
 2015-10-18 13:11:28 +02:00
IngoKauffmann
01c20d4544 Minor formating and docu 2015-08-21 22:57:14 +02:00
IngoKauffmann
9162789579 Manny things 
Added dummy objects
Added carrying
Added dropping
Added storing
Added more progress bars
...
 2015-08-20 19:51:22 +02:00
IngoKauffmann
dd1917464d Preliminary carrying and dropping of carried ammo 
Could not use ace_dragging since it block interact menu
 2015-08-20 01:20:31 +02:00
IngoKauffmann
a37608b9b1 Added generic dummy 2015-08-20 00:03:16 +02:00
IngoKauffmann
bdc5e54f55 Fixed turret locality and driver empty magazine issues 2015-08-19 17:33:32 +02:00
IngoKauffmann
cf9c49f13c Attempt to fix turret locality issues 2015-08-18 18:09:37 +02:00
IngoKauffmann
3072bd9d22 Fixed rearm sucess hint and collision with dummy 2015-08-18 17:38:50 +02:00
IngoKauffmann
463309db2d Small cleanup 2015-08-18 16:20:11 +02:00
jonpas
7244a583d6 Removed unnecessary ACE_Action calls parameters and changed others to _this 2015-08-18 03:37:02 +02:00
jonpas
33e92f8ca0 Fixed SmokeLauncherMag rearming on level 0 when empty 2015-08-18 02:57:39 +02:00
jonpas
c8c6488125 Cleaned, improved, fixed, changed - entire rearm 2015-08-18 02:32:10 +02:00
IngoKauffmann
0fcf692d36 Moved dummies to CfgVehicles 2015-08-16 23:52:37 +02:00
IngoKauffmann
1a22c4d85a Many things 
Added dummy objects
Added carrying
Added display names for a few magazines, that didn't have any
 2015-08-16 18:16:38 +02:00
IngoKauffmann
3eaaca84fb Added different rearm levels 2015-08-16 02:18:53 +02:00
IngoKauffmann
a8c263b6cc More fixes 
Thanks guys
 2015-08-15 19:23:02 +02:00
IngoKauffmann
26c54b352a Fixed some logistics remnants 2015-08-15 19:00:28 +02:00
IngoKauffmann
0c4924259d Initial code 2015-08-15 18:43:13 +02:00