Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
ACE3/addons
History
PabstMirror ed653456e5 Merge pull request #3338 from acemod/translations156merge 
Fix Merge Conflicts on More Italian Translations
2016-02-19 15:09:40 -06:00
..
advanced_ballistics
Merge pull request #3338 from acemod/translations156merge
2016-02-19 15:09:40 -06:00
ai
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
aircraft
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
apl
Merge branch 'master' into trenches
2016-02-04 17:04:09 -03:00
atragmx
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
attach
Czech Translation - Update
2016-02-03 18:31:31 +01:00
backpacks
manual merge
2016-02-10 10:11:33 +01:00
ballistics
Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge
2016-02-17 12:30:03 -06:00
captives
Merge pull request #3338 from acemod/translations156merge
2016-02-19 15:09:40 -06:00
cargo
Merge pull request #3338 from acemod/translations156merge
2016-02-19 15:09:40 -06:00
common
Merge pull request #3338 from acemod/translations156merge
2016-02-19 15:09:40 -06:00
concertina_wire
Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge
2016-02-17 12:30:03 -06:00
dagr
Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge
2016-02-17 12:30:03 -06:00
difficulties
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
disarming
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
disposable
Added ignore private warnings + trace
2016-02-06 17:07:05 -03:00
dragging
Merge pull request #3338 from acemod/translations156merge
2016-02-19 15:09:40 -06:00
explosives
Merge pull request #3338 from acemod/translations156merge
2016-02-19 15:09:40 -06:00
fcs
Merge pull request #3276 from acemod/156selectapply
2016-02-18 14:23:02 +01:00
finger
Fix deleted czech strings from merge
2016-02-18 13:39:14 -06:00
flashlights
Merge pull request #3338 from acemod/translations156merge
2016-02-19 15:09:40 -06:00
flashsuppressors
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
fonts
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
frag
Merge pull request #3338 from acemod/translations156merge
2016-02-19 15:09:40 -06:00
gestures
Merge pull request #3338 from acemod/translations156merge
2016-02-19 15:09:40 -06:00
gforces
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
goggles
Apply the ufeh to ACE_Grenades
2016-02-06 17:20:30 -03:00
grenades
Apply the ufeh to ACE_Grenades
2016-02-06 17:20:30 -03:00
headless
fix merging errors
2016-02-18 20:05:30 +01:00
hearing
Merge pull request #3338 from acemod/translations156merge
2016-02-19 15:09:40 -06:00
hitreactions
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
huntir
fix merging errors
2016-02-18 20:05:30 +01:00
interact_menu
Merge pull request #3338 from acemod/translations156merge
2016-02-19 15:09:40 -06:00
interaction
Merge pull request #3338 from acemod/translations156merge
2016-02-19 15:09:40 -06:00
inventory
fix merging errors
2016-02-18 20:05:30 +01:00
javelin
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
kestrel4500
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
laser
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
laser_selfdesignate
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
laserpointer
Czech Translation - Update
2016-02-03 18:31:31 +01:00
logistics_uavbattery
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
logistics_wirecutter
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
magazinerepack
Merge pull request #3338 from acemod/translations156merge
2016-02-19 15:09:40 -06:00
main
Merge pull request #3338 from acemod/translations156merge
2016-02-19 15:09:40 -06:00
map
Merge pull request #3338 from acemod/translations156merge
2016-02-19 15:09:40 -06:00
map_gestures
Czech Translation - Update
2016-02-03 18:31:31 +01:00
maptools
Merge pull request #3114 from Luigium/master
2016-02-04 20:28:00 +01:00
markers
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
medical
Merge pull request #3338 from acemod/translations156merge
2016-02-19 15:09:40 -06:00
medical_menu
Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge
2016-02-17 12:30:03 -06:00
microdagr
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
missileguidance
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
missionmodules
manual merge
2016-02-10 10:11:33 +01:00
mk6mortar
Czech Translation - Update
2016-02-03 18:31:31 +01:00
modules
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
movement
manual merge
2016-02-19 11:50:17 +01:00
mx2a
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
nametags
Merge pull request #3338 from acemod/translations156merge
2016-02-19 15:09:40 -06:00
nightvision
fix merging errors
2016-02-18 20:05:30 +01:00
noidle
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
noradio
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
norearm
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
optics
Apply the ufeh to ACE_Optics
2016-02-06 17:50:35 -03:00
optionsmenu
Merge pull request #3338 from acemod/translations156merge
2016-02-19 15:09:40 -06:00
overheating
fix merging errors
2016-02-18 20:05:30 +01:00
overpressure
Apply the ufeh to ACE_Overpressure
2016-02-06 18:17:27 -03:00
parachute
Czech Translation - Update
2016-02-03 18:31:31 +01:00
rangecard
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
realisticnames
correct capitalization for German translation
2016-02-05 22:21:27 +01:00
rearm
Czech Translation - Update
2016-02-03 18:31:31 +01:00
recoil
Apply the ufeh to ACE_Recoil
2016-02-06 18:21:43 -03:00
refuel
Merge pull request #2954 from gienkov/nozzleLogic
2016-02-17 21:26:04 +01:00
reload
replace more filter with select
2016-02-06 11:58:31 +01:00
reloadlaunchers
replace more map with apply
2016-02-06 12:08:04 +01:00
repair
Merge pull request #3288 from SzwedzikPL/edenassignsettings
2016-02-19 11:47:26 +01:00
respawn
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
safemode
Czech Translation - Update
2016-02-03 18:31:31 +01:00
sandbag
Merge pull request #3102 from buddytex/SandbagEditor
2016-02-04 20:00:51 +01:00
scopes
Merge pull request #3276 from acemod/156selectapply
2016-02-18 14:23:02 +01:00
sitting
manual merge
2016-02-10 10:11:33 +01:00
slideshow
Czech Translation - Update
2016-02-03 18:31:31 +01:00
smallarms
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
spectator
fix merging errors
2016-02-18 20:05:30 +01:00
spottingscope
Czech Translation - Update
2016-02-03 18:31:31 +01:00
switchunits
Merge pull request #3294 from gienkov/pltranslations
2016-02-18 19:38:43 +01:00
tacticalladder
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
testmissions
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
thermals
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
trenches
fix merging errors
2016-02-18 20:05:30 +01:00
tripod
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
ui
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
vector
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
vehiclelock
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
vehicles
Czech Translation - Update
2016-02-03 18:31:31 +01:00
viewdistance
fix endlines
2016-02-09 12:01:13 +01:00
weaponselect
Merge pull request #3276 from acemod/156selectapply
2016-02-18 14:23:02 +01:00
weather
Czech Translation - Update
2016-02-03 18:31:31 +01:00
winddeflection
Fix winddeflection fire eh
2016-02-06 21:00:42 -03:00
yardage450
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
zeus
manual merge
2016-02-10 10:11:33 +01:00