PabstMirror
2cf9519702
Send to extension directly
2015-05-28 04:33:13 -05:00
PabstMirror
bfa75b833d
Merge branch 'master' into debugButton
2015-05-28 04:12:30 -05:00
PabstMirror
3a4a02e524
#1407 - Make Saline 500ml match mass blood/plasma
2015-05-27 16:23:25 -05:00
Glowbal
7dd01ebb69
Merge pull request #1389 from acemod/possibleFixMedicalUnloadPatient
...
Possible fix medical unload patient
2015-05-27 19:34:23 +02:00
PabstMirror
9ed15d9702
Merge pull request #1302 from acemod/nameTagFixes
...
Nametags - Use EyePos of target / windows
2015-05-27 12:19:17 -05:00
PabstMirror
30adc2d463
Patch Merge of PR #1156 - Optics for tripplehead
2015-05-27 11:28:06 -05:00
Nicolás Badano
c365008330
Merge pull request #1275 from acemod/fixUAVandInteractionInhert
...
Fix UAV and Interaction Compile Inheritance
2015-05-27 12:20:46 -03:00
Nicolás Badano
d3a50bce53
Merge pull request #1214 from acemod/reliableSettings
...
Reliable settings framework
2015-05-27 12:10:08 -03:00
esteldunedain
39fec12528
Merge branch 'master' into reliableSettings
2015-05-27 12:09:06 -03:00
esteldunedain
bb99d5a860
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
...
Conflicts:
addons/advanced_ballistics/stringtable.xml
2015-05-27 12:08:47 -03:00
Nicolás Badano
8d9ebebb90
Merge pull request #1405 from Legolasindar/master
...
added spanish translate
2015-05-27 10:52:18 -03:00
Ivan Navarro Cabello
047a2ee736
added spansih translate
...
added spansih translate for (advanced_ballistics, ballistics, captives,
common, explosives, frag, hearing, interaction, map, medical, microdagr,
missileguidance, missionmodules, mk6mortar, nametags, optionsmenu,
respawn, switchunits, vehiclelock, weather, winddeflection).
I used the Pull request of #1251 for complete my commit, because #1251
is outdated now.
2015-05-27 15:27:04 +02:00
PabstMirror
d2eb08594b
Merge branch 'master' into fixUAVandInteractionInhert
...
Conflicts:
addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
2015-05-27 00:36:43 -05:00
ulteq
b2330ae641
Merge pull request #1401 from acemod/atragNightGUIGlow
...
New nighttime picture.
2015-05-26 22:27:28 +02:00
ulteq
5223455174
New nighttime picture.
2015-05-26 22:26:30 +02:00
Nicolás Badano
32325fc784
Merge pull request #1394 from acemod/sortWaitAndExecute
...
Single PFEH for waitAndExecute - using sort
2015-05-26 16:40:17 -03:00
ulteq
5e6e62280e
Fixed a typo
2015-05-26 15:00:52 +02:00
ulteq
bfd31b293d
Merge pull request #1396 from acemod/atragDayNightGUI
...
Nighttime GUI for the ATragMX.
2015-05-26 12:36:18 +02:00
ulteq
dc1bfa9c92
Nighttime GUI for the ATragMX.
2015-05-26 12:32:37 +02:00
ViperMaul
388d6c3519
Change to the proper isAwake function
...
#1375
2015-05-25 20:47:28 -07:00
PabstMirror
4e70bf6e83
Single PFEH for waitAndExecute - using sort
2015-05-25 22:46:56 -05:00
PabstMirror
d410350a25
Make code less smelly
2015-05-25 14:01:59 -05:00
ViperMaul
6a1724343d
remove debug
...
#1375
2015-05-25 11:38:28 -07:00
ViperMaul
789e92d8ef
Ensuring a proper return value and removing unnecessary code.
...
#1375
2015-05-25 10:32:52 -07:00
ViperMaul
3bdb27386c
removing obsolete drag code
...
#1375
2015-05-25 10:25:28 -07:00
ViperMaul
9a07a9bfd6
modify unloadPerson to use unloadPersonLocal
...
#1375
2015-05-25 09:43:29 -07:00
jaynus
3a810aba70
Merge pull request #1387 from acemod/titanInheritBandaid
...
Titan inheritance fix
2015-05-25 09:42:25 -07:00
ViperMaul
7141d251c7
create unloadPersonLocal
...
#1375
2015-05-25 09:41:24 -07:00
ViperMaul
cafaef9612
revert missing actionDragUnit file
...
#1375
2015-05-25 09:39:12 -07:00
PabstMirror
c7d9074f3f
Javelin - Only run if weapon and ammo supported
2015-05-25 05:38:45 -05:00
PabstMirror
0452270380
Add Javelin CfgAmmo
...
Leave M_Titan_AT alone for A3 Vehicles / Mods that use it
2015-05-25 05:34:07 -05:00
ulteq
cc7639ea22
Merge pull request #1386 from acemod/airFrictionUpdate
...
airFriction update
2015-05-25 12:00:31 +02:00
ulteq
2327a493c5
Updated the ATragMX gun profiles and optimized the airFrictions some more.
2015-05-25 10:28:20 +02:00
PabstMirror
7dec983397
#1383 - Fix map shake interfering with other anims
...
Don't run ctrlMapAnimClear each frame, only when ending the animation
2015-05-24 23:56:22 -05:00
ulteq
21f4fcada3
Updated all airFriction values to minimize the drop difference when AB is disabled.
2015-05-25 00:53:41 +02:00
ViperMaul
06932f0c03
Restore missing actionDragUnit function file
...
#1375
2015-05-24 15:14:11 -07:00
ViperMaul
4a12f53855
Merge pull request #1359 from jonpas/setupVars
...
Added maindir, projectdir and cba variables to setup.py
2015-05-24 13:13:58 -07:00
jonpas
0771ab21b6
Capitalized previously missed global
2015-05-24 22:12:56 +02:00
jonpas
88c57780fc
Capitalized globals
2015-05-24 22:09:28 +02:00
ViperMaul
84584fa0b0
Merge pull request #1358 from jonpas/buildVars
...
Added mainprefix and prefix variables to build.py
2015-05-24 13:08:31 -07:00
jonpas
72abe20f58
Capitalized globals
2015-05-24 22:07:12 +02:00
jaynus
a69c6fd090
Merge pull request #1373 from acemod/rhsJavelinAmmoCompat
...
#1321 - Add MGuidance to RHS Javelin Ammo
2015-05-23 18:14:24 -07:00
ViperMaul
d471f1e261
Merge pull request #1355 from jonpas/makeRelPaths
...
Changed absolute make.py paths to read from variables
2015-05-23 13:06:32 -07:00
PabstMirror
22fe30b5a0
#1321 - Add MGuidance to RHS Javelin Ammo
...
We already set the weapon (rhs_weap_fgm148) to ace_javelin_enabled and
disable vanilla locking.
2015-05-23 14:22:15 -05:00
ulteq
038885b10a
Merge pull request #1370 from acemod/missingConfigEntries2
...
Fixes broken scope config (#1312 )
2015-05-23 17:08:01 +02:00
ulteq
ee022e1dea
Fixes broken scope config ( #1312 )
2015-05-23 17:06:46 +02:00
Glowbal
7170db5dc2
Merge pull request #1368 from acemod/medicalBloodBags
...
Medical blood bags size matters
2015-05-23 10:07:58 +02:00
PabstMirror
d82fcd1f96
Advanced - Bloodbag lookup by treatment not item
2015-05-23 01:26:13 -05:00
PabstMirror
d752dd50d0
Basic - Bloodbag size matters
2015-05-23 01:16:18 -05:00
bux578
04dd791374
Merge pull request #1367 from jonpas/stringtableABfix
...
Fixed missing close tag in Advanced Ballistics stringtable
2015-05-23 07:48:56 +02:00
