Commit Graph

2466 Commits

Author SHA1 Message Date
jaynus
c9e2eb0869 Changed: no-crosshair reticle for Titan by BlackPixxel 2015-04-12 14:05:12 -07:00
jaynus
2317a3c988 Visually hide laser targets. 2015-04-12 14:03:15 -07:00
jaynus
2e83e56a73 Seeker integration. 2015-04-12 13:02:09 -07:00
PabstMirror
38c3f43dd6 Fix UBC
Updating base class Turrets->, by
z\ace\addons\missileguidance\config.bin/CfgVehicles/B_Heli_Attack_01_F/Turrets/
2015-04-12 14:39:49 -05:00
jaynus
5251de8447 break out seeker angle check. more laser code cleanup. 2015-04-12 12:16:26 -07:00
jaynus
9287d6fe44 Remove dead code. 2015-04-12 11:46:28 -07:00
jaynus
7f0e54b9c3 More defaults. 2015-04-12 11:43:37 -07:00
jaynus
197b13e6d9 Use current codes for FCS updates. 2015-04-12 11:41:50 -07:00
jaynus
9273a32d23 code cleanup, default laser parameters, getVariable self designation specifics. 2015-04-12 11:38:07 -07:00
jaynus
6be8cc8d84 Removed: Laser visuals
Updated: comments and function defs
Changed: pass function name, not full code.
2015-04-12 11:29:33 -07:00
jaynus
887e1d1d99 Remove optional laser visual. 2015-04-12 11:14:12 -07:00
jaynus
16cd05edc8 Merge branch 'network_lasers' of github.com:acemod/ACE3 into network_lasers 2015-04-12 11:01:27 -07:00
jaynus
01797fd3b9 Integarate laser code into SALH guidance + self_designate. Note todo items. 2015-04-12 11:01:22 -07:00
Nou
4a23b8be00 Allow string function names. 2015-04-12 10:52:50 -07:00
Anthariel
45f3300967 Update stringtable.xml
Added: Missing french translation.
2015-04-12 18:20:32 +02:00
Anthariel
8d79fd242a Update stringtable.xml
Added: Some missing french translations. (I took 10 minutes to translate the banana description (-:)
2015-04-12 18:18:52 +02:00
Anthariel
3db8f4ad44 Update stringtable.xml
Added: Some missing french translation.
2015-04-12 18:10:41 +02:00
Anthariel
3ee421a233 Update stringtable.xml
Wrong french translation for the line 173.
2015-04-12 18:08:06 +02:00
Anthariel
3f84ac4817 Update stringtable.xml 2015-04-12 17:59:53 +02:00
Anthariel
3842272c43 Update stringtable.xml
Fixing French & English translation error that I've made on the line : 780 and 781 (thanks KoffeinFlummi)
2015-04-12 17:55:53 +02:00
esteldunedain
d6ec8d771e Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-12 11:14:31 -03:00
esteldunedain
91df52056b Only display "Surrender" action if the player is not holding a weapon. 2015-04-12 11:13:54 -03:00
KoffeinFlummi
390a777286 Merge branch 'patch-1' of https://github.com/Kllrt/ACE3
Conflicts:
	AUTHORS.txt
2015-04-12 15:55:17 +02:00
bux578
899f345a8f Merge pull request #510 from ruPaladin/patch-3
Update AUTHORS.txt
2015-04-12 14:51:06 +02:00
bux578
9184ef479a add disarm icon, add action psd, move icon files 2015-04-12 14:47:08 +02:00
Glowbal
019163c9ce Merge pull request #489 from acemod/medicalPerformanceImprovements
Medical performance improvements
2015-04-12 14:44:18 +02:00
KoffeinFlummi
d2fbd5c735 Fix groups 2015-04-12 14:42:49 +02:00
ruPaladin
215f3059f3 Update AUTHORS.txt
Russian translation
2015-04-12 15:33:24 +03:00
KoffeinFlummi
8f2a1735ae Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-12 14:28:28 +02:00
KoffeinFlummi
614afa8537 Merge https://github.com/Kllrt/ACE3 into czech-merge
Conflicts:
	addons/attach/stringtable.xml
	addons/captives/stringtable.xml
	addons/common/stringtable.xml
	addons/dragging/stringtable.xml
	addons/explosives/stringtable.xml
	addons/goggles/stringtable.xml
	addons/grenades/stringtable.xml
	addons/hearing/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/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/nametags/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/reload/stringtable.xml
	addons/reloadlaunchers/stringtable.xml
	addons/weaponselect/stringtable.xml
	addons/wep_javelin/stringtable.xml
	addons/winddeflection/stringtable.xml
2015-04-12 14:27:59 +02:00
Nicolás Badano
f18f807e60 Merge pull request #507 from Legolasindar/master
Merge pull request #1 from acemod/master
2015-04-12 09:06:30 -03:00
Legolasindar
b665781399 Update stringtable.xml
updated spanish translation and added some english missed translation
2015-04-12 13:58:06 +02:00
nic547
0f1115c33b Added new Ammotypes into the AGM crate 2015-04-12 13:08:50 +02:00
Legolasindar
4778c716cb Merge pull request #1 from acemod/master
update from original
2015-04-12 12:36:43 +02:00
commy2
7b0e7a1efb Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-12 12:04:07 +02:00
commy2
f16d5398f4 enable vector on ffv positions, fix #506 2015-04-12 12:03:49 +02:00
Kllrt
be8ff39767 Fixed broken missileguidaince stringtable.xml
sry
2015-04-12 10:58:00 +02:00
bux578
dcf782abb4 add rocks LOD issue 2015-04-12 10:51:15 +02:00
Asgar
32400a21ac update AUTHORS.txt 2015-04-12 10:49:22 +02:00
Glowbal
6bfd3e5c74 Merge pull request #481 from acemod/FixUnconciousAnimWhileCarrying
Fixed breaking of unconscious animation on drop object.
2015-04-12 09:48:27 +02:00
PabstMirror
78b64ea273 Missing English 2015-04-12 01:36:41 -05:00
bux578
2fc7f44c39 french translation, tabler 4 spaces test 2015-04-12 07:50:23 +02:00
bux578
0e3d971274 Fix translations error 2015-04-12 07:46:43 +02:00
Nou
40c5de8cfb Reduce default number of rays, make it an argument for shootCone. Accuracy is still the same with 3 to 8, just better FPS. Rangefinders should probably use a higher number (8 is good, 24+1 rays in total per shot). 2015-04-11 20:14:03 -07:00
Nou
db3f816843 Reduce default number of rays, make it an argument for shootCone. Accuracy is still the same with 3 to 8, just better FPS. Rangefinders should probably use a higher number (8 is good, 24+1 rays in total per shot). 2015-04-11 20:13:52 -07:00
Felix Wiegand
0efcd7d56f Merge pull request #499 from gienkov/patch-2
AUTHORS.TXT / e-mail of me and ACCtomeek
2015-04-12 04:23:59 +02:00
KoffeinFlummi
fa00052c66 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-12 06:22:56 +02:00
KoffeinFlummi
59952441d8 Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge 2015-04-12 06:22:17 +02:00
KoffeinFlummi
362753209e Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-12 05:40:24 +02:00
KoffeinFlummi
c6efd4e546 Merge https://github.com/EpMAK/ACE3 into russian-merge 2015-04-12 05:39:46 +02:00