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
