Commit Graph

111 Commits

Author SHA1 Message Date
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