jaynus
83b453a294
Merge pull request #379 from acemod/allTheMissiles
...
Merging for current builds needing at least better guidance and fixed locking modes. Also allowing for mod-makers to see and utilize the new locking framework.
2015-04-10 12:48:10 -07:00
jaynus
8429b262f2
more debug removal, backup vanilla usage.
2015-04-10 12:40:58 -07:00
PabstMirror
661ddc3562
#441 - Crash with no model on ace_fakeweapon
2015-04-10 14:35:08 -05:00
esteldunedain
8715a9c4a1
Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3
...
Conflicts:
addons/medical/stringtable.xml
2015-04-10 16:25:07 -03: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
jaynus
5577a541ca
Add example.
2015-04-10 12:19:02 -07:00
jaynus
0225cb510c
Add missile strings.
2015-04-10 12:16:18 -07:00
jaynus
391b1556cb
Disable all debug.
2015-04-10 12:12:25 -07:00
jaynus
bcb7d18e7e
remove debug.
2015-04-10 11:57:50 -07:00
Legolasindar
58d13237f8
Update stringtable.xml
...
fixed "comprobar" in spanish translation
2015-04-10 20:56:58 +02:00
jaynus
c28ac5b4a9
Compensate for target velocity.
2015-04-10 11:40:18 -07:00
jaynus
5083a5a0d2
Javelin locking fire modes were reversed.
2015-04-10 11:37:03 -07: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
commy2
f60bf87df0
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-10 19:57:13 +02:00
commy2
1ae92f9387
add documentation to eventhandler system
2015-04-10 19:56:56 +02:00
PabstMirror
97e277d710
#448 - Adjust Nightvision in vehicles
2015-04-10 12:55:42 -05:00
jaynus
c428bf051f
placeholder model for hellfire, optics refreshing on titan
2015-04-10 10:42:02 -07:00
commy2
ec29cdd731
remove forgotten debug item, .MD for optics, fix #439
2015-04-10 19:34:44 +02:00
commy2
d13343e8c4
Merge pull request #440 from acemod/hideitem
...
rewrite assigned item fix, fix #425
2015-04-10 19:19:39 +02:00
jaynus
2fe55b3117
Attack profile buildout.
2015-04-10 10:14:30 -07: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
fa9923c027
Update AUTHORS.txt
...
added my email
2015-04-10 16:15:53 +02:00
bux578
4f5e63de72
Change instruction
2015-04-10 15:43:33 +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
bux578
ccc326b81f
missing )
2015-04-10 10:00:06 +02:00
Jo David
2498115cff
add short translation writeup
...
shamelessly promoting tabler ;)
2015-04-10 09:57:02 +02:00
bux578
e4381d791c
Merge pull request #370 from acemod/translations
...
translations
2015-04-10 09:06:30 +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
8dcfbff920
Merge pull request #423 from acemod/comancheRoll
...
<3 @KoffeinFlummi
2015-04-09 23:31:45 -07: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
