2728 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
jaynus	887e1d1d99	Remove optional laser visual.	2015-04-12 11:14:12 -07:00
jaynus	16cd05edc8	Merge branch 'network_lasers' of github.com:acemod/ACE3 into network_lasers	2015-04-12 11:01:27 -07:00
jaynus	01797fd3b9	Integarate laser code into SALH guidance + self_designate. Note todo items.	2015-04-12 11:01:22 -07:00
Nou	4a23b8be00	Allow string function names.	2015-04-12 10:52:50 -07:00
ulteq	40e013ed6d	Added SORD interface (Connection to the Vectronix Vector LRF)	2015-04-12 19:51:13 +02:00
ulteq	769ad60018	Added BlackPixxel to the list of contributors	2015-04-12 19:10:42 +02:00
commy2	10c32f264e	increase engagement ranges / burst mode on new mmg / full auto dmr	2015-04-12 18:21:28 +02:00
Anthariel	45f3300967	Update stringtable.xml ... Added: Missing french translation.	2015-04-12 18:20:32 +02:00
Anthariel	8d79fd242a	Update stringtable.xml ... Added: Some missing french translations. (I took 10 minutes to translate the banana description (-:)	2015-04-12 18:18:52 +02:00
Anthariel	3db8f4ad44	Update stringtable.xml ... Added: Some missing french translation.	2015-04-12 18:10:41 +02:00
Anthariel	3ee421a233	Update stringtable.xml ... Wrong french translation for the line 173.	2015-04-12 18:08:06 +02:00
Anthariel	3f84ac4817	Update stringtable.xml	2015-04-12 17:59:53 +02:00
Anthariel	3842272c43	Update stringtable.xml ... Fixing French & English translation error that I've made on the line : 780 and 781 (thanks KoffeinFlummi)	2015-04-12 17:55:53 +02:00
ulteq	6b44a3f3f9	Updated the module settings init script	2015-04-12 16:31:12 +02:00
ulteq	e003db2454	Fixed a typo	2015-04-12 16:27:24 +02:00
ulteq	e99fb398ae	Added simulation interval setting to the ab module	2015-04-12 16:25:01 +02:00
ulteq	8f2261acdd	Removed debug output	2015-04-12 16:19:39 +02:00
ulteq	ebb34a4f21	New default simulation interval of 0.05s	2015-04-12 16:19:32 +02:00
ulteq	aff9d7c554	Fixed a syntax error / Removed debug output	2015-04-12 16:17:49 +02:00
esteldunedain	d6ec8d771e	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-04-12 11:14:31 -03:00
esteldunedain	91df52056b	Only display "Surrender" action if the player is not holding a weapon.	2015-04-12 11:13:54 -03:00
ulteq	9f0a2c8b80	The terrain init script now aborts if no extension is found	2015-04-12 16:10:45 +02:00
esteldunedain	3ee18f9a3a	Readd CfgModuleCategories.hpp	2015-04-12 11:06:25 -03:00
KoffeinFlummi	390a777286	Merge branch 'patch-1' of https://github.com/Kllrt/ACE3 ... Conflicts: AUTHORS.txt	2015-04-12 15:55:17 +02:00
esteldunedain	e7f9245d7e	ACE_Main major cleanup	2015-04-12 10:54:18 -03:00
licht-im-Norden87	fef0d690f8	Update stringtable.xml	2015-04-12 15:25:18 +02:00
licht-im-Norden87	36ba507ab5	Update stringtable.xml	2015-04-12 14:52:37 +02:00
bux578	899f345a8f	Merge pull request #510 from ruPaladin/patch-3 ... Update AUTHORS.txt	2015-04-12 14:51:06 +02:00
bux578	9184ef479a	add disarm icon, add action psd, move icon files	2015-04-12 14:47:08 +02:00
Glowbal	019163c9ce	Merge pull request #489 from acemod/medicalPerformanceImprovements ... Medical performance improvements	2015-04-12 14:44:18 +02:00
KoffeinFlummi	d2fbd5c735	Fix groups	2015-04-12 14:42:49 +02:00
licht-im-Norden87	94eb4f3dd5	Update stringtable.xml	2015-04-12 14:42:15 +02:00
licht-im-Norden87	38955692ff	Update stringtable.xml	2015-04-12 14:40:04 +02:00
licht-im-Norden87	dbc7026d94	.....	2015-04-12 14:38:04 +02:00
ruPaladin	215f3059f3	Update AUTHORS.txt ... Russian translation	2015-04-12 15:33:24 +03:00
licht-im-Norden87	b144a42e63	Update stringtable.xml	2015-04-12 14:30:40 +02:00
KoffeinFlummi	8f2a1735ae	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-12 14:28:28 +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	a04abcf972	Update stringtable.xml	2015-04-12 14:25:41 +02:00
FreeZbe	45ff6c7ce9	French: (Nearly) Complete French translations ... Some entries (3 or 4) are still missing. I dont understand what you mean / what the input is related to.	2015-04-12 14:15:45 +02:00
licht-im-Norden87	400b8f4270	Update stringtable.xml	2015-04-12 14:14:48 +02:00
licht-im-Norden87	8f88158a2e	Update stringtable.xml	2015-04-12 14:13:38 +02:00
licht-im-Norden87	88a71042e3	Update stringtable.xml	2015-04-12 14:12:05 +02:00
licht-im-Norden87	a3f97efbc3	Update stringtable.xml ... What does WDG and MGRS mean?	2015-04-12 14:07:49 +02:00
Nicolás Badano	f18f807e60	Merge pull request #507 from Legolasindar/master ... Merge pull request #1 from acemod/master	2015-04-12 09:06:30 -03:00
licht-im-Norden87	e4ec9d14d4	Update stringtable.xml	2015-04-12 14:00:56 +02:00
licht-im-Norden87	15e9b2cccc	Update stringtable.xml	2015-04-12 13:59:09 +02:00
Legolasindar	b665781399	Update stringtable.xml ... updated spanish translation and added some english missed translation	2015-04-12 13:58:06 +02:00
licht-im-Norden87	6b39edbddf	Update stringtable.xml	2015-04-12 13:58:02 +02:00
commy2	56de4f05f3	scripts for vector illum, renaming some files	2015-04-12 13:56:01 +02:00