KoffeinFlummi
|
761e23001f
|
Merge https://github.com/Dimaslg/ACE3 into spanish-merge
Conflicts:
addons/medical/stringtable.xml
addons/missileguidance/stringtable.xml
addons/optionsmenu/stringtable.xml
|
2015-05-01 16:51:20 +02:00 |
|
Glowbal
|
1ca0d66f30
|
Initial categories
|
2015-04-30 22:02:20 +02:00 |
|
Dimaslg
|
f8d5c423ae
|
Merge conflicts resolved
|
2015-04-29 21:15:22 +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 |
|
NukeDev
|
db82df6214
|
Italian's Translation's Changes v2
|
2015-04-28 18:10:35 +02:00 |
|
Dimaslg
|
274663e1b9
|
Spanish Translation
Minor fixes and spelling mistakes.
|
2015-04-25 18:53:45 +02:00 |
|
ulteq
|
eb88f94cf7
|
Removed unused privates
|
2015-04-24 11:53:06 +02:00 |
|
ulteq
|
89e33dc177
|
Refactored the weather module:
* No changes in functionality
|
2015-04-20 13:54:22 +02:00 |
|
KoffeinFlummi
|
3aafa2082d
|
Merge https://github.com/nomisum/ACE3 into german-merge
Conflicts:
addons/atragmx/stringtable.xml
addons/scopes/stringtable.xml
addons/weather/stringtable.xml
|
2015-04-19 00:39:44 +02:00 |
|
ulteq
|
283388eb7c
|
Fixed a small calculation error in the wind speed output
|
2015-04-18 22:12:37 +02:00 |
|
nomisum
|
8813315f36
|
added missing translations german
|
2015-04-17 11:40:31 +02:00 |
|
KoffeinFlummi
|
11f9478035
|
Merge https://github.com/Legolasindar/ACE3 into spanish-merge
Conflicts:
addons/advanced_ballistics/stringtable.xml
addons/atragmx/stringtable.xml
addons/ballistics/stringtable.xml
addons/javelin/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/scopes/stringtable.xml
addons/weather/stringtable.xml
|
2015-04-16 18:31:31 +02:00 |
|
KoffeinFlummi
|
1b67b2df26
|
Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge
Conflicts:
addons/disposable/stringtable.xml
addons/explosives/stringtable.xml
addons/fcs/stringtable.xml
addons/frag/stringtable.xml
addons/hearing/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/javelin/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/markers/stringtable.xml
addons/microdagr/stringtable.xml
addons/movement/stringtable.xml
|
2015-04-15 22:20:47 +02:00 |
|
FreeZbe
|
c0dbf10971
|
French : update stringtable
|
2015-04-15 21:14:00 +02:00 |
|
Ivan Navarro Cabello
|
40b784fb7a
|
update stringtable
added spanish translate
|
2015-04-15 17:41:10 +02:00 |
|
ruPaladin
|
6fca601759
|
Kestrel 4500NV translation to Russian
|
2015-04-15 18:24:57 +03:00 |
|
ulteq
|
238cf1cc63
|
Added keybinds for ATragMX and Kestrel 4500 (empty by default)
|
2015-04-15 15:06:28 +02:00 |
|
KoffeinFlummi
|
8b915380b7
|
Merge branch 'hungarian-merge'
|
2015-04-15 13:55:02 +02:00 |
|
KoffeinFlummi
|
2ffbccbf20
|
Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge
|
2015-04-15 12:59:56 +02:00 |
|
Marco
|
8c0f52e615
|
Update stringtable.xml
Italian
|
2015-04-15 11:08:04 +02:00 |
|
esteldunedain
|
c827c72412
|
AB and Kestrel: Move macros from defines.h to script_component
|
2015-04-14 10:22:26 -03:00 |
|
Nicolás Badano
|
85d253cdc1
|
Merge pull request #574 from gienkov/master
Advanced Ballistics PL translation
|
2015-04-14 10:10:59 -03:00 |
|
ulteq
|
1a39005e72
|
Removed debug output.
|
2015-04-14 12:52:21 +02:00 |
|
Grzegorz Sikora
|
1be197728e
|
AdvBal PL translation
|
2015-04-14 11:42:52 +02:00 |
|
ulteq
|
5a7078ad2c
|
Removed a deprecated workaround
|
2015-04-14 11:12:58 +02:00 |
|
ulteq
|
4355df118c
|
Refactored the Kestrel4500 Code.
|
2015-04-13 11:53:19 +02:00 |
|
ulteq
|
c98422b2c6
|
Shrinked some of the .paa files
|
2015-04-13 10:45:37 +02:00 |
|
ulteq
|
deadbd9414
|
Reduced the amount of LOD levels of the Kestrel
|
2015-04-13 10:39:31 +02:00 |
|
ulteq
|
939365a376
|
New texture for the Kestrel model
|
2015-04-13 10:39:14 +02:00 |
|
ulteq
|
95e7f66a46
|
Added a model for the Kestrel 4500
*We might want to use a smaller one in the future ...
|
2015-04-13 00:17:59 +02:00 |
|
ulteq
|
2040f4dcc3
|
Improved the wind speed calculation if AB is not enabled
|
2015-04-12 23:25:58 +02:00 |
|
ulteq
|
3c25fd4008
|
Fixed a typo
|
2015-04-12 23:20:54 +02:00 |
|
ulteq
|
e3aa9b3d22
|
Added a RSC preload class
|
2015-04-12 23:20:27 +02:00 |
|
ulteq
|
7797cd9a38
|
Added missing abs()
|
2015-04-12 23:03:20 +02:00 |
|
ulteq
|
705017f222
|
Implemented the Kestrel4500 spinning wheel animation
|
2015-04-12 22:54:36 +02:00 |
|
ulteq
|
1ff7218903
|
Change the Kestrel 4500 behavior 'back to normal' when AB is disabled
|
2015-04-11 19:44:38 +02:00 |
|
ulteq
|
f07d743c1d
|
Fixed Kestrel4500 not working when bipod is deployed
|
2015-04-10 15:26:56 +02:00 |
|
ulteq
|
823d834457
|
Replaced EGVAR(advanced_ballistics,Altitude) with EGVAR(weather,Altitude)
|
2015-04-08 12:56:34 +02:00 |
|
ulteq
|
f107b700a7
|
Fixed Kestrel4500 self interaction menu conditions
|
2015-04-08 11:26:12 +02:00 |
|
ulteq
|
f974e7a9a1
|
Removed duplicate Kestrel4500_ prefix
|
2015-04-08 11:25:15 +02:00 |
|
ulteq
|
0a7552d46f
|
Removed unnecessary canInteractWith check
|
2015-04-07 20:21:16 +02:00 |
|
ulteq
|
c94c1c1bcb
|
Replaced tabs with spaces
|
2015-04-07 20:19:35 +02:00 |
|
ulteq
|
f6a9a007cc
|
Fixed the readme
|
2015-04-07 20:11:50 +02:00 |
|
ulteq
|
a4c70fe616
|
Integrated the Kestrel 4500 into the ace interaction menu
|
2015-04-07 19:57:42 +02:00 |
|
ulteq
|
f73bdfa148
|
Fixed several syntax errors in fnc_buttonPressed.sqf
|
2015-04-07 19:20:38 +02:00 |
|
ulteq
|
b62827c050
|
Added comments to all functions
|
2015-04-07 17:58:54 +02:00 |
|
ulteq
|
7d42eeed28
|
Fixed incorrect icon path
|
2015-04-07 17:45:52 +02:00 |
|
ulteq
|
0315219cf2
|
Added new Kestrel4500 branch:
*TODO: Fix the dialog button actions (action="...") in RscTitles.hpp
|
2015-04-07 17:43:54 +02:00 |
|