Commit Graph

85 Commits

Author SHA1 Message Date
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