jonpas
eb6e8c0b56
Cleanup optional argument headers ( #5543 )
2017-09-22 17:33:08 +02:00
Josuan Albin
1ba330e853
Add toggle flashlight and NVG zeus modules ( #4556 )
...
* Add toggle flashlight and NVG modules
* Remove excessive spaces in moduleToggleNvg
* Fix indentation and typos to fit review
* Add an option to add gear, fix headers
* Change category to utility
* Add QOL improvement suggested by pabst
* Fix locality issues
* Remove locality check before enableFlashlight targetEvent
* Remove locality check before addWeaponItem targetEvent
* Add a player check in moduleToggleNVG, change modules category
* Add the same QOL in toggleNVG than in toggleFlashlight
2017-09-21 20:43:35 +02:00
Ozan Eğitmen
90f92db01d
Replace UI icons with vanilla/common ones ( #5532 )
...
Also removes some _very_ old paa files that belong to AGM/CSE
2017-09-21 16:22:28 +02:00
PabstMirror
30a8d2db7b
Use CBA Misc Items ( #5502 )
...
* Use CBA Misc Items
* Set required CBA to 3.4.1
2017-09-12 23:23:45 -05:00
jonpas
170cd8e5de
Remove deprecated stringRemoveWhitespace ( #5483 )
2017-09-07 20:12:47 +02:00
Vdauphin
5ca113d0ba
FIX: ace_common_fnc_loadPerson don't detect taru with place for crew ( #5464 )
...
When you load somebody inside a vehicle the ace_common_fnc_loadPerson is
used. This fonction acutually search nearestObjects of type ["Car",
"Air", "Tank", "Ship_F"] to put player inside. Infortunatly, the taru
family with crew place (exemple
:"Land_Pod_Heli_Transport_04_medevac_black_F") are not detected because
the corresponding parent class of
"Land_Pod_Heli_Transport_04_medevac_black_F" is :
["Land_Pod_Heli_Transport_04_medevac_F","Pod_Heli_Transport_04_crewed_base_F","StaticWeapon","LandVehicle","Land","AllVehicles","All"].
To avoid this, the "Pod_Heli_Transport_04_crewed_base_F" parent class
should also be search by nearestobjects.
2017-08-28 22:51:03 -05:00
PabstMirror
eb18d23181
Allow digging in malden grass ( #5453 )
2017-08-24 15:00:25 -05:00
PabstMirror
52915e1104
Common func to run config tests ( #5170 )
...
* Common func to run config tests
* Add map config testing, malden data and reverse map config's latitude
* Headers
* Simplify config levels
* Header
* fix example
2017-08-22 16:21:41 -05:00
PabstMirror
74fd0f507f
Add EH for UAV control, Add Hellfire support ( #5305 )
...
* Add EH for UAV control, Add Hellfire support
* cycle guidance keybind
* Handle broken PlayerViewChanged
* humps
* UAV Self-interactions (#5379 )
* Switch ACE_Player to uav AI on valid seat change
* Different approach to UAV interactions
* Forgot to remove a variable
* Changed param to select
2017-08-22 16:07:45 -05:00
PabstMirror
a67815d072
Disable damage on cars loaded as cargo ( #5402 )
2017-08-22 13:27:11 -05:00
PabstMirror
accaf9fd01
Compatibility with newest mikro tools ( #5442 )
...
* Compatibility with newest mikro tools
- Remove all use of `access` in configs
- Add skeleton cfg for rtms
- Remove use of `-L` in makePbo for non-bin
* Tabs in model.cfg
2017-08-22 12:53:58 -05:00
SilentSpike
d3ce75daef
Spectator overhaul ( #5171 )
...
- Overhauls the spectator module entirely to share a similar UX to BI's "End Game Spectator" while maintaining some of the extended flexibility of ACE Spectator.
- Simplifies spectator setup by reducing the number of settings. More advanced setup is still possible via the API functions provided.
2017-08-12 14:25:48 +01:00
Dystopian
dd3a66a643
Fix adv. throw key handling when reloading ( #5336 )
...
* Fix throw key handling when reloading
* Consider UGL reload to ace_common_isReloading var
* Fix if space, change private var assign
* Shorten UGL check
2017-07-10 21:44:02 +02:00
jonpas
5cf7569711
Correct new Chinese stringtable identifiers ( #5334 )
2017-07-08 09:48:39 -05:00
Fishy
b84aec3051
Update fnc_setHearingCapability.sqf
2017-06-29 15:04:32 +01:00
Fishy
ea22ebdf09
Update XEH_preInit.sqf
2017-06-29 15:03:53 +01:00
PabstMirror
d02dacf613
Refuel - change nozzle position calc ( #5279 )
2017-06-22 22:58:57 -05:00
GodofMonkeys
60131ee589
Add Chinese Traditional & Simplified Localization ( #5295 )
...
Add Chinese Traditional & Simplified Localization
2017-06-22 16:46:00 +02:00
PabstMirror
c6e70a4e88
Add malden to getMapData ( #5297 )
...
* Add malden to getMapData
* Merge with CWR2 malden
2017-06-21 19:40:17 +02:00
PabstMirror
ffe31d9759
Fix isFeatureCameraActive ( #5291 )
2017-06-21 15:34:10 +02:00
Glowbal
ba05b74fd2
Merge branch 'release'
2017-06-20 20:19:29 +02:00
PabstMirror
bec55114fa
Add load,unload and radial actions ( #5270 )
...
- Add radial actions
- Revert back to using 'ACE_isUnconscious'
2017-06-15 14:35:33 -05:00
Laid3acK
3034212701
gos ndjenahoud latitude ( #5275 )
2017-06-13 23:15:34 -05:00
Moritz Schmidt
e770f669b6
Fix isFeatureCameraActive for Spectator enhacements ( #5269 )
...
* fix isFeatureCameraActive for spec
ace_spectator_camera was removed in 77c2b99ee5
2017-06-13 13:53:41 +02:00
PabstMirror
356a8f640a
Merge branch 'master' into medical-rewrite
...
Conflicts:
addons/medical/functions/fnc_actionCheckBloodPressure.sqf
addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
addons/medical/functions/fnc_actionCheckPulse.sqf
addons/medical/functions/fnc_actionCheckPulseLocal.sqf
addons/medical/functions/fnc_actionDiagnose.sqf
addons/medical/functions/fnc_actionRemoveTourniquet.sqf
addons/medical/functions/fnc_addHeartRateAdjustment.sqf
addons/medical/functions/fnc_addToInjuredCollection.sqf
addons/medical/functions/fnc_addUnconsciousCondition.sqf
addons/medical/functions/fnc_addVitalLoop.sqf
addons/medical/functions/fnc_canTreat.sqf
addons/medical/functions/fnc_copyDeadBody.sqf
addons/medical/functions/fnc_createLitter.sqf
addons/medical/functions/fnc_determineIfFatal.sqf
addons/medical/functions/fnc_getBloodLoss.sqf
addons/medical/functions/fnc_getBloodPressure.sqf
addons/medical/functions/fnc_getBloodVolumeChange.sqf
addons/medical/functions/fnc_getCardiacOutput.sqf
addons/medical/functions/fnc_getHeartRateChange.sqf
addons/medical/functions/fnc_getTriageStatus.sqf
addons/medical/functions/fnc_getUnconsciousCondition.sqf
addons/medical/functions/fnc_handleBandageOpening.sqf
addons/medical/functions/fnc_handleCollisionDamage.sqf
addons/medical/functions/fnc_handleDamage.sqf
addons/medical/functions/fnc_handleDamage_advanced.sqf
addons/medical/functions/fnc_handleDamage_advancedSetDamage.sqf
addons/medical/functions/fnc_handleDamage_airway.sqf
addons/medical/functions/fnc_handleDamage_caching.sqf
addons/medical/functions/fnc_handleDamage_fractures.sqf
addons/medical/functions/fnc_handleDamage_internalInjuries.sqf
addons/medical/functions/fnc_handleDamage_wounds.sqf
addons/medical/functions/fnc_handleDamage_woundsOld.sqf
addons/medical/functions/fnc_hasMedicalEnabled.sqf
addons/medical/functions/fnc_hasTourniquetAppliedTo.sqf
addons/medical/functions/fnc_isInStableCondition.sqf
addons/medical/functions/fnc_isMedicalVehicle.sqf
addons/medical/functions/fnc_itemCheck.sqf
addons/medical/functions/fnc_medicationEffectLoop.sqf
addons/medical/functions/fnc_modifyMedicalAction.sqf
addons/medical/functions/fnc_moduleAdvancedMedicalSettings.sqf
addons/medical/functions/fnc_moduleAssignMedicalFacility.sqf
addons/medical/functions/fnc_moduleBasicMedicalSettings.sqf
addons/medical/functions/fnc_moduleReviveSettings.sqf
addons/medical/functions/fnc_parseConfigForInjuries.sqf
addons/medical/functions/fnc_playInjuredSound.sqf
addons/medical/functions/fnc_reviveStateLoop.sqf
addons/medical/functions/fnc_selectionNameToNumber.sqf
addons/medical/functions/fnc_setDead.sqf
addons/medical/functions/fnc_setHitPointDamage.sqf
addons/medical/functions/fnc_setStructuralDamage.sqf
addons/medical/functions/fnc_setUnconscious.sqf
addons/medical/functions/fnc_showBloodEffect.sqf
addons/medical/functions/fnc_treatment.sqf
addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
addons/medical/functions/fnc_treatmentAdvanced_CPRLocal.sqf
addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf
addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf
addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf
addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
addons/medical/functions/fnc_treatmentAdvanced_medication.sqf
addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf
addons/medical/functions/fnc_treatmentBasic_bloodbag.sqf
addons/medical/functions/fnc_treatmentBasic_bloodbagLocal.sqf
addons/medical/functions/fnc_treatmentBasic_epipen.sqf
addons/medical/functions/fnc_treatmentBasic_morphine.sqf
addons/medical/functions/fnc_treatmentBasic_morphineLocal.sqf
addons/medical/functions/fnc_treatmentIV.sqf
addons/medical/functions/fnc_treatmentIVLocal.sqf
addons/medical/functions/fnc_treatmentTourniquet.sqf
addons/medical/functions/fnc_treatmentTourniquetLocal.sqf
addons/medical/functions/fnc_treatment_failure.sqf
addons/medical/functions/fnc_treatment_success.sqf
addons/medical/functions/fnc_unconsciousPFH.sqf
addons/medical/functions/fnc_useItem.sqf
addons/medical/functions/fnc_vitalLoop.sqf
addons/medical_blood/functions/fnc_hit.sqf
addons/medical_treatment/functions/fnc_hasItem.sqf
addons/medical_treatment/functions/fnc_useItems.sqf
2017-06-10 10:21:18 -05:00
SilentSpike
a53f68a347
Use getUnitTrait for medics, engineers and EOD ( #5246 )
2017-06-10 11:41:01 +01:00
PabstMirror
d1f4b90714
Fix minor debug that got left in ( #5260 )
2017-06-08 11:55:19 -05:00
PabstMirror
f35f80ee82
Rearm - Pylon Support and Dynamically Add Supply Actions ( #5183 )
...
* Dynamic Add
* Support 1.70 Pylon Loadouts
* Properly handle old compat pbos - Update RHS Compat
* Re-add documentation
* cleanup headers (note from other pr)
* Cleanup
* Fix var spelling
2017-06-08 11:47:52 -05:00
PabstMirror
1be9e7ca30
Merge pull request #5182 from acemod/GitHawk-rearm_supply
...
Rearm - Limited Supply (Fix Merge Conflcits)
2017-06-08 11:45:12 -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
Andrea Verano
0affa14a1b
Italian Translation Update ( #5243 )
...
Added Italian translation for:
-cargo
-hellfire
-nlaw
-quickmount
-refuel
-zeus
2017-06-03 22:27:51 -05:00
PabstMirror
ddccfe563b
Merge branch 'master' into medical-rewrite
...
Conflicts:
addons/medical/functions/fnc_determineIfFatal.sqf
addons/medical/functions/fnc_displayPatientInformation.sqf
2017-06-03 12:37:28 -05:00
PabstMirror
00b91bed45
Minor fixes, cleanup, add lint ignore directives ( #5176 )
...
- Fix bug in getNumberMagazinesIn (func not used)
- Fix bug in seekerFindLaserSpot (func not used yet)
- Everything else is just cleanup
2017-05-31 22:09:36 +01:00
SilentSpike
2ca3716277
Fix Zeus teleport players module ( #5175 )
...
* Add dummy function to zeus UI modules
This removes the message about the module having no function when in SP.
* Fix zeus teleport module for non-local units
BI made a change to the function this module was using. So now it has to
be ran local to the player in question.
2017-05-26 16:07:33 +01:00
PabstMirror
114f402c58
Merge branch 'master' into medical-rewrite
2017-05-23 13:44:57 -05:00
PabstMirror
d4a6caf2b1
Just warn for old compat pbos ( #5177 )
...
* Just warn for old compat pbos
* Use CBA_fnc_error big warning box
* fix caps
2017-05-22 13:19:43 -05:00
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
1aebae32c5
Merge branch 'master' into medical-rewrite
...
Conflicts:
addons/medical/functions/fnc_treatment_failure.sqf
addons/medical/functions/fnc_treatment_success.sqf
2017-05-14 14:50:36 -05:00
PabstMirror
bfd3695868
SQF Lint Cleanup Pass ( #5157 )
...
* SQF Lint Cleanup Pass
* Fix var in TRACE
* Add basic python tool
* Simplify
* Hit space key 6 times
* Fix error in dropNozzle
* handle error message exceptions
* Fix py
2017-05-14 14:48:05 -05:00
Laid3acK
457461efbe
AB: Lythium latitude ( #5109 )
...
* Update fnc_getMapData.sqf
* bump1
* bump2
2017-05-10 19:28:05 +02:00
PabstMirror
31a81c4407
Merge branch 'master' into medical-rewrite
2017-05-06 12:01:58 -05:00
classic
777d0e6fb0
Improve Japanese translation ( #5133 )
...
* Add the Japanese translation for cargo
Add the Japanese translation for cargo, fix to html tag and few improvement
* fix the Japanese transltion
Fix the Japanese translation for attach. it was used wrong html tag.
* changed The Japanese translation
Changed the Japanese translation of azimuth angle
* fix The Japanese translation
Fix the Japanese translation for chemlights. it was used wrong html tag.
* fix The Japanese translation
Fix the Japanese translation for laserpointer. it was used wrong html tag.
* Fix the Japanese translation
Fix the Japanese translation for medical_blood. it was used wrong translation.
* Fix the Japanese translation
Fix the Japanese translation for rearm. it was used wrong translation.
* add The Japanese translation
add The Japanese translation to new words
* Improve The Japanese translation
Improve, fix and change The Japanese translation
* minor fix to Japanese translation
minor fix to Japanese translation. see b1b07c5
2017-05-06 12:01:31 -05:00
PabstMirror
c001be5b09
Add keybind to toggle interaction menu ( #5095 )
2017-05-05 13:20:54 -05:00
PabstMirror
d93269304d
Merge branch 'master' into medical-rewrite
2017-04-15 10:09:50 -05:00
PabstMirror
6c592e5a10
Virtual units - skip goggles/hearing effects ( #4988 )
...
* Disable goggles and hearing fx for virtual units
* Cleanup some other CBA_fnc_addPlayerEventHandler
2017-04-11 10:06:29 -05:00
PabstMirror
fb73286242
Tweak overheating ( #4969 )
...
* Tweak overheating
* Add define for constant magic num
2017-04-11 10:04:57 -05:00
jonpas
fd139abb42
Use setShotParents in Advanced Throwing ( #5052 )
...
* Use setShotParents in Advanced Throwing - close #5034
* Execute setShotParents on server (server-only command)
2017-04-11 16:59:32 +02:00
Zakant
466bdce9e4
Removing point
2017-03-23 18:45:46 +01:00
Zakant
89cf679af3
Replaces return by
2017-03-23 17:26:16 +01:00
PabstMirror
672be73bae
Merge branch 'master' into medical-rewrite
...
Conflicts:
addons/medical/XEH_preInit.sqf
2017-03-18 09:09:45 -05:00
jonpas
b31abee4fd
Sandbags surfaces update ( #4971 )
...
* Use private keyword, move surface blacklist to script_component.hpp
* Check height above terrain
* Add Tanoa surfaces, Check if in water
* Use 'dust' config entry to determine surface, Add common canDig (checks dustyness)
* Re-enable compile cache
* Revert to surface blacklist with dust as fallback
* Move surface blacklist to script_component because SQF validator complains
2017-03-15 10:11:37 -05:00
PabstMirror
0841c05a6d
Cleanup use of ACE_HashLocation ( #4975 )
2017-03-08 10:15:15 +01:00
PabstMirror
8ad3571d19
Merge branch 'master' into medical-rewrite
2017-03-02 18:00:34 -06:00
J3aLeiNe
6ce9ede1b5
Update maps' latitude ( #4961 )
...
- add Dingor
- add MSKE 2017
- add G.O.S Leskovets
- add Trung Si
- add I44: Omaha v2
- add I44: Neaville and Neaville (Winter)
- add I44: Battle of the Bulge
2017-03-02 14:00:18 -06:00
PabstMirror
02ea214ade
Fix setVariablePublic reseting to old values ( #4938 )
...
* Fix setVariablePublic reseting to old values
* Don't drop delay time
2017-02-24 19:19:39 -06:00
PabstMirror
c7b60d1777
Merge branch 'master' into medical-rewrite
2017-02-18 18:17:37 -06:00
PabstMirror
159e762576
Handle changes to CBA_fnc_addPlayerEventHandler ( #4878 )
...
* Handle changes to CBA_fnc_addPlayerEventHandler
* Fix var spelling
2017-02-10 13:03:12 -06:00
ViperMaul
ad2e3719b4
Adding Normal to Common stringtable
2017-01-19 17:31:29 -06:00
ViperMaul
8db5d8f2ae
Change Setting from Basic to Normal and Stringtable moves
2017-01-19 15:46:44 -06:00
ViperMaul
1078913d2a
Stringtable changes.
2017-01-19 15:29:33 -06:00
PabstMirror
a32478adfb
Merge branch 'master' into medical-rewrite
2017-01-17 13:10:18 -06:00
J3aLeiNe
2dcd79fd1d
Update MapData ( #4786 )
...
* Update Map data
- Add IFA3LITE maps
- Add CSA38 map
- Add Beketov map
- Add Winter Panthera map
- Add Nam and Mogadishu maps
- Add Uhao island map
* Update fnc_getMapData.sqf
- Add X-Cam-Taunus map
- Add Unsung 3.1 Delta maps
2017-01-02 21:32:58 -06:00
jtj5283449
d4855a7ff3
Korean Translation v1.0 ( #4794 )
...
* Add files via upload
* Add files via upload
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml.
* Fix encoding
2017-01-02 17:52:01 -06:00
PabstMirror
c22fce273f
Overpressure changes ( #4770 )
...
* Add setting to overpressure
* Change overpressure on 2a70 cannon
Close #4691
Also fix gl smoke causing frag
* Handle 2a28 cannon
* Fix base class
2016-12-22 13:29:05 -06:00
commy2
a83267b2ff
manual merge
2016-12-05 20:15:16 +01:00
PabstMirror
a3c50a6c76
Add dev macro to quickly recompile functions ( #4699 )
2016-11-23 13:35:25 -06:00
PabstMirror
b4315b6a65
Javelin overhaul ( #4580 )
...
* Javelin overhaul
* header spelling fix
2016-11-15 12:15:25 -06:00
PabstMirror
aeb0614e7e
Cleanup map gesture sync / color mapping ( #4486 )
...
* Cleanup map gesture sync / color mapping
- Adds ace_common_fnc_setPlayerOwner which syncs player's owner var
- Redo publicVarClient with CBA's ownerEvent
- Remove old ace_settings
- Make color module run globaly
- Ad public ace_map_gestures_fnc_addGroupColorMapping
* fix return
2016-10-27 19:54:58 +02:00
commy2
e03614757e
fix misc. treatment actions
2016-10-13 21:08:41 +02:00
commy2
0f43829b63
Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite
2016-10-10 14:29:50 +02:00
Nicolás Badano
ab6fc8efca
Laser guidance for all designators ( #3308 )
...
* Fix laser and missileguidance over water
* Return a normalized vector in EFUNC(common,getTurretDirection)
* Make laser dispersion simulation optional, default off
* Prototype for ace_laser_designate
* Remove vanilla laser handling from ace_laser in favor of the new code on ace_laser_designate
* Simplify laser into one module
Rewrite large parts of laser
Merge laser_designate
Delete lase_selfDesignate
* Cleanup missile guidance
* Headers, fix laser over water
* Cleanup
* Test
* Change setting to scalar, more cleanup
* Add seeker debug drawing
2016-10-08 12:55:30 +02:00
commy2
853c7db1dc
Merge remote-tracking branch 'origin/master' into medical-rewrite
2016-10-06 10:20:10 +02:00
PabstMirror
dfa09d3161
Functions to perform arithmetic ops on sets ( #4514 )
...
* Functions to perform arithmetic ops on a set
* fix spelling
2016-10-06 10:18:14 +02:00
commy2
5613ec5d5a
treatment functions and unconsciousness rework
2016-10-06 00:54:57 +02:00
commy2
2e147b37f0
fix formating of CBA version check ( #4511 )
2016-10-05 13:06:21 -05:00
PabstMirror
1779099b71
Cleanup old common macros ( #4507 )
2016-10-04 05:29:37 +02: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
commy2
f185742e68
manual merge
2016-10-02 12:51:29 +02:00
commy2
a54aec72bc
Merge remote-tracking branch 'origin/master' into medical-rewrite
2016-09-30 21:19:16 +02:00
PabstMirror
1bc5669c95
Merge branch 'master' into cba-log-macros
2016-09-30 11:18:58 -05:00
jonpas
8458cb2339
Replace ace_common_fnc_stringRemoveWhiteSpace with CBA_fnc_removeWhitespace ( #4222 )
...
* Replace FUNC(stringRemoveWhiteSpace) with CBA_fnc_removeWhitespace, Depreacte ACE's
* Use QFUNC
* Bump required CBA version
* Change remove version to 3.110.0
2016-09-30 15:51:03 +02:00
commy2
96a1e74c85
synch anim speed acceleration
2016-09-30 10:38:27 +02:00
jonpas
dad4293216
Revert "Update showHud setter for Squad Radar" ( #4485 )
2016-09-29 17:53:17 -05:00
jonpas
1bd7a66888
Merge pull request #4085 from acemod/apexShowHud
...
Update showHud setter for Squad Radar
2016-09-29 21:11:15 +02:00
KoffeinFlummi
72899643bd
Merge branch 'master' into japanesestringtables
2016-09-27 20:54:17 +02:00
classicarma
5453b15dd8
translate common
2016-09-28 01:11:27 +09:00
commy2
e7bc2e9d62
remove deprecated code for 3.8.0 ( #4457 )
...
* remove deprecated scroll wheel event handler
* remove deprecated ace hash functions
* remove deprecated execNextFrame
* remove deprecated insertionSort
* remove deprecated getConfigType
* remove deprecated binocularMagazine
* remove deprecated wait(Until)AndExecute
* remove old ass and deprecated alternative syntax setHitPointDamage
* remove deprecated event handlers (#4459 )
* remove deprecated event handlers#
* remove ACE_newEvents
* Remove old ACE PlayerEventHandler wrappers
2016-09-24 22:31:10 +02:00
commy2
c1ead851cb
Add 3den attribute to disable bft ( #4452 )
...
* add 3den object attribte to disable BFT on the object
* delay setVariable public on group
* fix tooltip
2016-09-24 21:46:03 +02:00
PabstMirror
3c53a314d4
Merge remote-tracking branch 'refs/remotes/origin/master' into cba-log-macros
2016-09-22 15:10:30 -05:00
PabstMirror
58bd6467b2
Debugging tool to watch variables on main display ( #4408 )
...
* Debugging tool to watch variables on main display
* Fix error when called from scheduled code
* Remove demo code
2016-09-20 12:18:44 -05:00
classicarma
e767d65cfb
translate common
2016-09-17 00:57:27 +09: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
12de3265b8
Fix INFO Macro not in CBA 3.0 ( #4320 )
2016-09-02 12:50:23 -05:00
PabstMirror
18153b0451
Fix null ace_player from early call to addPlayerEH
2016-08-23 22:24:59 -05:00
commy2
f76457f48f
convert log macros to cba versions
2016-08-22 21:06:52 +02:00
Glowbal
1f8f463f32
Merge pull request #4267 from acemod/fix-object-event
...
fix FUNC(objectEvent)
2016-08-20 11:49:53 +02:00
commy2
1c6825bcab
skip DLL check on non-windows machines, close #4253
2016-08-19 16:01:59 +02:00
commy2
91e4f50ba0
fix FUNC(objectEvent)
2016-08-19 15:23:47 +02:00
Lukas
84a370d0f2
Czech translation ( #4241 )
2016-08-13 15:44:48 +02:00
[OMCB]kaban
8fc2cbd0ef
Russian Translations - Update ( #4217 )
2016-08-13 11:25:43 +02:00
commy2
9228bb9349
manual merge
2016-08-09 18:28:42 +02:00
commy2
36e78e0722
Merge pull request #4171 from acemod/cleanup-hash
...
deprecate ACE hash functions in favor of CBA versions
2016-08-09 18:25:01 +02:00
commy2
83f32ebc29
Merge pull request #4170 from acemod/cleanup-missionSQM
...
remove some broken functions
2016-08-09 18:24:52 +02:00
commy2
439a85924c
Merge pull request #4188 from acemod/cba-hash-synchedEvent
...
Convert common to CBA hashes
2016-08-09 18:24:27 +02:00
jonpas
91128729ba
Improve stringRemoveWhitespace function header
2016-08-08 23:08:39 +02:00
commy2
b059217f4d
fix-inverted-logic
2016-07-30 12:35:10 +02:00
commy2
5a1b33a5da
convert common to cba hashes
2016-07-30 12:28:06 +02:00
commy2
1ffe3131e3
remove deprecated functions
2016-07-30 11:16:19 +02:00
commy2
c9a8e0a892
deprecate ACE hash functions in favor of CBA versions
2016-07-30 10:54:01 +02:00
Glowbal
d9112fb07e
Merge pull request #4175 from acemod/remove-obsolete-pickup-fix
...
reenable pickup action, because related bug has been fixed
2016-07-28 23:47:07 +02:00
commy2
5711a863c6
reenable pickup action, because related bug has been fixed
2016-07-26 19:07:31 +02:00
commy2
37d4a4a0c3
deprecate sort function
2016-07-25 20:00:41 +02:00
commy2
63b41843fc
remove some broken functions
2016-07-25 19:43:42 +02:00
Glowbal
9d14121a9e
Merge pull request #4096 from acemod/func-dogesture
...
use a function to do gestures
2016-07-14 01:38:18 +02:00
commy2
cc76ac482a
add priority parameter to doGesture
2016-07-13 11:00:31 +02:00
commy2
404d5b49b4
add function to read vanilla keybinds
2016-07-13 10:40:28 +02:00
PabstMirror
a0aea441b4
Fix reload mutex with binocs or mounted
...
Fix #4088
2016-07-12 16:22:27 +02:00
commy2
8a4514f8e7
use a function to do gestures
2016-07-12 16:16:01 +02:00
jonpas
845dca9ea5
Add description and example to blur screen function
2016-07-12 16:13:53 +02:00
Glowbal
02f08939f2
Merge pull request #4052 from acemod/fix4049
...
Mine detector optimization and cleanup
2016-07-11 11:16:16 +02:00
commy2
c55c0d5666
only use one waitUntilAndExecute at any time for reload mutex
2016-07-08 15:12:47 +02:00
commy2
6569de5332
add event handler for reload mutex
2016-07-07 16:35:07 +02:00
commy2
2a84865302
add event handler for reload mutex
2016-07-07 15:47:37 +02:00
commy2
e39017e27a
add reload mut ex as canInteractWith condition
2016-07-07 09:10:14 +02:00
esteldunedain
34654fffb7
Add function to allow using playSound3D on CfgSounds classes
2016-07-06 21:31:06 -03:00
Glowbal
1922cac79e
fix spelling of arguments
2016-07-03 23:22:31 +02:00
PabstMirror
82f63b5935
Update showHud func for 1.62 (squad radar)
2016-07-03 12:17:42 -05:00
Glowbal
8f3907c03f
Merge branch 'release'
2016-06-25 11:43:49 +02:00
J3aLeiNe
75396ce63e
Update fnc_getMapData.sqf
...
No Gitexit for Lingor. Stay with us Lingor ! :p
2016-06-25 08:21:21 +02:00
J3aLeiNe
8e7282a46a
Add OFP maps by CWR2 team
...
- Add OFP maps by CWR2 team included in the last CUP terrains update
- Fix latitude according to the Bohemia Wiki
2016-06-24 19:47:44 +02:00
J3aLeiNe
6a92b43b1d
Update fnc_getMapData.sqf
...
Add maps and fix latitude :
- Kidal, latitude 18° (default latitude 0°)
- Governor´s Island, latitude 41° (default latitude -34°)
- Doung island (Unsung Mod), latitude 10° (default latitude -10°)
- Dakrong (Unsung Mod), latitude 16° (default latitude -16°)
- Pecher map, latitude 43° (default latitude -34°)
Remove obsolete Arma2 Lingor map
and fix my illiterate mistakes ...
2016-06-22 16:36:53 +02:00
commy2
08886f413c
change remaining ace events to CBA 'addPlayerEventHandler'
2016-06-22 11:16:55 +02:00
commy2
047ac8c3f2
Merge pull request #3973 from acemod/eventWrappers
...
Convert state checking to CBA playerEH
2016-06-22 10:53:47 +02:00
commy2
bd41260fa8
add a missing 'private'
2016-06-22 10:46:04 +02:00
PabstMirror
fad44e38a6
Convert state checking to CBA playerEH
2016-06-21 19:31:25 -05:00
commy2
89ecc81111
convert common events to CBA playerEvents
2016-06-22 01:39:20 +02:00
PabstMirror
fe5dd3fe76
Cleanup some undefined functions and strings
2016-06-20 13:58:37 -05:00
commy2
3fdc0dd521
Merge pull request #3955 from acemod/add_name
...
add 'name' to components
2016-06-20 19:25:58 +02:00
BaerMitUmlaut
88b58216ee
Added beautified component names
2016-06-20 11:44:36 +02:00
commy2
c481ddedaf
add 'name' to components
2016-06-19 09:38:39 +02:00
Josuan Albin
7c9dcf6bdb
Merge branch 'pr/3480'
...
Conflicts:
addons/advanced_ballistics/stringtable.xml
addons/cargo/stringtable.xml
addons/flashlights/stringtable.xml
addons/hearing/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/main/stringtable.xml
addons/map/stringtable.xml
2016-06-18 16:26:46 +02:00
jonpas
03e923aa68
Cleanup Function Headers titles
2016-06-18 11:50:41 +02:00
bux578
950cdb1ee3
fix missing values
...
was using an incomplete regex
2016-06-11 22:05:44 +02:00
PabstMirror
d57754a7cd
Private/Formatting
2016-06-11 14:34:14 -05:00
PabstMirror
4f73ead80c
Fix alt/lat for maps not defined in getMapData
2016-06-11 14:32:36 -05:00
bux578
c268572649
add Tanoa mapData
2016-06-11 21:14:05 +02:00
bux578
18d864e950
split mapData into separate function
2016-06-11 21:13:51 +02:00
jonpas
f1ae73967d
Normalize leftovers
2016-06-09 14:28:31 +02:00
jonpas
bd5f6107a0
Merge branch 'master' into eol-lf
2016-06-09 14:24:45 +02:00
Glowbal
8c9b31b1c7
Merge pull request #3815 from acemod/cbaEventSystem
...
Deprecate ACE events framework
2016-06-09 14:20:26 +02:00
GitHawk
8e004741b9
Cleanup
2016-06-07 11:13:42 +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
commy2
8ed2dd11d2
Merge pull request #3871 from acemod/magRepackImprovements
...
Add size parameter to displayTextPicture, Improve parameter checking …
2016-06-05 00:05:07 +02:00
jonpas
3124270254
Quote the unquoted
2016-06-04 21:07:24 +02:00
jonpas
5a20f1286b
Change internal event framework names to contain prefix and be as short as possible
2016-06-04 21:05:26 +02:00
jonpas
8ff4a2ecaf
Add size parameter to displayTextPicture, Improve parameter checking in displayText functions, Cleanup magazine repack (privates, deprecated macros, style)
2016-06-04 20:40:55 +02:00
jonpas
03a56b1f7d
Fix goKneeling changing animation inside vehicle (1.60)
2016-06-04 19:58:53 +02:00
SilentSpike
90ebf9638b
Update common event names to meet new standard
2016-06-04 11:12:56 +01:00
SilentSpike
1b6bbff139
Revert event names for synced events framework
...
Keeping these names as short as possible for network traffic purposes.
2016-06-04 09:46:50 +01:00
SilentSpike
9e4fd77745
Update common event names to meet new standard
2016-06-03 22:39:43 +01:00
SilentSpike
5b8fa4d4f1
Update common status effect framework
...
Instead of changing the event names to match the new standards and also changing every single call to `FUNC(statusEffect_set)`/`FUNC(statusEffect_get)` I figured it made sense to only change the event names and the internal workings of `FUNC(statusEffect_sendEffects)` to automatically add the appropriate prefix.
2016-06-03 20:53:43 +01:00
SilentSpike
bd985d57ff
Run event renaming script for new additions
2016-06-03 20:53:43 +01:00
Glowbal
694503c01b
Fix medical events
2016-06-03 20:57:21 +02:00
PabstMirror
77baeda976
Merge branch 'master' into huehuehue
2016-06-03 00:01:13 -05:00
PabstMirror
4915637601
Few more in common
2016-06-02 20:13:09 -05:00
PabstMirror
240cf4f0b5
Fix merge
2016-06-02 20:02:16 -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
c110121b1a
Merge pull request #3811 from acemod/abolishExecRemoteFnc
...
Replace execRemoteFnc with events
2016-06-02 17:08:01 +02:00
jonpas
b0352fdeb9
Merge branch 'master' into eol-lf
2016-06-02 17:02:09 +02:00
PabstMirror
68d6c1969b
Cleanup transistion to CBA's waitAndExec ( #3858 )
2016-06-02 09:22:40 -05:00
jonpas
4c995d4c5c
Improve selective UI API ( #3805 )
...
* Improve selective UI API, Disable ammo count when reload component is loaded, Fix stance UI
* Upgrade Selective UI framework for controls that share IDCs for gunner and soldier
* Separate more soldier and gunner settings sharing same IDCs, Remove vehicle gunner weapon which has no effect anymore
* Separate more soldier and gunner IDC sharing elements, Fix typo, Fix API setting not being respected in case where selective type is not the same on load
* Rework Selective UI using ACE_UI config, Cleanup, Add ACE_UI to FCS component to mark it (is already disabled due to other necessary settings for FCS to function)
* Do location check in function, Rename condition to location, change to number
* Use macros in ACE_UI location
2016-06-02 14:32:39 +02:00
jonpas
590d4fa70b
Merge branch 'master' into abolishExecRemoteFnc
2016-06-02 14:28:43 +02:00
Glowbal
2e54310ff4
Merge pull request #3844 from acemod/fixShowHud
...
Fix showHud if set before display loaded
2016-06-02 10:39:46 +02:00
jonpas
95573ee711
Stringtable URL ( #3855 )
...
* Move url into stringtable to display it properly, Add some missing author and url entries
* Fix main
* Remove duplicate author
2016-06-01 23:45:51 +02:00
jonpas
1354826d56
Put semi-colon to the correct place
2016-06-01 14:11:32 +02:00
jonpas
1331265e65
Move url into a macro
2016-06-01 13:49:10 +02:00
jonpas
6730d016c2
Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility
2016-06-01 13:27:02 +02:00
jonpas
26fbc36cab
Merge branch 'master' into cbaEventSystem
2016-05-31 22:36:08 +02:00
Glowbal
d7b239f487
Merge pull request #3795 from acemod/deprecate-components
...
Add Deprecate components support
2016-05-31 10:40:24 +02:00
PabstMirror
6905e6f97f
Fix showHud if set before display loaded
2016-05-31 01:53:28 -05:00
commy2
fd26e2e44e
Merge pull request #3516 from acemod/cbamissiontime
...
replace timePFH with CBA_missionTime
2016-05-30 21:23:57 +02:00
commy2
7512c4e52e
manual merge
2016-05-30 21:14:34 +02:00
jonpas
7a307393a4
Merge branch 'master' into useQuotedPathMacros
2016-05-30 21:14:17 +02:00
commy2
e7fa02d0d9
Merge pull request #3812 from acemod/cbaDelayedExecFnc
...
Use new CBA delayed execution functions and deprecate ACE functions
2016-05-30 21:02:29 +02:00
commy2
94b5cea3cf
Merge pull request #3814 from acemod/cbaBinocularMagazineFnc
...
Use new binocular magazine CBA functions and deprecate ACE functions
2016-05-30 21:00:43 +02:00
commy2
272775445f
Merge pull request #3670 from acemod/useQuotedFuncMacros
...
Use new quoted function macros
2016-05-30 21:00:23 +02:00
commy2
882aa26ab2
Merge pull request #3813 from acemod/cbaGetItemObjectConfig
...
Use new CBA get config functions and deprecate ACE functions
2016-05-30 21:00:05 +02:00
jonpas
816da2aef1
Normalize to LF line endings
2016-05-30 18:37:03 +02: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
207d6612da
Remove duplicate ACE_newEvents entries
2016-05-24 15:06:17 +01:00
SilentSpike
c4b75160a4
Run event renaming script
2016-05-24 14:13:11 +01:00
PabstMirror
84eca899a9
Add event renaming system
...
Allows us to switch event names such that anyone currently using our old event framework and names won't have their code broken until it is deprecated in version 3.8.0
2016-05-23 14:03:55 +01: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
SilentSpike
f0b8da33c4
Deprecate ACE events framework
...
CBA 2.4.0 entirely replaces the ACE events framework.
Adds wrappers with deprecated warnings to all of the public event framework functions and removes all of the underlying GVARs and code.
2016-05-22 16:09:49 +01:00
jonpas
bd0e05d7d6
Use CBA config functions, return correct value
2016-05-22 16:18:24 +02:00
jonpas
38b48390b5
Call CBA binocular functions - leave as wrapper
2016-05-22 16:03:41 +02:00
jonpas
bbd96f9e71
Call CBA delayed execution functions, remove ACE's PFH for handling them
2016-05-22 16:01:12 +02:00
jonpas
4b121480bb
Use new binocular magazine CBA functions, deprecate ACE functions
2016-05-22 15:48:03 +02:00
jonpas
d35e89892c
Use new get item and object config CBA functions, deprecate ACE functions
2016-05-22 15:36:31 +02:00
jonpas
e7dbcd7b58
Replace delayed execution functions with new CBA counterparts
2016-05-22 15:29:01 +02:00
jonpas
472e4631d6
Deprecate delayed execution functions
2016-05-22 15:25:59 +02:00
jonpas
d902d1182a
Replace ace_common_fnc_execRemoteFunc with events
2016-05-21 23:55:48 +02:00
commy2
c9ea5676ea
travis test
2016-05-21 13:29:42 +02:00
commy2
e40c814b04
Merge branch 'master' of https://github.com/acemod/ACE3 into improve_getTurretX
2016-05-21 13:27:51 +02:00
commy2
d395fcd792
travis pls
2016-05-21 13:22:13 +02:00
commy2
aee4d23bdb
fullCrew new parameter to improve FUNC(getTurretX)
2016-05-21 13:07:17 +02:00
PabstMirror
f69142dd45
Hearing - New XEH, Fix dead effects, Medical var ( #3802 )
...
* Hearing - New XEH, Fix dead effects, Medical var
* Use setHearingCapability
* Cleanup dead player vol update
* Don't change global hearing in medical
* Fix exitWith
2016-05-20 11:23:14 -05:00
commy2
25876d82ca
manual merge
2016-05-18 12:21:53 +02:00
commy2
230f0ab85e
manual merge
2016-05-18 12:20:33 +02:00
commy2
08bafd535f
deleted to much
2016-05-18 12:00:13 +02:00
commy2
655277cc17
remove previously deleted block
2016-05-18 11:58:42 +02:00
commy2
da70854568
manual merge
2016-05-18 11:48:27 +02:00
commy2
473149b8ca
revert changes from other PR to make it compatible
2016-05-16 15:22:37 +02:00
commy2
cac7b9c0c3
optional param to skip deprecated warning
2016-05-16 15:15:51 +02:00
Glowbal
32055401d3
Add backwards compatability for InventoryChanged
...
The output of `getUnitLoadout` is different as `getAllGear`. Using a different format in the event would mean that any eventhandler depending on the inventory output would now be broken.
2016-05-16 00:09:53 +02:00
Glowbal
487400b142
Add different warning messages based on current version of component
2016-05-15 20:13:10 +02:00
Glowbal
3d74c25c97
Add deprecate component solution
2016-05-15 19:38:24 +02:00
commy2
07caf1b0bd
fix for null player
2016-05-14 20:33:33 +02:00
PabstMirror
7628f9a4ab
Fix nils in array
2016-05-14 13:08:58 -05:00
commy2
e4c86a8af5
don't do 'playerInventoryChanged' just because ammo decreased after firing
2016-05-14 19:50:08 +02:00
commy2
c5275813a4
use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it
2016-05-14 10:49:09 +02:00
PabstMirror
895bf2580a
Merge pull request #3773 from J3aLeiNe/master
...
fnc_getMGRSdata.sqf update3
2016-05-13 15:59:24 -05:00
commy2
dd6241e376
Merge pull request #3778 from acemod/fixGetWeaponState
...
fix getWeaponState, fix #3777
2016-05-11 22:57:25 +02:00
J3aLeiNe
078c1d585f
Add Kerama Islands by "Les Vétérans"
...
add Kerama Islands by "Les Vétérans" with the correct latitude (default config latitude : 1°)
2016-05-11 00:01:35 +02:00
commy2
53c9a96c77
fix getWeaponState, fix #3777
2016-05-10 22:14:01 +02:00
J3aLeiNe
c619bcb5a3
Fix "jacobi" latitude and elevationOffset
2016-05-10 19:39:01 +02:00
J3aLeiNe
29e7dbf757
fnc_getMGRSdata.sqf update3
2016-05-10 12:39:56 +02:00
Glowbal
ed9d05d6dd
Merge pull request #3753 from acemod/blockEngine-statusEffect
...
Add blockEngine status effect
2016-05-07 22:40:05 +02:00
J3aLeiNe
d79cbe0844
Getmgrsdata update2 ( #3736 )
...
* correct mildot reticle LRPS/AMS/KHS
correct mildot reticle LRPS/AMS/KHS
* replace 1 tab with 1 space
replace 1 tab with 1 space
* fix tab
* ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes
ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes,
same opticszoommax/min for each scopes : 1µ (1meter for 1000meter) / 4µ
(4meter for 1000meter),
LRPS : variable magnification / SOS : 2 magnifications
* fnc_getMGRSdata.sqf update2
fnc_getMGRSdata.sqf update2
* fnc_getMGRSdata.sqf update2
add new maps, in alphabetic order now
2016-05-07 22:37:58 +02:00
BaerMitUmlaut
82f8eb758c
Removed remaining usage of player ( #3710 )
2016-05-07 22:27:33 +02:00
Ozan Eğitmen
b8abec0c61
Fix Capitalization of ACE Settings classes. ( #3627 )
2016-05-07 22:14:56 +02:00
Glowbal
83a8c488d9
Merge pull request #3751 from acemod/wipeoutWhitespace
...
Cleaned up excessive whitespace
2016-05-04 11:46:56 +02:00
BaerMitUmlaut
e125911c3b
Added blockEngine status effect
2016-05-03 20:52:43 +02:00
BaerMitUmlaut
7fcbe93b71
Cleaned up excessive whitespace
2016-05-03 02:32:44 +02:00
ProfessorCZ
7d0fcde9fa
CZ Translate - Update
...
04/30/2016
2016-04-30 00:57:24 +02:00
PabstMirror
d40735d5c2
Improve synced event error logging
2016-04-25 15:48:24 -05:00
PabstMirror
efc956eb99
Merge pull request #3692 from acemod/unloadOnSlopes
...
Better handle unloading on slopes
2016-04-22 10:40:16 -05:00
PabstMirror
32cd23076f
Merge pull request #3690 from acemod/engineRepairMsg
...
Clarify repair while engine is running
2016-04-15 15:56:52 -05:00
PabstMirror
3360047204
Better handle unloading on slopes
...
Close #3667
2016-04-13 13:05:32 -05:00
PabstMirror
4f6b11c2a6
Clarify repair while engine is running
...
#3348
- Show action, but exit and show warning when selected
- Optional (default off) setting to auto shut off engine to keep
compatibility with missions
2016-04-12 20:04:12 -05:00
PabstMirror
5d70db3d9b
LoadPerson - Only try vehicles that have room
...
Fix #2965
The FRIES is a "Helicopter" so we were trying to load into it, because
it was closest.
Also disable Cargo system on it so we don't load other things into it
And remove all interactions on it as well.
2016-04-12 12:12:49 -05:00
jonpas
ccaec31a90
Use new QFUNC and QEFUNC macros
2016-04-08 20:43:26 +02:00
jonpas
85b4366368
Use new QPATHTOF and QPATHTOEF macros
2016-04-08 20:34:50 +02:00
PabstMirror
f8b46e859c
Wait until postInit to install playerChanged event
2016-04-03 23:36:38 -05:00
J3aLeiNe
4576ea0194
abbottabad altitude fix
...
altitude 0 for altitude 1256
2016-04-02 09:50:50 +02:00
J3aLeiNe
d4a7d864aa
fnc_getMGRSdata update1
2016-04-01 11:53:33 +02:00
J3aLeiNe
093da2badf
Merge branch 'master' into master
2016-03-31 22:22:50 +02:00
J3aLeiNe
c998ab622e
fnc_getMGRSdata update1
...
fnc_getMGRSdata update1
2016-03-31 14:41:09 +02:00
Joko
6038ab89c9
improve Code to String
2016-03-30 23:02:52 +02:00
commy2
4e1b2dd24a
just delay setName one frame
2016-03-29 15:32:05 +02:00
commy2
1f6f90a5b2
fixerrornoname
2016-03-29 13:59:07 +02:00
esteldunedain
aad79eda85
The dead shouldn't interact (it's not TWD)
2016-03-12 10:06:45 -03:00
Thomas Kooi
bfe738ba80
Merge pull request #3513 from acemod/cbaVersioning
...
Add CBA 2.3.1 to versioning check
2016-03-08 19:21:36 +01:00
commy2
e605ede04a
execute addActionEvents in unscheduled env
2016-03-08 01:19:32 +01:00
jonpas
f956675d35
Merge pull request #3542 from acemod/refuelGlobalEvents
...
Replace execRemoteFnc with events and increase fuel update delay in refuel
2016-03-06 16:23:02 +01:00
jonpas
b47b887a21
Fix event name already being used
2016-03-06 16:20:16 +01:00
jonpas
ae3a41e6d8
Move common event handlers closer to their counterparts
2016-03-06 02:38:05 +01:00
Nicolás Badano
1d3950bfff
Merge pull request #3497 from acemod/liteDrag
...
Fix portable light floating / dir when carrying
2016-03-05 22:07:43 -03:00
jonpas
881eaf951a
Move setVectorDirAndUp and setHitPointDamage events to common, Make refuel set nozzle position execute only on target where local
2016-03-05 18:07:07 +01:00
PabstMirror
137a512a9e
close main display if using incompatible cba
2016-03-02 16:33:29 -06:00
commy2
92fddff833
also fix modifier key
2016-03-02 23:14:23 +01:00
jonpas
4918dbacb0
Replace and depreacate EFUNC(common,addScrollWheelEventHandler) with MouseZChanged Display EH
2016-03-02 17:33:46 +01:00
commy2
467075ad67
replace timePFH with CBA_missionTime
2016-03-02 11:01:39 +01:00
GitHawk
6cce74907f
Merge acemod/master 3.5.0
...
# Merged Conflicts in addons/rearm/CfgVehicles.hpp
2016-03-02 09:59:22 +01:00
PabstMirror
8f620f2e61
Fix portable light floating / dir when carrying
...
#3486
2016-03-01 18:49:41 -06:00
Jonathan Pereira
309f48ee0b
Added remaining PT-BR translarions
2016-03-01 08:56:43 -03:00
NorXAengell
772c4cc100
Another batch of translations and corrections (Fr)
2016-03-01 02:27:19 +01:00
PabstMirror
2bdeff1639
Fix for all missionVersions
2016-02-29 16:34:51 -06:00
PabstMirror
2b3b6083cb
Try to handle bad 3den mission modules
2016-02-29 14:06:14 -06:00
BlackWindowS
c61e7b5104
Tweaked & added translations
...
Translation of almost every STR to French
2016-02-28 14:48:04 +01:00
commy2
69f810f32b
add missing pee
2016-02-28 07:25:11 +01:00
commy2
03b8e2b590
fix reloadMutex nil, fix#3450
2016-02-28 06:12:40 +01:00
Githawk
8b87f1b43a
Custom width displayTextStructured
...
Adding width as optional fourth parameter
2016-02-27 20:37:47 +01:00
PabstMirror
6e29beefa1
Remove extra "(" in debug output
2016-02-26 12:48:40 -06:00
NorXAengell
a5ce95f9c7
Traduction, correction Fr Common
2016-02-26 01:29:37 +01:00
esteldunedain
71707bc81a
Some spanish translations for 3.5.0
2016-02-25 10:54:19 -03:00
Nicolás Badano
d02a590886
Merge pull request #3406 from acemod/diePurista
...
Replace Purista with Roboto - everywhere
2016-02-25 09:56:16 -03:00
jonpas
8f775dfba4
Rename FontCSE macro to FONT_ACE
2016-02-24 15:08:54 +01:00
jonpas
7f022eda00
Replace Purista with Roboto - everywhere, close #3401
2016-02-24 15:06:27 +01:00
commy2
02b2a21300
remove unused non API functions
2016-02-24 10:10:31 +01:00
commy2
8233661d55
remove unused non API functions
2016-02-24 09:39:39 +01:00
PabstMirror
9ec4135be9
Add prep
2016-02-22 12:27:27 -06:00
PabstMirror
eb08149946
Merge branch 'master' into doAnimEvents
2016-02-22 12:27:07 -06:00
commy2
9712f9c1a4
manual merge
2016-02-22 16:24:10 +01:00
commy2
c45523475f
manual merge
2016-02-22 16:06:30 +01:00
commy2
0f7bfc0f66
Merge pull request #3389 from acemod/precompileongamestart
...
precompile on game start
2016-02-22 16:00:19 +01:00
commy2
46a239f9f6
precompile on game start
2016-02-22 15:20:36 +01:00
commy2
9ac1f8fc47
use DisplayLoad for turretDisplayLoaded event
2016-02-21 23:13:26 +01:00
commy2
da0d37ed0d
remove commented out code
2016-02-21 22:31:14 +01:00
commy2
3f855298e2
remove unused mapDisplayLoaded event and ACE_dlgMap variable
2016-02-21 22:23:46 +01:00
commy2
f43e88ff25
replace zeusDisplayChanged with DisplayLoad event
2016-02-21 22:16:12 +01:00
commy2
4335bfbfcf
replace inventoryDisplayLoaded with DisplayLoad event
2016-02-21 21:24:39 +01:00
commy2
e9808bf20b
remove unused PFH check
2016-02-21 20:42:06 +01:00
commy2
5e486869c0
replace mainDisplayLoaded event with DisplayLoad XEH and add ACE version to main menu (CBA help)
2016-02-21 20:26:30 +01:00
PabstMirror
cb33666091
ObjectEvent Func, swap execRemoteFnc in doAnim
...
#3370
2016-02-21 11:08:07 -06:00
commy2
9c4121f3b1
replace ace_common_fnc_selectWeaponMode with CBA_fnc_selectWeapon
2016-02-20 23:30:40 +01:00
commy2
a67917c590
add deprecate log
2016-02-20 23:11:50 +01:00
licht-im-Norden87
cdb58b6233
common
2016-02-20 23:06:29 +01:00
commy2
9cdefae10e
delete sqf file
2016-02-20 22:46:22 +01:00
commy2
73d5b3c77b
relace ace_common_fnc_canUseWeapon with CBA_fnc_canUseWeapon
2016-02-20 22:41:24 +01:00
ChairborneIT
0021bc08df
Added translation for most Italian stringtable entries
2016-02-20 21:39:05 +01:00
PabstMirror
ed653456e5
Merge pull request #3338 from acemod/translations156merge
...
Fix Merge Conflicts on More Italian Translations
2016-02-19 15:09:40 -06:00
Thomas Kooi
95532ea521
Merge pull request #3333 from acemod/medicalEvents
...
Replace execRemoteFnc in ace_medical
2016-02-19 12:00:00 +01:00
commy2
97008d8fc3
Merge pull request #3131 from acemod/removedep
...
remove deprecated functions
2016-02-19 11:48:20 +01:00
commy2
5d0d8576ea
Merge pull request #3288 from SzwedzikPL/edenassignsettings
...
Repair & medical object attributes for eden editor
2016-02-19 11:47:26 +01:00
bux
49f565f541
fix merging errors
2016-02-18 20:05:30 +01:00
bux578
93e655588b
Merge pull request #3294 from gienkov/pltranslations
...
pl translation
2016-02-18 19:38:43 +01:00
commy2
be8f7f9cc0
Merge pull request #3276 from acemod/156selectapply
...
replace filter and map with select and apply
2016-02-18 14:23:02 +01:00
esteldunedain
88eae19646
Replace execRemoteFnc in ace_medical
2016-02-17 22:54:43 -03:00
PabstMirror
77f5aebf73
Merge pull request #3282 from acemod/eventLocationHash
...
Use location hash for ace events
2016-02-17 15:32:50 -06:00
PabstMirror
dccc1d33fd
Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge
2016-02-17 12:30:03 -06:00
commy2
1bc73af1c9
remove ace fake weapon from 3den cargo editor
2016-02-16 16:11:18 +01:00
esteldunedain
e2ed38609d
Replace driver by effectivCommander on EFUNC(common,getGunner) and EFUNC(common,firedEH)
2016-02-13 15:04:43 -03:00
licht-im-Norden87
b9083f1712
common
2016-02-10 17:17:26 +01:00
SzwedzikPL
0c80551fd8
ace attribute category, lower case classes
2016-02-10 01:17:18 +01:00
gienkov
d5dd718b8d
fix endlines
2016-02-09 12:01:13 +01:00
gienkov
fafd25dee7
pl translation
2016-02-09 11:50:35 +01:00
esteldunedain
8fbb6cd72e
Fixed event parameters
2016-02-06 20:49:18 -03:00
PabstMirror
1e66cd406b
Use location hash for ace events
2016-02-06 15:27:53 -06:00
esteldunedain
37bc67c951
Create a _vehicle variable
2016-02-06 16:55:36 -03:00
esteldunedain
efbff8cc23
Pass the turret path too
2016-02-06 16:49:53 -03:00
esteldunedain
6d9068e306
gunner to lowercase
2016-02-06 16:26:57 -03:00
esteldunedain
72b262f634
Simplified parameter names
2016-02-06 16:22:23 -03:00
esteldunedain
588f76b3f1
Learning to count
2016-02-06 16:12:18 -03:00
esteldunedain
89354e25c8
Unified fired event handler
2016-02-06 16:09:48 -03:00
commy2
41e39c9c3a
replace more filter with select
2016-02-06 11:58:31 +01:00
commy2
2ebd2f9046
replace filter and map with select and apply
2016-02-06 11:42:35 +01:00
commy2
d89c93de22
setAllGear - abort function and print warning when used on remote units,
2016-02-05 21:14:20 +01:00
esteldunedain
dbe7e294a5
Document the locality requirements of fnc_setAllGear. Close #3140
2016-02-05 10:18:36 -03:00
PabstMirror
54870f872a
Disable Debug
2016-02-04 13:16:41 -06:00
Nicolás Badano
cbafe05f76
Merge pull request #3082 from acemod/deterministicOverheatingX
...
Deterministic overheating (updated)
2016-02-04 16:03:30 -03:00
PabstMirror
35333cbe9d
Merge branch 'cargoCleanup'
2016-02-04 12:51:52 -06:00
Thomas Kooi
324edbde6d
Merge pull request #3192 from acemod/getTargetDistance_to_LIS
...
Rewrite ace_common_fnc_getTargetDistance to use LineIntersectsSurfaces.
2016-02-04 19:42:32 +01:00
ProfessorCZ
61611d0ec7
Czech Translation - Update
...
Update
2016-02-03 18:31:31 +01:00
PabstMirror
397a12056a
Merge branch 'master' into deterministicOverheatingX
2016-02-02 17:11:00 -06:00
PabstMirror
46d6e92bca
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
PabstMirror
c0eccc67c3
Change all SCALAR to NUMBER in headers
2016-01-28 18:19:15 -06:00
PabstMirror
7a7e0d689a
Improve underwater cargo unloading
2016-01-27 14:56:25 -06:00
PabstMirror
17a882fe4d
Add findUnloadPosition integration
2016-01-26 18:01:01 -06:00
PabstMirror
45138aea18
Merge pull request #3163 from acemod/unifiedStatusEffects
...
Unified status effect handler
2016-01-22 14:55:25 -06:00
VKing
999d8ac2ce
Use max
2016-01-22 00:01:13 +01:00
esteldunedain
f7cfbebc49
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into deterministicOverheatingX
2016-01-20 22:19:11 -03:00
PabstMirror
abb01e0653
Merge pull request #3129 from acemod/frag-cacheIfWillFrag
...
Frag - only run addPfhRound on ammo that will frag (for master)
2016-01-20 17:03:55 -06:00
VKing
757436140b
fnc_getTargetDistance rewritten to use LineIntersectsSurfaces.
...
Turns out it wasn't really needed after all, but better is better :p
2016-01-20 00:06:06 +01:00
esteldunedain
782934c4b2
Add the setApproximateVariablePublic function to common
2016-01-19 16:58:07 -03:00
esteldunedain
3792acd7f7
Merge branch 'master' into deterministicOverheatingX
2016-01-19 15:57:38 -03:00
PabstMirror
04bccf47d7
Replace all use of deprecated commands
2016-01-19 09:39:07 -06:00
esteldunedain
8e2d489312
Add warnings to deprecated functions
2016-01-19 09:39:06 -06:00
PabstMirror
7e84a9d9b0
Add getter, readd old public funcs, add blockSprint
2016-01-19 09:39:06 -06:00
PabstMirror
d2e006397d
cleanup, don't setVar public if no change
2016-01-19 09:39:05 -06:00
PabstMirror
9a3972de76
Unified Status Effect Handler
2016-01-19 09:39:05 -06:00
Thomas Kooi
c439036abe
Deprecate execPersistentFnc 3.7.0
...
Remove functions the second update after deprecation.
2016-01-19 15:55:33 +01:00
Thomas Kooi
a612bdecf2
Deprecate execRemoteFnc in 3.7.0
...
Remove functions the second update after deprecation.
2016-01-19 15:54:59 +01:00
PabstMirror
8cbf31a375
Fix undefined variable error in FUNC(debug)
...
possibly related to #2677 - threw error from switchToGroupSide
2016-01-11 23:37:44 -06:00
commy2
62f589ac84
remove deprecated functions
2016-01-08 15:56:32 +01:00
PabstMirror
9d14ff8b03
Merge branch 'master' into deterministicOverheatingX
2016-01-06 23:25:24 -06:00
commy2
abf516aeb1
manual merge
2016-01-06 15:57:09 +01:00
PabstMirror
46cb90254a
Add ACE_HashLocation to common
2016-01-04 21:48:26 -06:00
Alessandro Foresi
c16d97cad0
Merge branch 'master' into translation/15bn/alef
2016-01-03 12:23:27 +01:00
PabstMirror
fb0738bd30
Merge branch 'master' into release
2015-12-31 20:27:26 -06:00
PabstMirror
586449eef9
Merge pull request #3084 from acemod/cbaZeusIntegration
...
CBA zeus integration
2015-12-31 15:15:23 -06:00
PabstMirror
cf27571b5a
Merge pull request #3007 from dudakov/master
...
Russian Translations - Update
2015-12-31 14:11:45 -06:00
PabstMirror
72fe95c797
Add "isNotInZeus" to canInteractWith
...
Re-fix #1951 (CTRL+V from climb blocking paste in zeus)
2015-12-30 01:48:43 -06:00
PabstMirror
1e29c0286f
Remove Keybinds/Events for Zeus now handeld in CBA
...
Close #2937
2015-12-30 01:07:55 -06:00
PabstMirror
3020023f58
setVariablePublic - Use waitAndExecute
2015-12-28 16:04:55 -06:00
Nicolás Badano
932e17cea4
fix
2015-12-28 16:04:51 -06:00
Nicolás Badano
fb56350217
small fixes
2015-12-28 16:04:51 -06:00
Nicolás Badano
de902ca4fd
Modify setVariablePublic so it published inmediately if the variable hasn't being publishes recently. Then establish an embargo time before it can be published again.
2015-12-28 16:04:50 -06:00
Glowbal
c1fa81f28b
Fix tabs in sqf files
2015-12-21 17:05:48 +01:00
PabstMirror
9b0641c06f
Add nil return for count
2015-12-19 21:17:36 -06:00
PabstMirror
c53a0541a4
Add support for non local Zeus RC in common-isPlayer
2015-12-18 11:08:10 -06:00
PabstMirror
0b5b11c966
Merge pull request #3014 from acemod/fixNameSanatize
...
Sanitize less/greater-than symbol to square
2015-12-14 19:23:07 -06:00
commy2
e6be1537cd
replace more private with private keyword in common
2015-12-14 13:17:48 +01:00
commy2
bfa29246be
replace private with private keyword in other half of common
2015-12-14 13:08:19 +01:00
PabstMirror
9064579a65
Send string to serverLog instead of strucText
...
Fix `Performance warning: SimpleSerialization::Read
'ace_common_remoteFnc' is using type of ,'TEXT' which is not optimized
by simple serialization, falling back to generic serialization, use
generic type or ask for optimizations for these types`
2015-12-13 13:27:46 -06:00
commy2
bd3c79f739
add function to retrieve the control of the stamina bar
2015-12-12 20:25:42 +01:00
commy2
2839cff753
common code fixes
2015-12-12 17:26:47 +01:00
commy2
3d5ea74c7e
replace private with private keyword in first half of common
2015-12-12 16:48:54 +01:00
PabstMirror
24d77d1b7c
Fix Typo
2015-12-11 12:17:05 -06:00
PabstMirror
db50b5313d
getName can return raw or sanatized html tags
2015-12-11 12:01:50 -06:00
PabstMirror
c7b6375092
Sanitize less/greater-than symbol to square
...
Fix #2912
The raw `<` showed up in nametags and anything besides strucText
`[ / ]` is fairly close and will work in either text mode.
2015-12-10 23:29:05 -06:00
bux
8e6a057f52
fix common stringtable
2015-12-10 18:48:00 +01:00
[OMCB]kaban
aec2c3fef2
HotFix: removed duplicated key.
...
Removed duplicated German key for STR_ACE_Common_DoNotForce.
It caused Tabler.exe couldn't read stringtable files.
2015-12-10 18:24:28 +03:00
havena
6f0568c370
fix Unexpected stringtable format
...
Unexpected stringtable format inside <Text ID="STR_ACE_Common_CheckPBO_Action_WarnPerm"><German>
2015-12-09 20:18:15 +01:00
PabstMirror
cae9f436f6
Merge branch 'release'
2015-12-08 15:14:33 -06:00
PabstMirror
cd68f9b320
Fix refuel unconc error - Man unloading for air
2015-12-07 13:54:41 -06:00
PabstMirror
39edd205f0
Merge pull request #2942 from acemod/CzechTables
...
Czech Translations - Update
2015-12-07 09:32:00 -06:00
PabstMirror
358228f5bb
Cleanup De Stringtables
2015-12-06 15:03:15 -06:00
ProfessorCZ
cf41ac5fba
Czech Translations - Update
2015-12-04 22:28:10 -06:00
licht-im-Norden87
291f4df072
Update German Stringtables
...
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
kommas...........................................................................................................................................................
Rallypoint
Update stringtable.xml
slideshow, not finished yet
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
What does Curator mean in this context?
l. 294, l 302
cargo
Update stringtable.xml
Update stringtable.xml
I left a few things out. I'd like if someone gives me advice
Z.698 Pionier oder Instandsetzer o.Ä. Was genau ist die deutsche Bezeichung der Klasse in ACE bzw Arma?
Z.707 Ich habe mich einfach mal auf Mechatroniker festgelegt, da Reperaturspezialist sich doch ein wenig ungelenk anhört...
Update stringtable.xml
Habe engineer als Pionier übersetzt (halte es selbst für etwas unpassend) Der specialist ist bei mir zum Mechatroniker geworden.
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Fix Mistakes from merge
Fix Empty Entries
Fix Mistake
Fix
2015-12-04 22:06:44 -06:00
commy2
e418cfcf11
Merge pull request #2935 from acemod/fixbinoculars2
...
Fix binocular related bugs
2015-12-04 21:27:53 +01:00
commy2
5d43fa93c6
fix FUNC(binocularMagazine), fix #2916 , fix #2917 , fix #2918 , fix #2922 , fix #2928 , fix #2933
2015-12-04 19:37:37 +01:00
PabstMirror
91ace4fc9b
Fix whitelist string -> array error in checkPbo
...
Fix #2913
Use splitString instead of call compile to convert string into an array
2015-12-02 23:58:41 -06:00
PabstMirror
c928a0d6cb
Remove Sleep/WaitUntil from checkPBO
...
Fix #2910
2015-12-01 22:50:28 -06:00
commy2
861262e41c
revert false captitalization change
2015-11-30 17:56:25 +01:00
commy2
411a8d58f3
fix more setVariable and getVariable capitalization
2015-11-30 17:53:57 +01:00
commy2
5a1aae6028
manual merge
2015-11-30 17:44:15 +01:00
commy2
e422388484
fix waitUntil capitalization
2015-11-30 17:28:01 +01:00
commy2
a9ebcf8543
fix setVariable and getVariable capitalization
2015-11-30 17:27:09 +01:00
commy2
b3950bd7f0
fix forEach capitalization
2015-11-30 17:23:48 +01:00
commy2
2b05f6f451
fix isNil capitalization
2015-11-30 17:22:16 +01:00
commy2
5e41643cff
fix pushBack capitalization
2015-11-30 17:21:28 +01:00
commy2
d9b90258bc
fix typeOf capitalization
2015-11-30 17:19:57 +01:00
commy2
34d351c652
fix exitWith capitalization
2015-11-30 17:14:05 +01:00
commy2
0b84bb514b
fix Cfg capitalization
2015-11-30 17:09:26 +01:00
commy2
dcf0a68b80
Revert "fix Cfg capitalization"
...
This reverts commit 43bda9c462
2015-11-30 17:00:32 +01:00
commy2
43bda9c462
fix Cfg capitalization
2015-11-30 16:52:20 +01:00
PabstMirror
f676e6d9c9
Add some more typeNames replacements
2015-11-27 21:23:27 -06:00
PabstMirror
5850f78c1f
Merge branch 'master' into isEqualTypeRepalcement
2015-11-27 21:08:21 -06:00
PabstMirror
ca0cfc9bbf
Merge pull request #2861 from acemod/repairRebass
...
Repair Overhaul
2015-11-25 17:00:32 -06:00
PabstMirror
0b9044e3c7
Merge pull request #2753 from acemod/showHudSetter
...
Showhud setter
2015-11-25 11:16:21 -06:00
PabstMirror
ac6390c0b3
Add array info to header
2015-11-25 11:07:56 -06:00
SilentSpike
c731d83642
Merge pull request #2848 from acemod/fixForEachDeleteAt
...
fix Issue with forEach Loops and deleteAt Index
2015-11-25 14:00:37 +00:00
PabstMirror
36bf2d9cb5
Merge pull request #2803 from BaerMitUmlaut/remove-team-synching
...
Remove manual team synching
2015-11-24 21:37:50 -06:00
PabstMirror
ab769757d9
Skip Depends Hitpoints - Use HitPoints selPos for wheels
...
Stuff
Normalize Depends - Skip Glass Repair
Fix spawned wheel/track not having correct damage
getHitpointString robustness, hatchback fuelHitpoint, fix count errors
-
Formatting
local -> private
Fix Stuff
2015-11-20 21:11:50 -06:00
PabstMirror
4e93b9c72d
2307 - Repair sub-turrets
...
Privates
Cleanup debug
Add repair actions for sub turrets
Cleanup
Fix Header
Error Handling
Cleanup setHitpointDamage
Fix common ACE_isEngineer to handle scalar or bool
Claim and release repair objects (wheel/track)
Repair sub-turrets
2015-11-20 21:11:05 -06:00
Thomas Kooi
4a19fcc5a5
Merge pull request #2771 from BaerMitUmlaut/inWater-deprecation
...
inWater -> isUnderwater
2015-11-20 22:28:43 +01:00
PabstMirror
69b53af1d3
1.54 - Replace typeName with isEqualType
2015-11-20 11:40:31 -06:00
SilentSpike
d1dff4a24a
Merge branch 'master' into fixForEachDeleteAt
...
# Conflicts:
# addons/common/XEH_postInit.sqf
2015-11-18 13:27:04 +00:00
SilentSpike
49d4f233d9
Revert commit a718c82780
2015-11-18 13:19:12 +00:00
PabstMirror
5cbfe4f2a5
local -> private
2015-11-17 14:02:20 -06:00
PabstMirror
896615beb1
Merge pull request #2826 from acemod/settingsParamsArray
...
Read settings from paramsArray (params in description.ext)
2015-11-17 14:01:16 -06:00
PabstMirror
5823749f0c
Merge branch 'master' into settingsErrorChecking
2015-11-17 14:00:22 -06:00
PabstMirror
6d04156f69
local -> private
2015-11-17 13:56:55 -06:00
commy2
a57d1bca75
replace local keyword with private
2015-11-17 17:43:07 +01:00
SilentSpike
a718c82780
Implement nice index deletion iteration solution
...
Previously when iterating over an array and modifying the same array via deletion of the current index, incorrect means was used to account for the change in index resulting in any further deletions being applied to the wrong elements.
This solution does not require duplication of the array or the use of external variables to track the number of deleted elements. We simply lower the `_forEachIndex` by 1 whenever an element is removed.
2015-11-17 16:02:56 +00:00
jokoho48
561f6126dc
fix missing bracket
2015-11-17 13:34:34 +01:00
jokoho48
f3c5c64390
fix Issue with forEach Loops and deleteAt Index
2015-11-17 04:31:17 +01:00
PabstMirror
5b16638ae5
Always force param settings
2015-11-08 11:22:41 -06:00
PabstMirror
826b4fd20b
Cleanup
2015-11-06 20:53:05 -06:00
PabstMirror
e0506f29bc
Read settings from paramsArray (params in description.ext)
...
for now just limited to SCALAR/BOOL
2015-11-06 20:46:06 -06:00
PabstMirror
c91789f3c4
Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking
2015-11-06 20:30:12 -06:00
PabstMirror
a3443cae43
Merge pull request #2780 from acemod/fixTimeInComments
...
Changed ACE_time back to time in comments where appropriate
2015-11-04 13:04:05 -06:00
PabstMirror
cfba7c01e8
Merge branch 'master' into settingsErrorChecking
...
Conflicts:
addons/map_gestures/stringtable.xml
2015-11-03 12:09:36 -06:00
Joko
bd97c1ee96
fix Docu in waitUntilAndExecute
2015-11-02 12:05:43 +01:00
BaerMitUmlaut
8f473b4a27
Removed all assignTeam occurrences
2015-10-30 16:50:13 +01:00
commy2
049d40b96e
change description in function header
2015-10-28 19:02:54 +01:00
commy2
a0bfcdd04c
Revert "rename hasHatch to canTurnOut, change description in function header"
...
This reverts commit 932f09ce60
2015-10-28 19:01:47 +01:00
commy2
932f09ce60
rename hasHatch to canTurnOut, change description in function header
2015-10-28 18:57:47 +01:00
commy2
643f4d36dc
add FUNC(hasHatch)
2015-10-28 08:01:25 +01:00
VKing
069169cc72
Changed ACE_time back to time in comments where appropriate
2015-10-21 22:52:21 +02:00
BaerMitUmlaut
c227f05f8a
Deprecated isWater
2015-10-19 23:28:50 +02:00
PabstMirror
64de91ed06
Add warning for duplicate setting modules.
2015-10-18 23:34:11 -05:00
PabstMirror
16180686d2
PV GVAR(settings) after modules, add error debug
2015-10-18 18:49:03 -05:00
Glowbal
76efdbcc1c
Merge pull request #2257 from jonpas/parseList
...
Parse List Common Function
2015-10-18 12:14:18 +02:00
PabstMirror
fa7299ba1b
Add array info to header
2015-10-16 08:28:54 -05:00
PabstMirror
bec884e581
showHud handler
2015-10-15 22:33:05 -05:00
