Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,574 Commits 73 Branches 88 Tags 752 MiB
0983c9b3bb
Commit Graph

603 Commits

Author SHA1 Message Date
Andrea Verano
e47212ea9c Italian translation update (#5531) 
Added:
-Advanced Fatigue
-Interactions
-Medical
-Refuel
-Spectator
-Fully translated markers and maverick

Fixed:
-Next Unit
-Previous Unit
 2017-09-19 16:22:11 +02:00
classic
2611b56767 Jpn translate e103805 (#5505) 
* Update the Jpn translation for interaction

-fix miss translation
-fix html tag
-support to new words
-tweaks

* fix

i was change the English by mistake. it is fix.

* Update the Jpn translation for markers

support to new words

* Update the Jpn translation for refuel

-fix miss translation
-support to new words
 2017-09-13 10:26:26 -05:00
jonpas
9cce08f152 Move handle on carrier doors (#5498) 2017-09-11 17:33:58 -05:00
Dystopian
559a498e6d Add fast mouse actions to refuel, add refuel eden attributes (#5418) 
* Add fast mouse actions to refuel

* nobody seen that

* Add interaction condition and refuel on ladder

* Add car hit, fix change weapon on uncon

* Replace objNull with nil in setVar, unify var names

* Delete *ConnectNozzle functions

* Delete reset* functions

* Add public function and eden attributes

* Remove static actions from RHS compat

* Remove statusEffect_set on respawn

* Fix dual menu, add deprecating message

* Optimize fnc_takeNozzle

* Cleanup
 2017-09-10 14:43:03 -05:00
Christian Klemm
19418b824d Added rating settings (#5354) 
* added rating settings

* moved rating to interaction

* Update fnc_canPardon.sqf

* Update stringtable.xml

* Update CfgVehicles.hpp

* Update XEH_postInit.sqf
 2017-09-07 19:38:26 +02:00
jonpas
e11e102a76 Underwater actions support (#4984) 
* Enable majority of actions underwater

* Remove log

* Add logistics_wirecutter support (don't play kneel animations underwater - looks silly)

* Don't perform kneel animations when repairing or medicaling underwater

* Fix interaction menu rendering underwater (was moving based on player eye level due to height max used for large vehicles)

* Fix attach underwater (LIW does not work underwater, LIS does), Add attach scan drawing define

* Remove left-over systemChat

* Remove vehiclelock from Plane, Disallow linking belt underwater, Allow checking ammo when sitting via action (was already possible via keybind), Use param for LIS
 2017-08-22 13:30:56 -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
Dissyu
a7954368f4 Fix Chinese content & missing string (#5375) 
* Fix missing string with stringtable

Fix Advanced Fatigue & QuickMount

* Fix Chinese content & missing string

* Fix Gestures & DAGR missing string

* Fix quickmount string with vanilla string

* Remove adr97 unnecessary string
 2017-07-19 20:57:20 +02:00
PabstMirror
cddc34e08a Handle locked doors (#5345) 2017-07-08 13:23:28 -05:00
jonpas
5cf7569711 Correct new Chinese stringtable identifiers (#5334) 2017-07-08 09:48:39 -05:00
PabstMirror
5f779c4c90 Modify JoinGroup action to show group name (#5287) 
* Modify JoinGroup action to show group name

* header

* Header
 2017-06-22 16:05:19 -05:00
GodofMonkeys
60131ee589 Add Chinese Traditional & Simplified Localization (#5295) 
Add Chinese Traditional & Simplified Localization
 2017-06-22 16:46:00 +02:00
PabstMirror
183eaaecdc Cleanup heli pod actions (#5271) 
Close #4783
- Make taru pods non loadable
- Make taru pods non draggable
- Increase interaction range for huron pods
 2017-06-14 15:35:17 +02: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
Phyma
288f956316 Open glass and CUP doors (#5226) 
* Fixed glassdoor

Fixed so glassdoor now works with ace slow open.

* Made it more pretty with new file

Made it more pretty with new file

* Tidy up a bit

* Removed white space

* Replace tabs with spaces

Replace tabs with spaces

* Simplified and added comments

* Changes + was stupid was commit

Changes to go with code guidlines and extra check if door is empty

* Tabs to spaces

* Small fixes + Fixed so CUP houses now works

Fixed so CUP houses now works

* Remove todo

* Fixed requested changes

* Removed whitespaces
 2017-06-02 16:50:53 -05:00
SilentSpike
cbe06e5bc7 Fix zeus interaction locality (#5214) 
- The `setUnitPos`, `setFormation`, `setSpeedMode` and `setBehaviour` commands require local arguments
- The waypoint equivalents require server execution
- Add conditions to only show interactions when the appropriate things are selected
 2017-05-31 22:21:44 +01: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
PabstMirror
3ce0865913 Add getInteractionDistance and fix VTOL refuel/arm (#4882) 2017-02-10 12:34:51 -06:00
Dorbedo
aa393ccf92 typo in ace_interaction_fnc_getDoorAnimations (#4854) 2017-01-28 13:43:42 -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
a3c50a6c76 Add dev macro to quickly recompile functions (#4699) 2016-11-23 13:35:25 -06:00
PabstMirror
23568609a6 Faster, non movment blocking gesture for tap shoulder (#4578) 
Close #4577
 2016-10-20 23:44:34 +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
KoffeinFlummi
72899643bd Merge branch 'master' into japanesestringtables 2016-09-27 20:54:17 +02:00
classicarma
fda61324c8 translate interaction 2016-09-28 01:12:05 +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
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
d448ea8916 Improve interaction position for air units. (#4285) 
Fix #4233
 2016-08-27 10:37:58 +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
8a4514f8e7 use a function to do gestures 2016-07-12 16:16:01 +02:00
esteldunedain
18f09b9310 Rename events: 
- ace_addedHeartRateAdjustment -> ace_heartRateAdjustmentAdded
- ace_cargoAddedByClass -> ace_cargoByClassAdded
- ace_enteredCardiacArrest -> ace_cardiacArrestEntered
- ace_itemAddedToTriageCard -> ace_triageCardItemAdded
- ace_reload_linkedAmmo ->  ace_reload_ammoLinked
- ace_reload_returnedAmmo -> ace_reload_ammoReturned
- ace_treatmentSuccess ->  ace_treatmentSucceded
- ace_common_engineOn -> ace_common_setEngine
- ace_explosives_clientRequestOrientations -> ace_explosives_requestOrientations
- ace_explosives_serverSendOrientations -> ace_explosives_sendOrientations
- ace_interaction_lampTurnOff -> ace_interaction_setLampOff
- ace_interaction_lampTurnOn -> ace_interaction_setLampOn
- ace_overheating_spareBarrelsLoadCoolest -> ace_overheating_loadCoolestSpareBarrel
- ace_overheating_spareBarrelsSendTemperatureHint -> ace_overheating_sendSpareBarrelTemperatureHint
Close #3533
 2016-06-24 10:45:13 -03: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
Glowbal
afb9eb3084 Merge pull request #3342 from acemod/vehicleInteractionDistance 
Uniformize interaction distance for vehicle based on bounding box
 2016-06-20 09:55:55 +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
PabstMirror
81c8ea54c3 getVehPos - Tweak heli width, and put at eye level 2016-06-14 23:30:58 -05:00
PabstMirror
cfc046ce71 Fix Merge 2016-06-14 19:37:22 -05:00
PabstMirror
d46c596cc4 Merge remote-tracking branch 'refs/remotes/origin/master' into vehicleInteractionDistance 2016-06-14 19:36:45 -05:00
Glowbal
8c9b31b1c7 Merge pull request #3815 from acemod/cbaEventSystem 
Deprecate ACE events framework
 2016-06-09 14:20:26 +02:00
SilentSpike
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
PabstMirror
77baeda976 Merge branch 'master' into huehuehue 2016-06-03 00:01:13 -05:00
PabstMirror
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05: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
commy2
9d61dd6159 Merge pull request #3850 from acemod/fixCfgPatchesAuthor 
Fix CfgPatches author/ is not a value
 2016-06-01 14:24:17 +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
PabstMirror
598c3dc181 Fix 1.60 UBC (slingloads) 2016-05-30 17:11:06 -05:00
commy2
fd26e2e44e Merge pull request #3516 from acemod/cbamissiontime 
replace timePFH with CBA_missionTime
 2016-05-30 21:23:57 +02:00
jonpas
7a307393a4 Merge branch 'master' into useQuotedPathMacros 2016-05-30 21:14:17 +02:00
jonpas
4f515ec4e1 QGVAR captives, interaction 2016-05-25 20:23:53 +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
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
commy2
da70854568 manual merge 2016-05-18 11:48:27 +02:00
Glowbal
36e48554c2 Merge pull request #3787 from acemod/motorcycleInteraction 
Add interaction support to Motorcycle class
 2016-05-14 09:33:41 +02:00
jonpas
a950b2c2fe Add canPush config entry to enable pushing on boats with mass higher than 2600 2016-05-13 16:33:15 +02:00
jonpas
c591c7af64 Add interaction support to Motorcycle class 2016-05-12 21:30:32 +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
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
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
Alessandro Foresi
e97c7c0f65 Translation: IT completed (with BOM) 2016-03-27 21:22:15 +02:00
Alessandro Foresi
e5a7578f92 Translation: IT completed (no BOM) 2016-03-27 21:20:15 +02:00
PabstMirror
b5e95f3945 Add some names/descriptions to settings configs 2016-03-08 01:17:40 -06:00
commy2
a85c5b14cf Merge pull request #3547 from acemod/fixsavegamecrashmaybe 
Store Interact Menus on CBA Namespaces
 2016-03-06 19:28:26 +01:00
jonpas
c378cd9f12 Disable action menu on mouse hint with inGameUISetEventHandler rather than showHud, as showHud disables UI script commands 2016-03-06 16:47:46 +01:00
commy2
8892aeed9d missed one 2016-03-06 07:55:34 +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
commy2
fa3913752b replace XEH_ENABLED macro with actual class, fix #3482, fix #3483 2016-03-01 17:05:00 +01: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
BlackWindowS
c61e7b5104 Tweaked & added translations 
Translation of almost every STR to French
 2016-02-28 14:48:04 +01:00
jonpas
10abe5cd57 Merge branch 'master' into German-translations 2016-02-27 01:36:07 +01:00
System98
48d312cb8e Add german translations 
- add missing german translations
- small fixes to existing texts
- remove unused strings in "medical" addon
 2016-02-25 18:10:26 +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
7f022eda00 Replace Purista with Roboto - everywhere, close #3401 2016-02-24 15:06:27 +01:00
commy2
8233661d55 remove unused non API functions 2016-02-24 09:39:39 +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
licht-im-Norden87
91bdceead6 interaction 2016-02-20 23:27:32 +01:00
ChairborneIT
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
Thomas Kooi
27c6934ff2 Merge pull request #2230 from SzwedzikPL/interactions_lamps 
Interaction with portable lamps
 2016-02-20 16:47:28 +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
esteldunedain
ff04ca8981 Uniformize interaction distance for vehicle. Distance is now aprox 4m from the bounding box of the vehicle, consistent with interaction with people. 2016-02-18 20:20:02 -03: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
PabstMirror
be742c13cd Merge branch 'master' into 155selectRandom 2016-02-17 15:58:19 -06:00
PabstMirror
53d870b62a Merge pull request #3312 from acemod/passengerInteraction 
Only get passenger actions for selected unit
 2016-02-17 15:33:29 -06:00
PabstMirror
dccc1d33fd Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge 2016-02-17 12:30:03 -06:00
PabstMirror
4a8b032c1f Don't allow passing mags when not in same veh 2016-02-14 14:53:04 -06:00
PabstMirror
54b350a6c0 Only get passenger actions for selected unit 
Fix #1690 #3309
 2016-02-12 15:57:16 -06:00
commy2
82086efca0 manual merge 2016-02-10 10:11:33 +01:00
SzwedzikPL
388b00f58c remove unnecessary code, aesthetic tweak 2016-02-10 01:38:14 +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
commy2
41e39c9c3a replace more filter with select 2016-02-06 11:58:31 +01:00
PabstMirror
e3e9d19ca1 Fix "key" capitalization for Interaction_GetOut 2016-02-05 16:49:36 -06:00
Thomas Kooi
f47b51c0cb Merge pull request #3070 from dixon13/newCivInteraction 
Changes to civilian interaction
 2016-02-05 09:14:45 +01:00
dixon13
a0e6f97125 Updated condition for ACE_GetOut 2016-02-05 00:32:56 -07:00
SzwedzikPL
5f0a2b1945 use event system, polish translation 2016-02-05 04:26:54 +01:00
SzwedzikPL
374b015ee4 major cleanup 2016-02-05 03:41:18 +01:00
SzwedzikPL
ab297ff97e more readable macro 2016-02-05 02:03:25 +01:00
SzwedzikPL
a9d57e0d1c fnc_switchLamp cleanup 2016-02-05 02:02:46 +01:00
SzwedzikPL
7b8be590b4 Merge branch 'acemod/master' into interactions_lamps 2016-02-05 01:43:06 +01:00
ProfessorCZ
61611d0ec7 Czech Translation - Update 
Update
 2016-02-03 18:31:31 +01:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
commy2
3854a5c989 Merge pull request #3109 from acemod/ThingX 
fix ThingX capitalization, fix #3076
 2016-01-05 21:52:42 +01:00
commy2
427628045c fix ThingX capitalization, fix #3076 2016-01-03 15:21:38 +01:00
Alessandro Foresi
2d152675fc Add: IT small translations, DE removed duplicate 2016-01-03 13:02:01 +01:00
Alessandro Foresi
c16d97cad0 Merge branch 'master' into translation/15bn/alef 2016-01-03 12:23:27 +01:00
PabstMirror
8bdd5d0597 Merge remote-tracking branch 'brGuy/Translations-December' into fixStringtablesMerge 2015-12-31 14:30:29 -06:00
PabstMirror
cf27571b5a Merge pull request #3007 from dudakov/master 
Russian Translations - Update
 2015-12-31 14:11:45 -06:00
bux
0e8eb5fac4 Remove obsolete hotkey entries 2015-12-30 11:23:52 +01:00
dixon13
356bd36728 Changed action name 
- Changed display name for extraction action on civilians to match the new action name 'Get Out'.
- Changed class name for extracting civilians out of vehicles to match the action name
 2015-12-29 09:27:43 -07:00
dixon13
f2b3275538 Changed action name 
Changed extraction action to 'Get Out' to match other civilian actions.
 2015-12-29 09:25:33 -07:00
dixon13
d410fe42d9 Fixed misspell 
'_targe' is suppose to be '_target'
 2015-12-28 22:00:08 -07:00
dixon13
a4781a20d3 Authors 2015-12-23 19:27:55 -07:00
dixon13
2a98aa57ed Delete fnc_canInteractWithCivilianVehicle.sqf 
No need to create another funciton
 2015-12-23 11:54:41 -07:00
dixon13
d3a1110250 Removed a portion of the condition 2015-12-23 11:52:23 -07:00
dixon13
5f7e833d43 Removed "PREP(canInteractWithCivilianVehicle)" 
Function is being removed
 2015-12-23 11:51:19 -07:00
dixon13
21daa331dc Changes to ACE_Unload 
- added semi-colon
- changed the condition
- changed the statement
 2015-12-23 11:49:17 -07:00
dixon13
1aa192f7e0 Extract civilans from vehicles, rmeoved actions from civilians in vehicles 2015-12-23 00:19:41 -07:00
Glowbal
c1fa81f28b Fix tabs in sqf files 2015-12-21 17:05:48 +01:00
Jonathan Pereira
ad48f51ec7 Added PT-BR translations 
All remaining translations of gestures, hearing, interact_menu,
interaction, nightvision, rearm, refuel, viewdistance were done!
 2015-12-18 15:14:19 -02:00
kaban
fd06472f4d Russian Translations - Update 2015-12-10 20:32:16 +03:00
commy2
ff4406e411 manual merge, more selectRandom command useage 2015-11-29 16:48:23 +01:00
commy2
e5c4d35969 1.55 use new selectRandom command 2015-11-29 16:33:25 +01:00
bux578
35ecef454f Merge pull request #2825 from gienkov/pl-translation 
pl translation
 2015-11-29 07:35:04 +01:00
Thomas Kooi
ced94d73a7 Merge pull request #2797 from ColdEvul/RoadBarrierRoadCone 
[REMADE] RoadCone_F and its inhered RoadBarrier_F intractable
 2015-11-28 20:51:39 +01:00
gienkov
b091b73e24 fixes 2015-11-27 21:54:04 +01:00
gienkov
3250245587 3.4.0 translations and fixes 2015-11-27 21:50:57 +01:00
PabstMirror
4aeeefdfe8 Fix UBC and increase Heli_04 Pod interaction distance 2015-11-26 11:47:25 -06:00
Thomas Kooi
15267c0433 Merge pull request #2219 from acemod/handSignals 
Hand signals enhancement
 2015-11-26 16:04:41 +01:00
PabstMirror
0b9044e3c7 Merge pull request #2753 from acemod/showHudSetter 
Showhud setter
 2015-11-25 11:16:21 -06:00
PabstMirror
185cae2fe5 Remove Old Gestures from interaction 2015-11-25 11:00:45 -06:00
Thomas Kooi
08c5374a99 Merge pull request #2390 from BaerMitUmlaut/pass-magazine 
Added interaction to quickly pass a magazine
 2015-11-25 14:04:07 +01:00
PabstMirror
36bf2d9cb5 Merge pull request #2803 from BaerMitUmlaut/remove-team-synching 
Remove manual team synching
 2015-11-24 21:37:50 -06:00
BaerMitUmlaut
818466d296 Added ACE setting to hide interaction 2015-11-24 19:07:17 +01:00
PabstMirror
51a463de24 Fix tap shoulder msg display 
Missing efunc on displayTextStructured
Calculate a shoulder side when using keybind
 2015-11-24 11:25:56 -06:00
PabstMirror
c4117e1283 Merge branch 'master' into settingsErrorChecking 
Conflicts:
	addons/map_gestures/stringtable.xml
 2015-11-20 14:37:23 -06:00
SilentSpike
0110ada1b5 Fix zeus waypoint formation actions 2015-11-18 14:54:17 +00:00
PabstMirror
5823749f0c Merge branch 'master' into settingsErrorChecking 2015-11-17 14:00:22 -06:00
commy2
a57d1bca75 replace local keyword with private 2015-11-17 17:43:07 +01:00
PabstMirror
c91789f3c4 Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking 2015-11-06 20:30:12 -06:00
PabstMirror
38105136fa #2820 - Fix target event error 2015-11-04 17:43:51 -06:00
ColdEvul
03b82e5859 Adjusted interaction nod, changed carrying height for he barrier. 2015-11-01 22:38:55 +01:00
BaerMitUmlaut
8f473b4a27 Removed all assignTeam occurrences 2015-10-30 16:50:13 +01:00
PabstMirror
64de91ed06 Add warning for duplicate setting modules. 2015-10-18 23:34:11 -05:00
PabstMirror
94e3cd1f79 Replace old use of showHud 2015-10-15 22:45:35 -05:00
SzwedzikPL
98f6bb3589 Merge branch 'master' of https://github.com/acemod/ACE3 into interactions_lamps 
Conflicts:
	addons/cargo/CfgVehicles.hpp
	addons/interaction/CfgVehicles.hpp
	addons/interaction/XEH_preInit.sqf
	addons/interaction/stringtable.xml
 2015-10-15 11:49:08 +02:00
BaerMitUmlaut
1effe61aa9 Removed parent condition 2015-10-06 19:09:51 +02:00
BaerMitUmlaut
090384c014 Fixed canPassMagazine header 2015-10-06 17:56:32 +02:00
BaerMitUmlaut
d6dcd4112e Resolved merge conflicts 2015-10-06 17:50:55 +02:00
commy2
bc8cefa5e7 manual merge 2015-09-28 21:06:40 +02:00
commy2
6c968d8bc7 per frame handler for incremental door opening 2015-09-28 20:07:01 +02:00
commy2
443cbf8be3 fix compile error when trying to open a locked door by shortcut 2015-09-28 19:03:37 +02:00
commy2
6f64fcd0fb search for door in geometry lod (lineintersectssurface) 2015-09-28 18:45:10 +02:00
commy2
5a3a32f236 more interaction cleanup 2015-09-28 18:06:25 +02:00
commy2
9bf7b68d76 fix errors on game start 2015-09-28 17:28:51 +02:00
commy2
5c5a65443b more interaction cleanup 2015-09-28 17:20:56 +02:00
commy2
f48636e633 more interaction cleanup, remove dead code 2015-09-28 17:11:53 +02:00
commy2
9189148b3f more interaction cleanup 2015-09-28 15:37:18 +02:00
commy2
4b536425b1 Code Cleanup Interaction 2015-09-28 14:36:51 +02:00
commy2
2fe142032e rework modifier key, cleanup sandbags, tripod, ladder, fix #2590 2015-09-26 03:16:55 +02:00
KoffeinFlummi
067b08611e Fix missing newlines 2015-09-17 12:54:26 +02:00
gienkov
e2f9b31fb2 small fix + repair translation 2015-09-16 11:53:05 +02:00
Glowbal
478b618e4b Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros 
Feature/switch to log macros
 2015-09-15 14:51:23 +02:00
Alessandro Foresi
89eb98a248 Added: IT more translation, medic partial 
Fixed: dup entries (from gienkov)
 2015-09-12 23:16:57 +02:00
BaerMitUmlaut
8ee1136758 Rewrite canPassMagazine condition 2015-09-11 23:52:00 +02:00
BaerMitUmlaut
ccf1bf1de7 Cleaned up canPassMagazine condition 2015-09-11 18:24:46 +02:00
BaerMitUmlaut
a29902ddb3 More use of params, event system, removed compile 2015-09-11 15:36:23 +02:00
BaerMitUmlaut
45bfa3eaf5 Fixed vanishing mags and localized hint 2015-09-10 22:23:37 +02:00
KoffeinFlummi
c2ffe7cad0 Merge branch 'release' into russian 2015-09-10 21:05:32 +02:00
KoffeinFlummi
83aa2cc68c Merge branch 'release' into french 2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be Update French translations 2015-09-10 19:14:51 +02:00
BaerMitUmlaut
c26107bc5c Added ability to pass a magazine 2015-09-08 14:07:16 +02:00
kaban
08b7110e58 Russian Translations - Update 2015-09-03 04:54:52 +03:00
kaban
91cae690c0 Russian Translations - Update 2015-09-03 03:36:15 +03:00
Michael Braun
035b3432c5 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros 
Conflicts:
	addons/common/XEH_postInit.sqf
 2015-09-01 08:45:59 +02:00
commy2
e7d9e8c0dc Merge pull request #2312 from acemod/322opendoor3rdperson 
increase reach in 3rd person for opening doors, fix #2301
 2015-08-31 21:32:34 +02:00
commy2
7a4c37c085 disable all actions on ladders by default, close #2289 2015-08-30 22:03:45 +02:00
commy2
4682235d8a increase reach in 3rd person for opening doors, fix #2301 2015-08-30 11:13:26 +02:00
KoffeinFlummi
5f63290508 Merge branch 'ptbr' 2015-08-30 00:42:31 +02:00
KoffeinFlummi
a7f2a7fefc Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3 2015-08-30 00:35:11 +02:00
Michael Braun
657157d767 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros 
Conflicts:
	addons/hearing/functions/fnc_moduleHearing.sqf
 2015-08-29 22:38:26 +02:00
ViperMaul
d38cb31240 Merge pull request #2109 from acemod/pushSubmaine 
Push SDV sub, cleanup push
 2015-08-26 21:03:46 -07:00
Michael Braun
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +02:00
SzwedzikPL
384c4bc55e config macro, script tweaks 2015-08-24 16:48:53 +02:00
SzwedzikPL
2285717acd typo 2015-08-22 20:19:35 +02:00
SzwedzikPL
074ae2c2da fix conflict 2015-08-22 20:02:27 +02:00
SzwedzikPL
3e19b33493 interaction with portable lamps 2015-08-22 20:00:26 +02:00
gienkov
cf585790db fixes done 2015-08-22 11:41:15 +02:00