Commit Graph

202 Commits

Author SHA1 Message Date
Filip Maciejewski
cc22e95012 Fastroping - Remove FRIES on vehicle deletion / adjust Ghosthawk Fries (#6932)
* fastroping_fnc_deequipFRIES, remove FRIES on vehicle deletion

* Prevent FRIES from clipping into Ghost Hawk right door

* UNequipFRIES

* Remove fastroping checkVehicleThread

* Document FRIES equip and unequip functions
2019-04-25 13:31:36 -05:00
PabstMirror
6d50667359
Fastroping - Add user setting to confirm cutting ropes (#6876)
* Fastroping - Add user setting to confirm cutting ropes

* always confirm

* fix

* Update stringtable.xml
2019-04-03 12:18:55 -05:00
markooff
b4639ed758 tlumaczenie_12_03_2019 (#6865)
Translations - Polish
2019-03-13 00:18:33 -05:00
classic
c37b7644af Update Japanese translation (#6838)
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update stringtable.xml
2019-02-28 13:36:34 -06:00
Brandon Danyluk
639d3fdfa1 cfgSkeletons indentation formatting fixes (#6796)
* abc

* Revert "abc"

This reverts commit bcb4214bd9.

* Update to current commit

* Fix class OFP2_ManSkeleton to have proper indentation for all bones

* Fix path. Fix whitespace
2019-01-31 19:22:33 -06:00
pokertour
4a5b5113cd FastRoping - Add rope items which deploy at lengths (#6498)
* Update stringtable.xml

* Update config.cpp

* New CFGWeapon

* Update CfgVehicles.hpp

* Update fnc_deployRopes.sqf

* Update CfgVehicles.hpp

* Update CfgWeapons.hpp

* Update CfgVehicles.hpp

cheapest check before others

* Update fnc_deployRopes.sqf

Corrected the double remove.

* Cleanup PR

Add setting, move rope len to config, simplify strings, add rope image, fix rope unwind length

* Add setting name to stringtable

* Update stringtable.xml

French translation for settings
2019-01-11 21:05:25 -06:00
Jakub Ochalski
91182482db Polish Translation (#6730)
Did the missing parts of the Polish translation.
2018-12-11 16:50:36 -06:00
Dedmen Miller
b3e0135e32 Fix Armake problems (#6697)
* Armake model.cfg fix

* Spaces!

* Case sensitive filenames fix
2018-11-29 11:18:22 +01:00
PabstMirror
52abed1d07
Fastroping - Fix 3den default value (#6642)
Close #5550
2018-10-16 12:24:41 -05:00
Filip Maciejewski
5e07d894f8 Remove BOM from stringtables 2018-10-07 11:30:15 +02:00
jonpas
db5e9eaad7
Fix rope redeploying without FRIES - fix #5686 (#6599) 2018-09-26 13:56:50 +02:00
Dedmen Miller
e2ac18a05d [WIP] Fix script errors reporting wrong line numbers (#6407)
* advanced_ballistics

* advanced_fatigue

* advanced_throwing

* ai

* aircraft

* arsenal

* atragmx

* attach

* backpacks

* ballistics

* captives

* cargo

* chemlights

* common

* concertina_wire

* cookoff

* dagr

* disarming

* disposable

* dogtags

* dragging

* explosives

* fastroping

* fcs

* finger

* frag

* gestures

* gforces

* goggles

* grenades

* gunbag

* hearing

* hitreactions

* huntir

* interact_menu

* interaction

* inventory

* kestrel4500

* laser

* laserpointer

* logistics_uavbattery

* logistics_wirecutter

* magazinerepack

* map

* map_gestures

* maptools

* markers

* medical

* medical_ai

* medical_blood

* medical_menu

* microdagr

* minedetector

* missileguidance

* missionmodules

* mk6mortar

* modules

* movement

* nametags

* nightvision

* nlaw

* optics

* optionsmenu

* overheating

* overpressure

* parachute

* pylons

* quickmount

* rangecard

* rearm

* recoil

* refuel

* reload

* reloadlaunchers

* repair

* respawn

* safemode

* sandbag

* scopes

* slideshow

* spectator

* spottingscope

* switchunits

* tacticalladder

* tagging

* trenches

* tripod

* ui

* vector

* vehiclelock

* vehicles

* viewdistance

* weaponselect

* weather

* winddeflection

* yardage450

* zeus

* arsenal defines.hpp

* optionals

* DEBUG_MODE_FULL 1

* DEBUG_MODE_FULL 2

* Manual fixes

* Add SQF Validator check for #include after block comment

* explosives fnc_openTimerUI

* fix uniqueItems
2018-09-17 14:19:29 -05:00
PabstMirror
205abec286
Fastroping - Disable ACRE features from helper objects (#6387) 2018-06-20 22:17:27 -05:00
mharis001
f3f57c6a38 Cleanup unused priority entry for interact menu actions (#6372) 2018-05-30 16:48:19 -05:00
shukari
468da8b79b Fix fastropes being blocked after rope breaking (#6239)
* add broken state

* add broke state

* add broken state

* add broken state

* add broken state
2018-04-12 10:23:18 -05:00
SilentSpike
0a31a24fdf Fix FRIES being applied when attribute unchecked (#5926) 2017-12-18 17:30:36 +01:00
PabstMirror
cd30b09b4f Convert ACE_settings to CBA_settings (#4895)
* Convert ACE_settings to CBA_settings

* Run Modules Globaly, BWC for SetSetting

* Add support for string settings

* ACE_ServerSettings warning

* Add handler for global setting being changed

* Add deprecated and replaced not to Settings Framework doc

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

* Change modules scope to 1

* Disable debug
2017-11-11 20:21:55 +01:00
sbng-PAPA
a3e9879cec korean translation (#5730)
Misfit taxt Modified, translate for 3.11
2017-11-06 15:54:35 -06:00
God of Monkeys
72e48c04f0 Update Chinese stringtable content (#5637)
Update Chinese stringtable content
2017-10-18 12:01:29 -05:00
BaerMitUmlaut
b366be0277 Prevent fastroping teleport serverside (#5629) 2017-10-16 23:20:50 +02:00
Mark Ruffner
7aae91be79 'Fix' race condition where rope is cut as someone mounts the rope (#5569)
* initial fix attempt

* reset animation

* Fix logic

* Not cutting when roping
2017-10-16 23:11:21 +02:00
BaerMitUmlaut
c211cbf82b Added fastrope keybind (#5606)
* Add fastrope keybind

* Add canInteractWith checks

* Fix player -> ACE_player
2017-10-14 11:55:48 -05:00
shukari
22c8ef1e8a German stringtable updates (#5539)
* advanced_fatigue stringtable german

* cargo stringtable german

* cookoff stringtable german

* fastroping stringtable german

* hellfire stringtable german

* nlaw stringtable german

* overpressure stringtable german

* quickmount stringtable german

* refuel stringtable german

* repair stringtable german

* scopes stringtable german

* slideshow stringtable german

* spectator stringtable german

* zeus stringtable german

* cookoff stringtable german #2

* hellfire stringtable german #2

* nlaw stringtable german #2

* overpressure stringtable german #2

* quickmount stringtable german#2

* refuel stringtable german #2

* scopes stringtable german #2

* slideshow stringtable german #2

* zeus stringtable german #2

* tiny fix

* tiny fix

* quickmount stringtable german #3

* fastroping stringtable german #2

* captives stringtable german

* cargo stringtable german

* cookoff stringtable german

* tiny change

* cargo stringtable german

* fcs stringtable german

* Fix german strings for scopes
2017-10-07 13:37:59 +02:00
classic
9dfc76b6d5 Update the Japanese translation (#5565)
* Update the Jpn translation

following to official localization.

* Update the Jpn translation

fix for miss translation

* Update the Jpn translation

added more natural words and fix miss translation.

* Update the Jpn translation

fixed for miss translation.

* Update the Jpn translation

just tweaks

* Update the Jpn translation

added to new entry. fixed or tweaked to few entry.

* Update the Jpn translation

added the jpn translation to new entry

* Update the Jpn translation

Added the Jpn translation to new entry.

* Update the Jpn translation

tweak to jpn translation

* Update the Jpn translation

following to official Japanese localization

* Update the Jpn translation

support to new entrys and few fix

* Update the Jpn translation

just tweaks to few entrys
2017-09-28 16:04:24 +02:00
KoffeinFlummi
32b2d99887 Merge remote-tracking branch 'sbng/master' 2017-09-27 18:57:24 +02:00
sbng-PAPA
37dcb562a7 korean translation for 3.10 2017-09-26 00:54:27 +09:00
Andrea Verano
c68ebf2816 Italian translation update (#5542)
Added:
-Fastroping
-Refuel
-Zeus

Fixed:
-Add full arsenal
-Remove arsenal
2017-09-22 17:23:11 +02:00
jonpas
40e4ad3f5a Add Stow FRIES interaction (#5533)
* Add stow FRIES interaction
Allows stowing FRIES (retracting the hooks, closing doors) without the need to deploy and cut ropes

* Do not automatically stow FRIES anymore

* Cleanup more privates
2017-09-21 16:16:04 +02:00
jonpas
333b24e306 Fastrope animations and in-line privatization (#5501)
* Add older Arma door animations and macroize them, In-line privatization, Fix comment

* Clarify animation macros

* Fix onCut delayed animations
2017-09-19 22:38:49 +02:00
PabstMirror
1a590ea399 Remove cargo from fastrope helper object (#5480) 2017-09-07 11:45: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
jonpas
5cf7569711 Correct new Chinese stringtable identifiers (#5334) 2017-07-08 09:48:39 -05:00
GodofMonkeys
60131ee589 Add Chinese Traditional & Simplified Localization (#5295)
Add Chinese Traditional & Simplified Localization
2017-06-22 16:46:00 +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
Andrea Verano
e3fd1612e2 Italian translation (Add & Fix) (#5193)
Added Italian translation for:
-advanced fatigue
-advanced throwing
-cook off
-dogtags
-gunbag
-ui-scopes and much more...

Fixed a lot of grammatical errors
2017-05-23 13:44:17 -05: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
da85fc1be5 Add RHS MELB fastrope, add 3d debuging of mem points
Close #4683
Config from @Whigital
2016-11-16 17:42:11 -06:00
BaerMitUmlaut
2ba0137a1e Fix going unconscious while fastroping (#4531) 2016-10-11 18:48:20 +02:00
PabstMirror
198f6c93e4 Fix FRIES attach point for unarmed wildcat (#4518)
Close #4490
2016-10-06 15:58:45 -05: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
Grzegorz
a63dcb49d0 PL Translation 3.7.1 (#4395)
* translate advanced fatigue

* translate advanced throwing

* translate cargo

* translate chemlights

* translate cookoff

* translate explosives

* translate fastroping

* translate gforce

* translate googles

* translate grenades

* translate gunbag

* translate maptools

* translate medical

* translate medical_ai

* translate minedetector

* translate nametags

* translate overheating

* translate repair

* translate tagging

* translate ui

* translate zeus
2016-09-18 22:00:13 +02:00
classicarma
47bd4e9991 translate fastroping 2016-09-17 01:44:56 +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
[OMCB]kaban
8fc2cbd0ef Russian Translations - Update (#4217) 2016-08-13 11:25:43 +02:00
BaerMitUmlaut
21f1329762 Added keybind to cut ropes 2016-07-14 08:13:52 +02: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
d26f133733 Add missing french entries in stringtables and update older ones
Take changes from #3480 and completed empty entries
2016-06-19 01:18:12 +02:00
Glowbal
e8ba309765 Merge pull request #3887 from gpgpgpgp/patch-2
add a line to get rid of 4 first aid kits in the invisible fast roping helper
2016-06-11 21:53:34 +02:00
Glowbal
1632cb9105 Merge pull request #3878 from acemod/fastroping-sounds-fix
Only play fastroping sounds for player
2016-06-11 21:53:00 +02:00
Glowbal
8c9b31b1c7 Merge pull request #3815 from acemod/cbaEventSystem
Deprecate ACE events framework
2016-06-09 14:20:26 +02:00
gpgpgpgp
0c28cd4413 add a line to get rid of 4 first aid kits in the invisible helper
The helper "ace_fastroping_helper" inherits from Helicopter_Base_F, and here's chain of inheritance.
class CfgVehicles
{
	class AllVehicles;
	class Air: AllVehicles
	{
		class TransportItems
		{
			class _xx_FirstAidKit
			{
				name = "FirstAidKit";
				count = 4;
			};
		};
	};
	class Helicopter: Air
	{
	};
	class Helicopter_Base_F: Helicopter
	{
	};
	class ace_fastroping_helper: Helicopter_Base_F
	{
		class TransportItems {};	// now overrides the first aid kits
	};
};
Was a happy and funny surprise to pick up some decent medical supplies from one end of a cut rope.
2016-06-08 17:26:23 +08:00
BaerMitUmlaut
27c347eec8 Only play fastroping sounds for player 2016-06-05 19:39:12 +02:00
Jonathan Pereira
b64b7e431e Translated remaining strings 2016-06-03 23:11:40 -03: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
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
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
272775445f Merge pull request #3670 from acemod/useQuotedFuncMacros
Use new quoted function macros
2016-05-30 21:00:23 +02:00
SilentSpike
108ff4f644 Replace ACE event system calls with CBA counterparts
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01:00
jonpas
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
commy2
d93132dac8 more replacing 2016-05-18 11:57:40 +02:00
BaerMitUmlaut
f9c643b941 Modified fastroping thud sound 2016-05-11 21:05:59 +02:00
PabstMirror
518a873efd Add module readme 2016-05-10 10:14:15 -05:00
PabstMirror
980da16826 FastRope Sounds - Fix Config, Merge PFEH, Add CC Attribution 2016-05-10 10:09:52 -05:00
BaerMitUmlaut
4eb2ecb0b6 Fixed getting stuck on rope whilst fastroping (#3734) 2016-05-07 22:35:18 +02:00
Glowbal
1ad348d415 Merge pull request #3517 from gruppe-adler/master
Added fastroping sounds
2016-05-07 22:01:21 +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
PabstMirror
d7b0bde1ca Fix Wildcat attach point 2016-04-12 12:28:48 -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
nomisum
5c87161118 fixed logic problem 2016-04-02 15:53:39 +02:00
nomisum
02e3e1c7ec Merge remote-tracking branch 'refs/remotes/acemod/master' 2016-04-02 15:39:44 +02:00
nomisum
fed4662884 changed suggested lines to ace standards 2016-04-02 15:36:21 +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
commy2
a841839aa6 don't overwrite helicopter sub class self actions 2016-03-19 19:37:26 +01:00
BaerMitUmlaut
fc06782256 Fixed broken ropeDetach 2016-03-18 00:16:31 +01:00
BaerMitUmlaut
b25ffdb54f Fixed network race condition 2016-03-18 00:15:57 +01:00
esteldunedain
14183470bc Revert "Improved rope glitchyness"
This reverts commit c65656a016.
2016-03-14 12:16:23 -03:00
esteldunedain
69bd858167 Merge branch 'fr-fix-quotes' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-fix-quotes
Conflicts:
	addons/fastroping/CfgMoves.hpp
	addons/fastroping/CfgVehicles.hpp
2016-03-08 15:24:23 -03:00
esteldunedain
2b33dd7686 Merge branch 'fr-ai-deploy' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-ai-deploy
Conflicts:
	addons/fastroping/XEH_preInit.sqf
2016-03-08 15:13:50 -03:00
esteldunedain
afe835816f Merge branch 'fr-fixes' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-fixes
Conflicts:
	addons/fastroping/CfgVehicles.hpp
2016-03-08 15:07:45 -03:00
Thomas Kooi
60af0d3162 Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR
Standardize GVAR array brackets in configs.
2016-03-08 18:19:50 +01:00
BaerMitUmlaut
35857f4523 Cleanup canPrepareFRIES 2016-03-07 20:42:13 +01:00
BaerMitUmlaut
c65656a016 Improved rope glitchyness 2016-03-06 20:33:23 +01:00
BaerMitUmlaut
84af4b7676 Force open ramps on helicopters 2016-03-06 19:53:37 +01:00