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
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
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
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
dc1bfa9c92
Nighttime GUI for the ATragMX.
2015-05-26 12:32:37 +02:00
PabstMirror
4e70bf6e83
Single PFEH for waitAndExecute - using sort
2015-05-25 22:46:56 -05: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
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
PabstMirror
437db22ab8
#1364 - Prevent script error if bad muzzle
2015-05-22 23:38:16 -05:00
jonpas
030b509ec5
Fixed missing close tag in Advanced Ballistics stringtable
2015-05-23 03:34:11 +02:00
PabstMirror
8fd0aef7d4
Medical - Fix Handle Damage
...
{} were unmatched so nothing ran.
I think this is just leftover from a merge.
2015-05-22 16:35:48 -05:00
Glowbal
48ed51b03c
Merge pull request #1361 from acemod/FixUnconsciousCondition
...
Medical - Fix Unconscious Condition
2015-05-22 22:39:18 +02:00
PabstMirror
f785fcc0d4
Merge pull request #1362 from acemod/timeHasComeToday
...
Fix Time Calc
2015-05-22 14:32:56 -05:00
PabstMirror
f4bf6ea26d
Fix Time Calc
2015-05-22 14:29:56 -05:00
PabstMirror
537bba1382
Medical - Fix Unconscious Condition
2015-05-22 13:56:45 -05:00
ulteq
308b0aa0f9
Fixed incorrect barrel length.
2015-05-22 20:41:36 +02:00
ulteq
9536423f2e
Merge pull request #1353 from acemod/cleanup_ATragMX_AB
...
Removed a deprecated function and fixed some typos.
2015-05-22 18:42:20 +02:00
ulteq
e88c570ef2
Removed a deprecated function and fixed some typos.
2015-05-22 18:42:09 +02:00
jaynus
582ea318d4
Merge remote-tracking branch 'origin/superTime'
...
Conflicts:
addons/frag/functions/fnc_fired.sqf
addons/frag/functions/fnc_trackFragRound.sqf
2015-05-22 07:24:55 -07:00
PabstMirror
72020a43f1
Privates / Remove Debug
2015-05-21 17:53:15 -05:00
PabstMirror
4e92a51cf8
Create Defuse Helpers for spawned Explosives
2015-05-21 17:47:54 -05:00
jaynus
46751fd912
Merge pull request #1163 from acemod/fragSpallOptimization
...
Frag spall optimization
2015-05-21 15:08:07 -07:00
jaynus
3cb4094429
Merge branch 'fragSpallOptimization' of github.com:acemod/ACE3 into fragSpallOptimization
2015-05-21 15:07:12 -07:00
jaynus
c297257421
Disable frag by default. Add @pabstmirror fix closes #1339 closes #820
2015-05-21 15:06:55 -07:00
Felix Wiegand
fd2676c7b9
Merge pull request #1135 from acemod/fcsPrivates
...
FCS - Privates
2015-05-21 22:18:14 +02:00
Glowbal
8b69b3b1b1
Merge pull request #1332 from acemod/medicalBinocTreatment
...
Fix Script Error when treating with bincos
2015-05-21 20:20:41 +02:00
ulteq
24b2fea303
Persistent reference heading for the Kestrel 4500.
2015-05-21 19:28:59 +02:00
ulteq
1816208997
Proper Min/Max storing of negative tailwind values.
2015-05-21 19:18:15 +02:00
jaynus
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
ulteq
db7c2a19e6
Tailwinds are displayed as negative values.
2015-05-21 11:14:37 +02:00
PabstMirror
1aa9520adb
Fix Script Error when treating with bincos
2015-05-20 23:24:44 -05:00
Nicolás Badano
72d955bc0c
Merge pull request #1328 from alef/master
...
Fixed: Removed § typo at the end of EH call
2015-05-20 19:01:52 -03:00
Kavinsky
4b048553e2
wops... corrected wrong path
2015-05-20 23:44:50 +02:00
Kavinsky
8e9b35c757
Fixed Capitalized folders on include paths
2015-05-20 23:28:10 +02:00
ulteq
7d3bb526dd
Merge pull request #1263 from acemod/bulletTraceTweak
...
Slightly increased the bullet trace effect size
2015-05-20 22:12:37 +02:00
ulteq
149e3ae8b0
Slightly decreased the visibility of the bullet trace effect.
2015-05-20 22:12:02 +02:00
Alessandro Foresi
67319b6808
Fixed: Removed § at the end of EH call
2015-05-20 22:04:19 +02:00
