Commit Graph

107 Commits

Author SHA1 Message Date
commy2
2e48a92eef fix ai seemingly reloading disposable launcher at mission start, fix #2508 2015-09-18 22:25:09 +02:00
KoffeinFlummi
83aa2cc68c Merge branch 'release' into french 2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be Update French translations 2015-09-10 19:14:51 +02:00
jonpas
de033f0ff2 README.md files added to all modules 2015-08-19 04:18:33 +02:00
PabstMirror
4377bbeb75 Delete unused file 2015-08-10 15:26:44 -05:00
PabstMirror
512011a756 Remove Debug Code 2015-08-10 15:16:16 -05:00
PabstMirror
47b18b2b39 Cleanup disposables also fix #2090 (alt add for AI) 2015-08-10 15:12:42 -05:00
Glowbal
e5eaefafdb fixed #2097 - script error because of global variable in params 2015-08-10 09:51:14 +02:00
PabstMirror
dc06927418 missing ; 2015-08-09 13:57:39 -05:00
jokoho48
fab0eee5dd corrected some small point 2015-08-09 15:28:11 +02:00
jokoho48
b23f9c0de2 Code cleanup of Disposable module 2015-08-09 05:25:19 +02:00
jonpas
0b0f7274d7 Applied ESTRING and ECSTRING macros 2015-05-27 22:04:41 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
Kavinsky
8e9b35c757 Fixed Capitalized folders on include paths 2015-05-20 23:28:10 +02:00
KoffeinFlummi
2bb3a0f139 Cleanup #1095
- Fix tabs
- Remove tabler comments
- Restore one removed Russian string
2015-05-10 16:19:46 +02:00
Alessandro Foresi
643df71932 Added: Italian translation from Blackedsoul p#20 2015-05-10 11:05:16 +02:00
ToasterBR
021b00c722 Translation to Portuguese
Done all remaining portuguese translations, including some minor
corrections
2015-05-02 03:38:53 -03:00
KoffeinFlummi
1e786d4a92 Merge https://github.com/FreeZbe/ACE3 into french-merge
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
2015-05-01 17:45:00 +02:00
KoffeinFlummi
761e23001f Merge https://github.com/Dimaslg/ACE3 into spanish-merge
Conflicts:
	addons/medical/stringtable.xml
	addons/missileguidance/stringtable.xml
	addons/optionsmenu/stringtable.xml
2015-05-01 16:51:20 +02:00
FreeZbe
7a397459ae Update stringtable.xml 2015-05-01 14:13:08 +02:00
KoffeinFlummi
a1e709047e Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge
Conflicts:
	AUTHORS.txt
	addons/aircraft/stringtable.xml
	addons/attach/stringtable.xml
	addons/captives/stringtable.xml
	addons/common/stringtable.xml
	addons/disposable/stringtable.xml
	addons/dragging/stringtable.xml
	addons/explosives/stringtable.xml
	addons/fcs/stringtable.xml
	addons/frag/stringtable.xml
	addons/grenades/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/markers/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/movement/stringtable.xml
	addons/nametags/stringtable.xml
	addons/nightvision/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/parachute/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/reload/stringtable.xml
	addons/reloadlaunchers/stringtable.xml
	addons/respawn/stringtable.xml
	addons/safemode/stringtable.xml
	addons/switchunits/stringtable.xml
	addons/vehiclelock/stringtable.xml
	addons/weaponselect/stringtable.xml
	addons/wep_javelin/stringtable.xml
	addons/winddeflection/stringtable.xml
2015-04-29 12:52:55 +02:00
VyMajoris
523cb49ff1 Added - Portuguese translation to lots of things.
Also fixed a typo the english key for STR_ACE_microdagr_configure.
2015-04-26 03:09:16 -03:00
Dimaslg
274663e1b9 Spanish Translation
Minor fixes and spelling mistakes.
2015-04-25 18:53:45 +02:00
KoffeinFlummi
65fd6b0937 Merge https://github.com/EpMAK/ACE3 into russian-merge
Conflicts:
	addons/ballistics/stringtable.xml
	addons/medical/stringtable.xml
	addons/nametags/stringtable.xml
	addons/respawn/stringtable.xml
2015-04-19 01:04:32 +02:00
Tachii
711be038fc Update stringtable.xml 2015-04-18 03:09:51 +03:00
Tachii
0bb3238db1 Update stringtable.xml 2015-04-18 02:09:59 +03:00
commy2
0e90199e23 remove debug message 2015-04-17 20:29:01 +02:00
EpMAK
c88bda487b Merge remote-tracking branch 'upstream/master'
Conflicts:
	addons/weaponselect/stringtable.xml
2015-04-17 19:48:01 +03:00
commy2
45d639b395 disposable cleanup, fix #696 2015-04-17 12:28:06 +02:00
PabstMirror
638433614c Some missing private defines. 2015-04-16 12:36:16 -05:00
KoffeinFlummi
1b67b2df26 Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge
Conflicts:
	addons/disposable/stringtable.xml
	addons/explosives/stringtable.xml
	addons/fcs/stringtable.xml
	addons/frag/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/javelin/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/maptools/stringtable.xml
	addons/markers/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/movement/stringtable.xml
2015-04-15 22:20:47 +02:00
KoffeinFlummi
2ffbccbf20 Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-04-15 12:59:56 +02:00
Marco
c9e452a000 Update stringtable.xml
Italian
2015-04-15 10:48:52 +02:00
Harakhti
3c3f6ba4c3 Translation: A to I
Some parts filled out, other parts corrected or stylized.
2015-04-13 19:28:58 +02:00
KoffeinFlummi
f6c7d444e1 Merge https://github.com/Anthariel/ACE3 into french-merge 2015-04-13 13:31:48 +02:00
KoffeinFlummi
118b5509ea Merge https://github.com/gienkov/ACE3 into polish-merge 2015-04-13 13:00:59 +02:00
Anthariel
e176df4636 Update stringtable.xml 2015-04-13 02:10:23 +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
licht-im-Norden87
bd673d3374 Update stringtable.xml 2015-04-12 03:28:12 +02:00
Kllrt
38adfbcb70 Added missing CZ strings and made little revision 2015-04-11 16:33:00 +02:00
Grzegorz
dcc07c84bc disposable PL translation 2015-04-10 03:43:34 +02:00
VyMajoris
0dbb4579c4 Added - Portuguese translation Disposable 2015-04-09 22:25:37 -03:00
licht-im-Norden87
ecf5eef638 Update stringtable.xml 2015-04-09 23:36:21 +02:00
jaynus
1bb6be5654 Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
PabstMirror
0e6f76b50b Cannot drop attachements because of duplication 2015-03-21 10:35:21 -05:00
PabstMirror
ad12904ca4 minor formating 2015-03-19 20:37:36 -05:00
PabstMirror
0c88b92eba Condense AI func, and drop attachements 2015-03-19 20:24:14 -05:00
PabstMirror
9935ac57bd Base Cleanup
Headers
Formating
Small optimizations
2015-02-19 19:32:41 -06:00
PabstMirror
9631154926 Set ADDON variable in XEH_preInit 2015-01-29 01:38:46 -06:00
Felix Wiegand
6037f8e05b Create README.md 2015-01-26 13:40:31 +01:00
PabstMirror
6e8c394903 Standardize Config Version Stuff 2015-01-18 01:32:07 -06:00
commy2
cd533abd6f inventoryDisplayLoaded eh 2015-01-16 23:48:30 +01:00
PabstMirror
c550d5dab6 remove debug and add sanity checks 2015-01-13 19:38:00 -06:00
PabstMirror
de51a61180 convert spawn to perFrame 2015-01-13 19:30:25 -06:00
PabstMirror
78d9ce6d7d needs testing 2015-01-13 16:53:48 -06:00
PabstMirror
1648def53f first pass 2015-01-13 13:12:37 -06:00
PabstMirror
629c0f92db Base Port 2015-01-13 12:32:05 -06:00