3410 Commits

Author	SHA1	Message	Date
NukeDev	1d434949de	Some Italian Translation's Changes	2015-04-28 17:46:35 +02:00
ulteq	dc09c554c0	Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master ... Conflicts: addons/medical/stringtable.xml addons/mk6mortar/stringtable.xml	2015-04-28 17:44:58 +02:00
ulteq	2e8070facb	Merge pull request #886 from simon84/german-translations ... German translations	2015-04-28 16:54:39 +02:00
PabstMirror	f8b8d7dd16	Set Lock on postInit so spawned vehicles are set	2015-04-28 00:08:28 -05:00
simon84	8ac6f61fcf	added some translations ... added some translations	2015-04-28 00:36:37 +02:00
ulteq	79a5077941	Merge pull request #878 from Brisse89/patch-1 ... Less fictional weapon names	2015-04-28 00:02:55 +02:00
PabstMirror	7e0fa18ce7	#770 - Hopefully fix LOS check on flashbang	2015-04-27 16:07:31 -05:00
ulteq	416a914253	More vector math replacements	2015-04-27 22:14:08 +02:00
ulteq	0d6d96e76c	Cleanup++: ... * Added missing privates * Removed unused privates * Replaced some old vector calculations with new vector commands	2015-04-27 22:04:35 +02:00
ruPaladin	59aba3fb34	Update stringtable.xml	2015-04-27 19:33:22 +03:00
ulteq	fa6a2566e3	Fixed a syntax error	2015-04-27 17:48:06 +02:00
Glowbal	450e324f7b	adjusted damage handling (adv medical)	2015-04-27 16:42:12 +02:00
Glowbal	e4db44d73c	adjusted damage parsing	2015-04-27 16:36:00 +02:00
Josuan Albin	e8dec708bc	Some french entries and a german duplicate ... Added some french entries and removed a german duplicate	2015-04-27 16:18:28 +02:00
Glowbal	b520a1072b	Merge branch 'master' into medicalImprovements	2015-04-27 15:41:20 +02:00
Brisse89	26bd75084d	Update stringtable.xml ... Khaybar -> Sama	2015-04-27 14:56:57 +02:00
ulteq	3c92cab7af	Reverted the addBlackList function	2015-04-27 14:02:59 +02:00
ulteq	f54f0cd1fa	Renamed init functions	2015-04-27 13:58:18 +02:00
Brisse89	4ebdd88369	Less fictional weapon names ... ACP-C2 -> Custom Covert II KT2002 Katiba -> KH2002 Khaybar	2015-04-27 13:55:50 +02:00
ulteq	1b5756d33c	Added weather update interval module setting	2015-04-27 12:47:26 +02:00
ulteq	79ff3146b5	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-27 12:40:28 +02:00
ulteq	04d3a31b5b	Fixed a typo	2015-04-27 12:34:21 +02:00
ulteq	3c91f6abe3	Added ace/module settings for ace_weather: ... *enableServerController // weather propagation on the server *useACEWeather // disable ace weather *syncRain *syncWind *syncMisc	2015-04-27 12:28:56 +02:00
ulteq	135157419e	Merge pull request #876 from Brisse89/patch-2 ... Realistic weapon names: Update stringtable.xml	2015-04-27 12:20:43 +02:00
Brisse89	ecaa23ada2	Update stringtable.xml ... Removed the space in HK121	2015-04-27 12:17:36 +02:00
Brisse89	faa17d0e56	Update stringtable.xml ... Noreen Bad News -> Noreen "Bad News" ULR	2015-04-27 12:13:09 +02:00
Brisse89	3339759321	Update stringtable.xml ... Is this better? SIG 762 -> SIG 556 HK 122 -> HK 121	2015-04-27 11:58:39 +02:00
ulteq	579936c781	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into fragCleanup	2015-04-27 11:22:49 +02:00
ulteq	b0876ca394	Enables: d64783fca1	2015-04-27 11:06:16 +02:00
ulteq	d6f757e096	Enabled scope adjustments for the Khalia (old) optic	2015-04-27 11:04:12 +02:00
Brisse89	db553644aa	Update stringtable.xml ... Is this okay? MAR-10 -> Noreen Bad news EMR-1 -> SIG 762 Navid -> HK 122	2015-04-27 10:24:42 +02:00
commy2	d64783fca1	remove the calibers from the weapon names	2015-04-27 02:40:04 +02:00
ulteq	1fc044dfa9	Cleanup++: ... *Moved GVAR(enabled) into ACE_Settings.hpp *Replaced BIS_fnc_magnitude with vectorMagnitude *Renamed Nou_GBU12 *Added G_40mm_HE config data	2015-04-26 23:14:54 +02:00
ulteq	6170ef0d50	Code cleanup	2015-04-26 23:05:58 +02:00
Grzegorz	3b9019e363	Update stringtable.xml	2015-04-26 23:01:42 +02:00
Grzegorz	3d5f7b1bf0	Update stringtable.xml	2015-04-26 23:01:31 +02:00
Grzegorz	78329110a1	Update stringtable.xml	2015-04-26 23:01:18 +02:00
Grzegorz	5add444026	Update stringtable.xml	2015-04-26 23:01:10 +02:00
Grzegorz	cfd9c6b3e9	Update stringtable.xml	2015-04-26 23:01:02 +02:00
Grzegorz Sikora	a272258500	PL translation	2015-04-26 22:59:20 +02:00
ulteq	3e5462f3d4	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-26 22:50:54 +02:00
ulteq	af2dc62705	Improved a module setting description	2015-04-26 22:44:18 +02:00
Grzegorz Sikora	0f47d8bfb2	PL translation	2015-04-26 22:33:25 +02:00
ulteq	9bd32f5797	Fixed an incorrect module setting description	2015-04-26 22:33:11 +02:00
KoffeinFlummi	365f1e025b	Merge remote-tracking branch 'origin/GermanMedicalTranslation' into german-merge ... Conflicts: addons/medical/stringtable.xml	2015-04-26 22:04:39 +02:00
commy2	aabe532829	manual merge	2015-04-26 21:26:57 +02:00
KoffeinFlummi	b472292b20	Remove tabler comments. ... sed is awesome.	2015-04-26 21:05:41 +02:00
KoffeinFlummi	1bb8628109	Merge https://github.com/simon84/ACE3 into german-merge	2015-04-26 21:00:22 +02:00
commy2	ac51d45f11	Merge pull request #848 from acemod/recoiltweaks ... tweaking recoil	2015-04-26 20:59:27 +02:00
commy2	f5d7331847	no team management on the dead or unconscious units, fix #803	2015-04-26 20:57:55 +02:00