Jo David
c258c6c00d
fixing translation
2015-04-10 09:05:37 +02:00
Jo David
33a14076fc
Merge branch 'master' of https://github.com/acemod/ACE3 into translations
...
Conflicts:
addons/captives/stringtable.xml
addons/medical/stringtable.xml
2015-04-10 09:01:24 +02:00
jaynus
6286d59bd9
Remove NVG from gunner optics on comanche.
2015-04-09 23:29:37 -07:00
jaynus
9e7d4c25bb
Removes old value of stabalizing which broke gunner. Fixes #412
2015-04-09 23:28:41 -07:00
commy2
d5f190dff8
fix: getGunner returns null object when throwing grenades, planting explosives
2015-04-10 06:47:31 +02:00
commy2
105184ce88
fix: getGunner returns null object if pilot uses manual fire if no gunner is present
2015-04-10 06:36:09 +02:00
PabstMirror
26d282c224
Explosives: Fix cursor interaction menu breaking
2015-04-09 22:46:19 -05:00
Nicolás Badano
357fd1969b
Merge pull request #406 from Legolasindar/patch-4
...
Spanish: Update stringtable.xml
2015-04-09 21:24:19 -03:00
Nicolás Badano
7e6e0d0ecd
Merge pull request #402 from Legolasindar/patch-2
...
Update stringtable.xml
2015-04-09 21:24:00 -03:00
Legolasindar
ed87e53c80
Update stringtable.xml
...
Updated spanish terms.
2015-04-10 00:48:51 +02:00
PabstMirror
c511431e61
Fix encoding problem
...
Not sure why, but it was decoding the \a's: Warning:
z\ace\addons\main\config.cpp Line 556: ['MAIN',_this] execVM
'\zceddons\mainbout.sqf';-NOGIT
2015-04-09 17:17:33 -05:00
Legolasindar
1dcbebc04c
Update stringtable.xml
...
Updated spanish terms
2015-04-10 00:10:47 +02:00
Felix Wiegand
309eb7b3bf
Merge pull request #399 from licht-im-Norden87/patch-1
...
Stringtable: German additions
2015-04-10 00:06:43 +02:00
Legolasindar
7b4d62c46c
Update stringtable.xml
...
Fixed spanish terms
2015-04-10 00:05:47 +02:00
licht-im-Norden87
2c7df9da6a
Stringtable: German additions
2015-04-09 23:02:28 +02:00
Glowbal
84c8e02328
Merge pull request #396 from KoffeinFlummi/medicalCleanup
...
Medical cleanup
2015-04-09 22:13:31 +02:00
PabstMirror
253614d442
Explosives: cancel placement when opening interact
...
"zoomtemp" doesn't work for me, so this gives an additional way to
cancel. It was also possible to start planting multiple explosives.
made a small change to make QGVAR(PlantingExplosive) always reset
2015-04-09 14:48:27 -05:00
Glowbal
d94943a9ff
getting hitpoint damage on non existing hitpoint returns type instead of bool
2015-04-09 21:38:35 +02:00
Glowbal
093d340ee7
Changed: Dragging/carrying now works for units with broken legs
...
Added unload and load of unconscious units
2015-04-09 21:23:10 +02:00
Glowbal
0926397ab4
Removed deadcode and obvious comments
2015-04-09 20:13:46 +02:00
Glowbal
39cbf21278
Removed deprecated carry functions
2015-04-09 20:12:30 +02:00
commy2
2d265ec6c2
prevent ai fro being stuck, #290
2015-04-09 16:54:50 +02:00
commy2
b41c6280ba
prvent falling ai from being stcuk, fix #290
2015-04-09 16:52:59 +02:00
commy2
147fcdfa0c
Merge pull request #392 from KoffeinFlummi/requiredaddons
...
sorting out required addons for modularity
2015-04-09 16:37:47 +02:00
esteldunedain
f0cc0941e5
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-09 10:05:38 -03:00
esteldunedain
8519bb04b7
Merge remote-tracking branch 'origin/removeRecoil'
...
Conflicts:
addons/recoil/config.cpp
2015-04-09 10:05:14 -03:00
Nicolás Badano
c57044fd4a
Merge pull request #390 from KoffeinFlummi/betterMapColors
...
Improve map colors by taking them from A2
2015-04-09 09:52:06 -03:00
esteldunedain
6447b39d1a
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
...
Conflicts:
addons/scopes/XEH_postInit.sqf
2015-04-09 09:32:58 -03:00
esteldunedain
34639c153c
Allow holding scope adjustment keys
2015-04-09 09:31:18 -03:00
KoffeinFlummi
3a871eed58
Merge branch 'master' into tools-cleanup
2015-04-09 13:37:19 +02:00
commy2
5ea35a01bb
sorting out required addons for modularity
2015-04-09 13:23:29 +02:00
esteldunedain
99aa439561
Improve map colors taking them from A2
2015-04-09 01:28:36 -03:00
PabstMirror
2033676e81
another undef to Make PBO-Project Happy
2015-04-08 18:20:00 -05:00
commy2
3e3390750d
manual merge
2015-04-08 22:01:41 +02:00
commy2
c5b38c8942
manual merge
2015-04-08 21:51:42 +02:00
commy2
1ae69d56ff
Merge pull request #377 from KoffeinFlummi/142light
...
142 directional light for map effects
2015-04-08 21:46:48 +02:00
commy2
7346c194f4
Merge pull request #306 from KoffeinFlummi/optics
...
Taosenai's Animated Optics req 1.42
2015-04-08 21:41:12 +02:00
PabstMirror
c3564ee883
undef to Make PBO-Project Happy
2015-04-08 14:38:29 -05:00
Glowbal
3702679ee4
fixed wrong value for radio disabled on waking up
2015-04-08 21:31:59 +02:00
PabstMirror
a4af1fcb30
Fix Marker Placement on UAV Map
2015-04-08 13:55:29 -05:00
commy2
3de3432664
Merge pull request #271 from KoffeinFlummi/142resting
...
1.42 - Remove scripted weapon resting
2015-04-08 20:26:13 +02:00
PabstMirror
2bc0976979
Merge pull request #277 from KoffeinFlummi/revert-276-revert-272-142menudeploy
...
Revert "Revert "1.42 - cursor mode when bipod deployed""
2015-04-08 13:26:05 -05:00
PabstMirror
023a2d2202
Merge pull request #267 from KoffeinFlummi/142Markers
...
1.42 Marker Placement
2015-04-08 13:24:55 -05:00
PabstMirror
176a39e86c
Merge pull request #265 from KoffeinFlummi/142InventoryConfig
...
1.42 Inventory Config
2015-04-08 13:22:12 -05:00
PabstMirror
007e4fc234
Merge pull request #274 from KoffeinFlummi/142requiredaddons
...
1.42 ensure ace is loaded after marksmen configs
2015-04-08 13:21:33 -05:00
PabstMirror
af3d6a5113
#386 - Ace Options Menu on main menu
...
Same limitations as CBA controls, needs a intro or mission loaded
Doesn't work with -skipintro command line.
2015-04-08 10:33:12 -05:00
commy2
01a9374a26
Merge pull request #382 from KoffeinFlummi/disablebs
...
disable cursor showing map position
2015-04-08 10:48:31 +02:00
commy2
deece11689
remove debug
2015-04-08 10:47:56 +02:00
commy2
a47cdb9738
disable map cursor coordinates in mp
2015-04-08 10:45:57 +02:00
esteldunedain
b18bcf8835
Add option to turn on/off cursor coordinates
2015-04-08 01:49:56 -03:00
