PabstMirror
|
fb9c1e14a3
|
Merge branch 'master' into allStringtableMacros
Conflicts:
addons/kestrel4500/CfgWeapons.hpp
|
2015-06-07 12:24:40 -05:00 |
|
ulteq
|
be68284911
|
Fixed a typo
|
2015-06-07 18:20:14 +02:00 |
|
ulteq
|
39ba85b213
|
New low-poly Kestrel model
|
2015-06-07 18:17:09 +02:00 |
|
PabstMirror
|
32ce0aa6fd
|
Macroize all stringtables
|
2015-06-05 21:02:24 -05:00 |
|
jonpas
|
541f1010a7
|
Merge branch 'master' into macroSTR
Conflicts:
addons/attach/functions/fnc_attach.sqf
addons/captives/functions/fnc_moduleSurrender.sqf
addons/common/CfgVehicles.hpp
addons/explosives/CfgModule.hpp
addons/hearing/CfgVehicles.hpp
addons/interaction/CfgVehicles.hpp
addons/map/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
addons/mk6mortar/CfgVehicles.hpp
addons/nametags/CfgVehicles.hpp
addons/nightvision/functions/fnc_changeNVGBrightness.sqf
addons/respawn/CfgVehicles.hpp
addons/switchunits/CfgVehicles.hpp
addons/vehiclelock/CfgVehicles.hpp
addons/winddeflection/stringtable.xml
|
2015-06-02 22:14:32 +02:00 |
|
ulteq
|
e626794866
|
Fixes array init
|
2015-06-01 16:21:30 +02:00 |
|
ulteq
|
0364975c12
|
Implemented Density Altitude calculation
|
2015-06-01 16:09:35 +02:00 |
|
jonpas
|
763cb07629
|
Macro STRING to LSTRING
|
2015-05-28 21:59:04 +02:00 |
|
jonpas
|
87db721d4f
|
Stringtable fixes up to medical
|
2015-05-27 21:19:14 +02:00 |
|
jonpas
|
6072e14077
|
Changed all strings to macros (except external)
|
2015-05-27 19:04:25 +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 |
|
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 |
|
ulteq
|
ea32aa0265
|
ATragMX/Kestrel 4500 dialogs can be toggled on/off with keybinds.
|
2015-05-17 11:23:31 +02:00 |
|
ulteq
|
a008c45875
|
Fixed heading can be negative
|
2015-05-16 23:34:50 +02:00 |
|
ulteq
|
cdd07a33c9
|
Fixed some typos
|
2015-05-16 23:30:16 +02:00 |
|
ulteq
|
9116fed415
|
New main menu: 'date' | New sub menu: 'magnetic heading'
|
2015-05-16 20:26:52 +02:00 |
|
ulteq
|
ea68e91ef9
|
Refactored and expanded the kestrel data collection
|
2015-05-16 11:13:54 +02:00 |
|
ulteq
|
b65ac1f305
|
Fixed some bugs in the Kestrel 4500 output generation
|
2015-05-16 11:13:50 +02:00 |
|
ulteq
|
ef225b366b
|
Kestrel GUI expansion
|
2015-05-15 21:11:03 +02:00 |
|
ulteq
|
7474d7f313
|
Merge pull request #1193 from acemod/getTemperatureAtHeight
Moved all temperature calculations into the weather module.
|
2015-05-14 16:41:16 +02:00 |
|
ulteq
|
cf487b544e
|
Moved all temperature calculations into the weather module.
|
2015-05-14 16:07:41 +02:00 |
|
ulteq
|
a167336b40
|
Made the Kestrel menu persistent
|
2015-05-14 15:39:29 +02:00 |
|
ulteq
|
d04ebef519
|
Merge pull request #1106 from acemod/refactorCalcWindSpeed
Moved all wind calculations into the weather module
|
2015-05-13 11:23:32 +02:00 |
|
ulteq
|
0b3d3b8793
|
Added missing PBOPREFIX files
|
2015-05-11 17:37:08 +02:00 |
|
ulteq
|
b03333c9e8
|
Moved all wind calculations into the weather module
|
2015-05-11 10:59:07 +02:00 |
|
ulteq
|
3a10c77f08
|
Minor cleanup
|
2015-05-09 22:09:36 +02:00 |
|
jaynus
|
6b5d95906d
|
Disables multiple openings of the kestrel & atrag. Allows the overlay toggle, but disables the opening of multiple ones. Used onUnload handlers. Supports both limiting interact and keybinds. Fixes #1086
|
2015-05-09 12:41:01 -07:00 |
|
ProfessorCZ
|
a0e443cfc6
|
Czech translation - Update
|
2015-05-03 11:48:56 +02:00 |
|
ToasterBR
|
021b00c722
|
Translation to Portuguese
Done all remaining portuguese translations, including some minor
corrections
|
2015-05-02 03:38:53 -03:00 |
|
KoffeinFlummi
|
f1ba0cff26
|
Merge https://github.com/ProfessorCZ/ACE3 into czech-merge
Conflicts:
AUTHORS.txt
addons/advanced_ballistics/stringtable.xml
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/respawn/stringtable.xml
|
2015-05-02 00:26:25 +02:00 |
|
Lukas
|
1d3f5cc312
|
Czceh translation
|
2015-05-02 00:04:50 +02:00 |
|
adam3adam
|
f5303d455c
|
Translation of some stuff into czech language
adv. ballistics, atragmx, interaction menu, kestrel4500, laser pointer
and little part of medical
|
2015-05-01 22:23:03 +02:00 |
|
KoffeinFlummi
|
e96f23c197
|
Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge
Conflicts:
addons/atragmx/stringtable.xml
addons/interact_menu/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
addons/realisticnames/stringtable.xml
addons/respawn/stringtable.xml
|
2015-05-01 17:30:59 +02:00 |
|
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 |
|
Harakhti
|
4e165e2572
|
Update Hungarian translations
Let us match the current revision. At the time of making, the Ballistics
XML was broken.
|
2015-04-30 13:25:25 +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 |
|