PabstMirror
|
661ddc3562
|
#441 - Crash with no model on ace_fakeweapon
|
2015-04-10 14:35:08 -05:00 |
|
esteldunedain
|
ee8af7f153
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2015-04-10 16:21:27 -03:00 |
|
esteldunedain
|
d6e70cfe6b
|
Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3
Conflicts:
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/frag/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/medical/stringtable.xml
|
2015-04-10 16:20:18 -03:00 |
|
PabstMirror
|
db5861da52
|
#428 - GJ Git
|
2015-04-10 13:05:39 -05:00 |
|
PabstMirror
|
33570c94e4
|
#428 - Only work on locked vehicles.
|
2015-04-10 13:05:39 -05:00 |
|
PabstMirror
|
97e277d710
|
#448 - Adjust Nightvision in vehicles
|
2015-04-10 12:55:42 -05:00 |
|
commy2
|
ec29cdd731
|
remove forgotten debug item, .MD for optics, fix #439
|
2015-04-10 19:34:44 +02:00 |
|
commy2
|
5d097c4dd9
|
add comment explaining why isNumber is used
|
2015-04-10 19:11:51 +02:00 |
|
commy2
|
c03ee8e9c6
|
lowercase gps
|
2015-04-10 18:34:26 +02:00 |
|
commy2
|
dc49f2c71e
|
rewrite assigned item fix
|
2015-04-10 18:31:43 +02:00 |
|
commy2
|
5ff1d9863d
|
remove +2 offset for check temperature, also fix the shade of grey, #431
|
2015-04-10 17:48:21 +02:00 |
|
commy2
|
fc98e78a53
|
hide check temperature action when empty weapon is selected, #431
|
2015-04-10 17:36:58 +02:00 |
|
Legolasindar
|
c7d3618d79
|
Update stringtable.xml
fix spanish term
|
2015-04-10 13:43:39 +02:00 |
|
Legolasindar
|
a224ec3371
|
Update stringtable.xml
added spanish translation
|
2015-04-10 13:43:07 +02:00 |
|
Legolasindar
|
f2a73ab9c6
|
Update stringtable.xml
added some spanish translation
|
2015-04-10 13:41:44 +02:00 |
|
Legolasindar
|
19da5b366e
|
Update stringtable.xml
added spanish translation
|
2015-04-10 13:38:19 +02:00 |
|
Legolasindar
|
c741154ff2
|
Update stringtable.xml
added spanish translation
|
2015-04-10 13:36:17 +02:00 |
|
Legolasindar
|
6f69361a73
|
Update stringtable.xml
added spanish translation
|
2015-04-10 13:34:16 +02:00 |
|
Legolasindar
|
470a12ed46
|
Update stringtable.xml
added spanish translation
|
2015-04-10 13:19:26 +02:00 |
|
Legolasindar
|
a73c37ce05
|
Update stringtable.xml
added spanish translation
|
2015-04-10 13:14:33 +02:00 |
|
Legolasindar
|
e0fc44cfa8
|
Update stringtable.xml
Added spanishtr translation
|
2015-04-10 13:04:08 +02:00 |
|
Legolasindar
|
cf769e09fb
|
Update stringtable.xml
Add spanish translation
|
2015-04-10 12:46:31 +02:00 |
|
Legolasindar
|
52d476abd3
|
Update stringtable.xml
Added spanisth translation, and two lines of english translation
|
2015-04-10 12:29:44 +02:00 |
|
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
|
2a5e416dfc
|
Update stringtable.xml
fixed spanish terms
|
2015-04-10 01:40:22 +02:00 |
|
Legolasindar
|
e63b9c7aa9
|
Update stringtable.xml
added spanish translation
|
2015-04-10 01:38:31 +02:00 |
|
Legolasindar
|
2456660867
|
Update stringtable.xml
|
2015-04-10 01:36:42 +02:00 |
|
Legolasindar
|
5a849fe8a4
|
Update stringtable.xml
added spanish translation
|
2015-04-10 01:33:08 +02:00 |
|
Legolasindar
|
2542f994d6
|
Update stringtable.xml
added spanish translation
|
2015-04-10 01:29:52 +02:00 |
|
Legolasindar
|
5f5ce47bec
|
Update stringtable.xml
fixed one term in spanish
|
2015-04-10 01:26:06 +02:00 |
|
Legolasindar
|
65b3566d41
|
Update stringtable.xml
fixed spanish terms.
|
2015-04-10 01:24:37 +02:00 |
|
Legolasindar
|
b8b151e62e
|
Update stringtable.xml
added spanish terms
|
2015-04-10 01:20:39 +02:00 |
|
Legolasindar
|
df31442599
|
Update stringtable.xml
added spanish terms
|
2015-04-10 01:13:33 +02:00 |
|
Legolasindar
|
dc44b73a36
|
Update stringtable.xml
updated spanish terms
|
2015-04-10 01:12:31 +02:00 |
|
Legolasindar
|
ed87e53c80
|
Update stringtable.xml
Updated spanish terms.
|
2015-04-10 00:48:51 +02:00 |
|
Legolasindar
|
cef9a6454a
|
Update stringtable.xml
Updated spanish terms, on moved english to first raws.
|
2015-04-10 00:38:24 +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 |
|