Commit Graph

99 Commits

Author SHA1 Message Date
Joko
c9a47ec053 Add LoDs for IVBag 250/500/1000
Add LoDs for Kestrell
2015-07-16 14:41:42 +02:00
jonpas
1eeca28a3d Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting 2015-06-13 22:08:13 +02:00
jonpas
254b386805 Allowed Kestrel4500 Inside and Sitting 2015-06-13 21:46:55 +02:00
jonpas
29ce8f635e Merge branch 'master' into sitting
Conflicts:
	addons/kestrel4500/CfgVehicles.hpp
	addons/microdagr/CfgVehicles.hpp
2015-06-13 21:43:42 +02:00
PabstMirror
6ab8b129fa Merge branch 'master' into multipleDevices
Conflicts:
	addons/common/XEH_postInit.sqf
2015-06-13 12:30:35 -05:00
ulteq
ba15db7d6a Allowed using the ATrag, Kestrel and Rangecards inside of vehicles. 2015-06-11 12:05:46 +02:00
ulteq
b16d341c0d Increased specular of the Kestrel texture 2015-06-09 23:01:48 +02:00
jonpas
332afb2174 Allow certain self-interactions while sitting 2015-06-09 16:17:05 +02:00
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
PabstMirror
560609fbed Cleanup 2015-06-05 19:46:19 -05:00
PabstMirror
470492759c Merge branch 'master' into multipleDevices
Conflicts:
	addons/atragmx/initKeybinds.sqf
	addons/common/XEH_postInit.sqf
	addons/kestrel4500/CfgVehicles.hpp
	addons/kestrel4500/initKeybinds.sqf
	addons/microdagr/CfgVehicles.hpp
	addons/microdagr/XEH_clientInit.sqf
2015-06-05 17:50:04 -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
PabstMirror
fd8d68c451 Merge branch 'master' into multipleDevices
Conflicts:
	addons/common/stringtable.xml
2015-05-14 15:38:13 -05: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
PabstMirror
de2a89613c ATragMX 2015-05-11 22:22:24 -05:00
PabstMirror
ffce1f6386 Condense mDagr interactions - intergrate kestral 2015-05-11 21:49:13 -05: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
PabstMirror
57d6ad988b Kestral WIP 2015-05-10 16:54:24 -05: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