Commit Graph

148 Commits

Author SHA1 Message Date
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
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
commy2
c5275813a4 use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it 2016-05-14 10:49:09 +02:00
PabstMirror
1742629045 Add NonSteerable Reserve Parachute (#3689)
* Add NonSteerable Reserve Parachute

Close #3364

* Use params
2016-05-07 22:26:02 +02:00
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
BlackWindowS
c61e7b5104 Tweaked & added translations
Translation of almost every STR to French
2016-02-28 14:48:04 +01:00
commy2
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
ChairborneIT
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
bux578
76bacf184d Merge pull request #2237 from gienkov/patch-29
Make reserve steerable
2016-02-20 17:00:51 +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
bux
0e8eb5fac4 Remove obsolete hotkey entries 2015-12-30 11:23:52 +01:00
commy2
a9ebcf8543 fix setVariable and getVariable capitalization 2015-11-30 17:27:09 +01:00
commy2
ca9b909e75 fix CBA_fnc capitalization 2015-11-30 16:45:20 +01:00
PabstMirror
fefe24b7eb Disable debug in parachute 2015-10-24 19:07:23 -05:00
esteldunedain
a621a0c693 Fixes to spanish translations 2015-09-18 13:36:57 -03:00
Ivan Navarro Cabello
463e21dd91 330 2015-09-16 12:40:30 +02:00
KoffeinFlummi
63c2712360 Merge branch 'release' into portuguese 2015-09-10 21:59:30 +02:00
KoffeinFlummi
c2ffe7cad0 Merge branch 'release' into russian 2015-09-10 21:05:32 +02:00
KoffeinFlummi
a5621604fd Merge branch 'release' into czech 2015-09-10 20:51:33 +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
Jonathan Pereira
7147891710 Added latest ACE3 PT-BR translations 2015-09-05 15:12:31 -03: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
ProfessorCZ
44fa520bdd Czech Translations - Update 2015-09-03 01:20:24 +02:00
KoffeinFlummi
a7f2a7fefc Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3 2015-08-30 00:35:11 +02:00
Grzegorz
836b5001be Make reserve steerable 2015-08-23 13:40:13 +02:00
jonpas
de033f0ff2 README.md files added to all modules 2015-08-19 04:18:33 +02:00
Glowbal
d8d706eb04 Merge pull request #1974 from jokoho48/parachutePrivateScope
Fix that Reserve Parachute can get in Arsenal or in Crate
2015-08-08 14:25:40 +02:00
PabstMirror
b3741f4036 Capitalization for macro CBA_fnc_addPerFrameHandler 2015-08-04 02:34:38 -05:00
KoffeinFlummi
261cd42202 Merge branch 'pl-translation-4' of https://github.com/gienkov/ACE3 into polish-merge 2015-08-02 17:14:41 +02:00
jokoho48
d0d585d0f5 Fix that Parachute can get in Arsenal or in Crate 2015-08-01 20:47:40 +02:00
Harakhti
d0f91c5ebf Row 1
Not a miracle, but it's something.
2015-07-30 14:40:51 +02:00
Joko
46531b916a change form addBackpack to addBackpackGlobal 2015-07-28 20:08:38 +02:00
Joko
baa1aab257 Fix Spelling 2015-07-28 19:24:34 +02:00
Joko
b2eeaacfc1 Fix Double Config Entry 2015-07-28 18:51:17 +02:00
Joko
55cac4b6d9 posible fix for #1932 2015-07-28 18:36:13 +02:00
gienkov
5136215e79 finger, parachute and spectator translation 2015-07-27 01:46:58 +02:00
SzwedzikPL
6258e73290 addX macro in confgis 2015-07-25 21:59:52 +02:00
PabstMirror
40ed985d34 Config Fixes 2015-07-25 12:56:57 -05:00
Joko
30111b4f15 Fix Merge Problems
Use CString Macro
2015-07-01 03:03:51 +02:00
Joko
a74bc3a748 Merge branch 'master' of https://github.com/acemod/ACE3 into acemod-master
Conflicts:
	AUTHORS.txt
	addons/parachute/CfgVehicles.hpp
2015-07-01 02:49:29 +02:00
jonpas
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
jonpas
0b0f7274d7 Applied ESTRING and ECSTRING macros 2015-05-27 22:04:41 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
Joko
e0722452b7 add Compatibilty to mods where the Animation are not "para_pilot" 2015-05-25 01:09:28 +02:00
Joko
1f5f5a2dcf ACE_player -> _unit 2015-05-23 23:58:16 +02:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
Joko
9a212f0687 Fix gettings anytime a new Parachute 2015-05-21 14:54:00 +02:00
Joko
f8003fd865 fix adding a New Parachute if one already given 2015-05-21 14:06:23 +02:00
Joko
ccd3fb8b4a Enhance some scripts
add New Config Parameter has Reserve Parachute
2015-05-21 14:03:52 +02:00
Joko
41c6ea8b4e Fix Reload Bug 2015-05-21 08:06:59 +02:00
Joko
8c69ff4573 reset Form SETVAR to setVariable 2015-05-20 22:13:18 +02:00
Joko
bc535c95ba Fixing Privates 2015-05-19 21:46:34 +02:00
Joko
4db9989480 Add Posible to use Mod Parachutes 2015-05-19 19:33:24 +02:00
Joko
48f44813ea Update to ACE Standarts
Fix Adding anytime B_Parachute
Fix Reserve Parachute Added if Normal Parachute Open
2015-05-19 18:17:10 +02:00
Joko
7a012a5acb chuteIsCuted -> chuteIsCut 2015-05-19 14:20:56 +02:00
Joko
e40310189e Prevent Respawn bug
Change to Macros
2015-05-19 13:55:25 +02:00
Joko
75be6a1906 TAAAABBBBSSSSSS 2015-05-19 13:47:39 +02:00
Joko
f06f38a107 Add Cut Parachute 2015-05-19 13:45:28 +02:00
Glowbal
1ca0d66f30 Initial categories 2015-04-30 22:02:20 +02:00
KoffeinFlummi
a1e709047e Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge
Conflicts:
	AUTHORS.txt
	addons/aircraft/stringtable.xml
	addons/attach/stringtable.xml
	addons/captives/stringtable.xml
	addons/common/stringtable.xml
	addons/disposable/stringtable.xml
	addons/dragging/stringtable.xml
	addons/explosives/stringtable.xml
	addons/fcs/stringtable.xml
	addons/frag/stringtable.xml
	addons/grenades/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/kestrel/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/logistics_uavbattery/stringtable.xml
	addons/logistics_wirecutter/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/maptools/stringtable.xml
	addons/markers/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/movement/stringtable.xml
	addons/nametags/stringtable.xml
	addons/nightvision/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/parachute/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/reload/stringtable.xml
	addons/reloadlaunchers/stringtable.xml
	addons/respawn/stringtable.xml
	addons/safemode/stringtable.xml
	addons/switchunits/stringtable.xml
	addons/vehiclelock/stringtable.xml
	addons/weaponselect/stringtable.xml
	addons/wep_javelin/stringtable.xml
	addons/winddeflection/stringtable.xml
2015-04-29 12:52:55 +02:00
KoffeinFlummi
b472292b20 Remove tabler comments.
sed is awesome.
2015-04-26 21:05:41 +02:00
VyMajoris
523cb49ff1 Added - Portuguese translation to lots of things.
Also fixed a typo the english key for STR_ACE_microdagr_configure.
2015-04-26 03:09:16 -03:00
KoffeinFlummi
1d93589ebc Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-17 15:45:22 +02:00
KoffeinFlummi
20e4858a0d Merge https://github.com/ramius86/ACE3 into italian-merge 2015-04-17 15:44:50 +02:00
commy2
26944ea84e make altimeter actually usable with parachutes 2015-04-17 13:01:38 +02:00
commy2
73fd9ac62e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into parafix 2015-04-17 12:55:07 +02:00
commy2
558a4fb363 Merge pull request #461 from Tenga/altimeter-fix
Altimeter fix, division by zero when no time has passed (game paused, etc.)
2015-04-17 12:49:06 +02:00
commy2
20565e8b02 hide height / velocity while parachuting, freefallig in expert mode, fix 692 2015-04-17 11:02:01 +02:00
Marco
23cb1058fc Update stringtable.xml
IT
2015-04-16 10:26:55 +02:00
Harakhti
8bfd915ec4 Translation: N to R
This was a lot more fun than the previous two were. 12 folders left...
2015-04-13 23:45:44 +02:00
Tenga
e7b5218d52 Altimeter fix, division by zero when no time has passed (game paused, etc.) 2015-04-11 00:14:06 +02:00
commy2
dc49f2c71e rewrite assigned item fix 2015-04-10 18:31:43 +02:00
jaynus
1bb6be5654 Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
PabstMirror
7e383dc10e #198 canInteractWith EGVAR -> EFUNC 2015-03-20 17:55:39 -05:00
Nicolás Badano
f90f1cfc21 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-16 18:39:20 -03:00
Nicolás Badano
cf45de7c11 Typo on altimeter. Fix #204 2015-03-16 18:36:09 -03:00
commy2
b5f307919e replace canInteract with canInteractWith 2015-03-15 13:00:10 +01:00
PabstMirror
aaeb5a3392 Parachute - Move unused p3d back to TOMERGE 2015-03-12 00:07:28 -05:00
PabstMirror
82ea87d1de Parachute - Config Division/Formating 2015-03-12 00:05:28 -05:00
PabstMirror
7173037cb0 Fix 2 broken keybinds 2015-03-10 12:45:08 -05:00
PabstMirror
81a944457b Merge pull request #170 from KoffeinFlummi/cba-NewKeyBinding
Key Bind Redo (switch to new CBA 150306)
2015-03-07 14:09:52 -06:00
PabstMirror
7ed682a849 Fix Parachutes 2015-03-07 13:48:39 -06:00
PabstMirror
4018742f26 Return False on keyUp Code 2015-03-05 02:51:24 -06:00
PabstMirror
0919e59719 Key Bind Redo (except vector) 2015-03-05 01:32:26 -06:00
Garth L-H de Wet
9c20706c83 Added a event handler for player vehicle changing. As well as covered the canInteract in key handler. 2015-02-03 11:51:16 +02:00
Garth L-H de Wet
b4d1d6b230 Removed the PFH when the player vehicle is no longer a parachute. 2015-02-03 11:50:33 +02:00
Garth L-H de Wet
c08494cc43 Made use of time instead of diag_ticktime, to take care of time acceleration and so forth. 2015-02-03 11:50:11 +02:00
Garth L-H de Wet
9e1cd9a194 Fixed headers to be more consistent with ACE. 2015-02-03 00:05:03 +02:00
Garth L-H de Wet
aca1c0c6cf Converted to use CBA PFH's and MACROs. 2015-02-02 23:58:24 +02:00
Garth L-H de Wet
966cb6ffdf Performed initial conversion from AGM to ACE. Added necessary boilerplate files. 2015-02-02 22:52:08 +02:00
Garth L-H de Wet
03cef93ac7 Initiated AGM_Parachute merge. 2015-02-02 22:31:48 +02:00