PabstMirror
|
7719da2f66
|
Javelin Localiztion
|
2015-04-12 22:45:55 -05:00 |
|
PabstMirror
|
36b92b3d44
|
Don't do client stuff on dedicated.
|
2015-04-12 22:44:19 -05:00 |
|
Nou
|
8df26b3246
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-04-12 17:03:16 -07:00 |
|
Nou
|
98acdc4089
|
M22 binocular mil reticle ported from ACE2.
|
2015-04-12 17:03:11 -07:00 |
|
jaynus
|
0c3caffe89
|
Merge pull request #501 from acemod/network_lasers
Break all the lasers. Continuing expansion work is in #535
|
2015-04-12 16:47:24 -07:00 |
|
jaynus
|
fd4cb50d3d
|
Remove thermal, prep for coding.
|
2015-04-12 16:44:39 -07:00 |
|
jaynus
|
db5d54dffd
|
Only allow for laser designator for vanilla compensation.
|
2015-04-12 16:38:43 -07:00 |
|
PabstMirror
|
74967910a3
|
opps
|
2015-04-12 18:27:55 -05:00 |
|
PabstMirror
|
d50bff866b
|
addToInventory use addMagazineArray -maybe fix #530
|
2015-04-12 18:27:25 -05:00 |
|
jaynus
|
9a25fb4f2f
|
Remove debug.
|
2015-04-12 16:19:18 -07:00 |
|
jaynus
|
9ffcd092f3
|
Merge branch 'master' of github.com:acemod/ACE3
|
2015-04-12 16:18:53 -07:00 |
|
jaynus
|
4bd489cd96
|
Fixed: Javelin CLU UI should have been a PFH not a draw. Migrated. Closes #531
|
2015-04-12 16:18:39 -07:00 |
|
ViperMaul
|
9e6d263806
|
Allowing automatic resume on error when one module fails to build.
|
2015-04-12 15:40:57 -07:00 |
|
PabstMirror
|
807ebd8bfe
|
Resave reticle_titan in objectBuilder
|
2015-04-12 17:14:30 -05:00 |
|
esteldunedain
|
6e9f128f3b
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2015-04-12 18:25:04 -03:00 |
|
esteldunedain
|
7343805a6c
|
Added issue regarding mouse events handlers on displays
|
2015-04-12 18:24:41 -03:00 |
|
jaynus
|
509b5e1a05
|
Integration of lasers for vanilla laser designation as well. Remove debug.
|
2015-04-12 14:12:21 -07:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|