Commit Graph

101 Commits

Author SHA1 Message Date
bux578
28a8fbc4fe fix vector name
it's the vector 21 not the vector IV
2015-04-26 15:36:47 +02:00
commy2
bd168981e2 how do I merge 2015-04-13 19:23:42 +02:00
Grzegorz Sikora
ac886828b0 Fixes 2015-04-13 18:02:48 +02:00
PabstMirror
36b92b3d44 Don't do client stuff on dedicated. 2015-04-12 22:44:19 -05: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
commy2
56de4f05f3 scripts for vector illum, renaming some files 2015-04-12 13:56:01 +02:00
commy2
83e634be8a illuminate vector number textures at night 2015-04-12 12:54:36 +02:00
commy2
f16d5398f4 enable vector on ffv positions, fix #506 2015-04-12 12:03:49 +02:00
Kllrt
38adfbcb70 Added missing CZ strings and made little revision 2015-04-11 16:33:00 +02:00
commy2
2e66e57535 manual merge 2015-04-07 23:08:17 +02:00
commy2
1e497c228c switch sides of add/drop left/right 2015-04-06 16:18:59 +02:00
commy2
ebd1e555a3 fix: derp when switching control numbers 2015-04-06 16:07:52 +02:00
VKing
8255ff666d Fix long-standing typo (get it?) 2015-04-05 22:18:28 +02:00
VKing
8ad202b039 Fix Fall-of-Shot units being inverted 2015-04-05 22:16:47 +02:00
commy2
b0575bad21 improve infoDisplayChanged EH 2015-04-03 17:50:52 +02:00
PabstMirror
14d6db4596 Merge pull request #183 from KoffeinFlummi/microDAGR
MicroDAGR
2015-03-23 13:24:37 -05:00
PabstMirror
7e383dc10e #198 canInteractWith EGVAR -> EFUNC 2015-03-20 17:55:39 -05:00
PabstMirror
7688384971 Merge branch 'master' into microDAGR 2015-03-18 13:46:57 -05:00
commy2
31db62a85d manual merge 2015-03-18 17:53:26 +01:00
commy2
b5f307919e replace canInteract with canInteractWith 2015-03-15 13:00:10 +01:00
commy2
1e731ee425 fix vector cfg patches 2015-03-13 18:34:13 +01:00
PabstMirror
da87425df3 Vector intergration (Hold Tab+R) 2015-03-12 12:57:44 -05:00
PabstMirror
f387da1475 Working Base MicroDAGR 2015-03-09 10:46:59 -05:00
PabstMirror
5d21cd6cc7 Fix Vector/FCS debounce 2015-03-05 02:46:24 -06:00
PabstMirror
e18cbbfaad Vector Keys 2015-03-05 02:00:56 -06:00
Nicolás Badano
d743006566 make vector keybinds return false so they don't block fcs keyup EH 2015-02-15 18:38:08 -03:00
commy2
3f8f08cc8b no holding key with fcs 2015-02-11 14:51:21 +01:00
PabstMirror
9631154926 Set ADDON variable in XEH_preInit 2015-01-29 01:38:46 -06:00
KoffeinFlummi
c407553d49 Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
commy2
770a151bf5 CBA keybinding for vector 2015-01-21 23:49:16 +01:00
commy2
1737e3e7fa vector config, DONE 2015-01-21 23:05:19 +01:00
commy2
efb761a14c vector settings 2015-01-21 22:52:39 +01:00
commy2
2c4c1d7db2 add config, settings to vector 2015-01-21 21:15:51 +01:00
commy2
9d687b9b3e vector: fix potential error in FOS, prep settings, config 2015-01-20 18:26:31 +01:00
commy2
8c8e14b0ca port kestrel 2015-01-19 21:13:56 +01:00
VKing
99a31f8ae8 Zoom level adjustment. Ref #58 2015-01-18 16:03:34 +01:00
commy2
fa2acfbb50 vector FOS mode 2015-01-17 22:49:06 +01:00
commy2
6658eafe3d vector object height, length mode 2015-01-17 19:25:12 +01:00
commy2
addc7feb40 vector, relative slope distance and relative azimuth + distance modes, spaghetti 2015-01-16 01:48:43 +01:00
commy2
7785a9df75 changing macros, irl vector guide 2015-01-15 22:32:45 +01:00
commy2
2eb547a52e some advanced vector modes, macros 2015-01-15 19:01:27 +01:00
commy2
530e93414a vector height + distance mode 2015-01-15 17:24:19 +01:00
commy2
3e9785e145 vector azimuth+inclination mode 2015-01-15 16:40:06 +01:00
commy2
79426252a1 vector distance + azmimuth mode 2015-01-15 16:21:47 +01:00
commy2
bc43ee5136 get the vector to work, wip 2015-01-15 07:18:57 +01:00
KoffeinFlummi
66b33590d5 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-01-14 21:07:08 +01:00
KoffeinFlummi
5c5c49519a Fix vector texture paths; Fix #21 2015-01-14 21:06:45 +01:00
commy2
3bf0b772bb Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-01-14 20:39:18 +01:00
commy2
ddbc54b992 add getVariable, setVariable macros 2015-01-14 20:38:59 +01:00
PabstMirror
614dced0fa DEBUG_SETTINGS in script comps 2015-01-14 12:34:24 -06:00
commy2
5636721717 try to port that vector 2015-01-14 07:24:17 +01:00