3797 Commits

Author	SHA1	Message	Date
Glowbal	d42d0ef69d	Merge pull request #1164 from acemod/litterFixes ... Litter distribution fix and "floating litter over water" fix (medical)	2015-05-14 16:17:10 +02:00
jaynus	20bd5957e3	Change to execNextFrame.	2015-05-14 07:15:52 -07:00
Glowbal	abadf05342	Merge remote-tracking branch 'gienkov/module-translations' ... Conflicts: addons/medical/stringtable.xml	2015-05-14 16:01:41 +02:00
esteldunedain	5ef29c2354	Merge remote-tracking branch 'origin/master' into interactionOclusion ... Conflicts: addons/interact_menu/functions/fnc_keyDown.sqf	2015-05-14 10:39:02 -03:00
Nicolás Badano	2fb317d3bd	Merge pull request #1120 from acemod/syncAmmoOnBeltReload ... Manually sync ammo globably on belt reload.	2015-05-14 10:32:16 -03:00
Nicolás Badano	dddd571a70	Merge pull request #1185 from Legolasindar/master ... fixed some spanish translation	2015-05-14 09:38:52 -03:00
Grzegorz	ca1ff8382c	Tabs fixed	2015-05-14 14:33:33 +02:00
Ivan Navarro Cabello	43c5afac55	fixed some spanish translation ... I fixed some spanish translation.	2015-05-14 14:32:35 +02:00
ulteq	7fcaa5bbcf	Fixed 'input parsing' corrupting 'relative click memory'	2015-05-14 12:52:48 +02:00
ulteq	ddbf274c89	ace_ballistics README.md update	2015-05-14 11:23:44 +02:00
jaynus	b13d44fb6b	Fixed: Litter spawning at huge radius, floating litter over water. Fixes #1112	2015-05-13 17:29:09 -07:00
Alessandro Foresi	8de611d559	Fixed: Safe mode Italian translation	2015-05-13 23:20:33 +02:00
jaynus	cf635d4564	Merge pull request #1129 from usecforce/removeTitanRealisticName ... Removed Titan realistic name as it's not implemented yet as a Spike	2015-05-13 13:31:01 -07:00
Glowbal	be09a5cecd	Merge pull request #1145 from acemod/MedicalVehicleCheckFix ... Fix medical vehicle return value	2015-05-13 18:32:49 +02:00
jaynus	890849fcd1	Merge pull request #1139 from acemod/fragPrivates ... Frag Privates	2015-05-13 08:06:02 -07:00
Glowbal	a4d0af4b67	Fix medical vehicle return value ... Could fix #1142	2015-05-13 15:55:03 +02:00
ulteq	26843dad88	Merge pull request #1057 from acemod/abConfigCaching ... Config caching (advanced ballistics)	2015-05-13 11:30:21 +02:00
ulteq	d04ebef519	Merge pull request #1106 from acemod/refactorCalcWindSpeed ... Moved all wind calculations into the weather module	2015-05-13 11:23:32 +02:00
commy2	8f35b9b7a4	Merge pull request #1138 from acemod/dragPrivates ... Draggin Privates	2015-05-13 10:57:03 +02:00
PabstMirror	4185874a9a	Frag Privates	2015-05-12 23:19:31 -05:00
jaynus	ed2f73d4d9	Merge pull request #1117 from acemod/waveHeightAtFunc ... Added: waveHeightAt Function	2015-05-12 21:15:35 -07:00
PabstMirror	3978445837	Draggin Privates	2015-05-12 23:01:59 -05:00
PabstMirror	245a6da6f6	Merge pull request #1027 from acemod/sortForMagRepack ... Sort for mag repack	2015-05-12 21:56:12 -05:00
jaynus	d972f14649	Merge pull request #1092 from acemod/superTime ... ACE_time variables for accurate purposeful time use	2015-05-12 19:34:20 -07:00
jaynus	d28f2b0f2c	Merge pull request #1113 from acemod/ComancheZoomLevels ... Fix for Comanche zoom levels	2015-05-12 19:31:28 -07:00
PabstMirror	1827d8ad95	Fix #1024 - Adjust self iMenu for wave height	2015-05-12 16:04:42 -05:00
PabstMirror	e613db1fea	Add missing script_component include	2015-05-12 15:40:12 -05:00
jonpas	e58d23d885	Removed Titan realistic name as it's not implemented yet as a Spike	2015-05-12 21:32:30 +02:00
GieNkoV	1610221a70	Remove duplicated strings	2015-05-12 20:01:10 +02:00
GieNkoV	ed1acd8c15	Some small errors fixed #2 ... Mainly tabs and wrong italian strings (got those from newest master)	2015-05-12 19:42:35 +02:00
GieNkoV	bc72c71e8e	Fix small errors inside stringtables	2015-05-12 19:11:56 +02:00
Grzegorz Sikora	44466e8be8	Remove tabs and repair errors @Glowbal found ... Conflicts: addons/map/CfgVehicles.hpp addons/medical/CfgVehicles.hpp Conflicts: addons/map/CfgVehicles.hpp addons/medical/CfgVehicles.hpp addons/optionsmenu/stringtable.xml	2015-05-12 18:27:27 +02:00
GieNkoV	5bbf875ef2	Tabs removed ... Conflicts: addons/missileguidance/stringtable.xml addons/optionsmenu/stringtable.xml	2015-05-12 18:27:02 +02:00
Grzegorz Sikora	63c5308cd9	Missed one Yes/no to BOOL	2015-05-12 18:26:41 +02:00
Grzegorz Sikora	156bba3321	Yes/No to BOOL ... Conflicts: addons/common/CfgVehicles.hpp addons/common/stringtable.xml addons/explosives/stringtable.xml addons/hearing/CfgVehicles.hpp addons/hearing/stringtable.xml addons/interaction/stringtable.xml addons/map/CfgVehicles.hpp addons/map/stringtable.xml addons/medical/CfgVehicles.hpp addons/medical/stringtable.xml addons/nametags/stringtable.xml addons/respawn/stringtable.xml addons/switchunits/CfgVehicles.hpp addons/switchunits/stringtable.xml Conflicts: addons/common/CfgVehicles.hpp addons/common/stringtable.xml addons/explosives/stringtable.xml addons/hearing/stringtable.xml addons/interaction/stringtable.xml addons/map/CfgVehicles.hpp addons/map/stringtable.xml addons/medical/CfgVehicles.hpp addons/medical/stringtable.xml addons/nametags/stringtable.xml addons/respawn/stringtable.xml addons/switchunits/CfgVehicles.hpp addons/switchunits/stringtable.xml	2015-05-12 18:26:24 +02:00
Grzegorz Sikora	6a821715a0	Stringtable modules ... Conflicts: addons/missionmodules/CfgVehicles.hpp addons/respawn/CfgVehicles.hpp	2015-05-12 18:25:40 +02:00
ViperMaul	ab580dd1c7	Set version number to 3.0.0.3	2015-05-12 07:08:45 -07:00
VKing	3ddc8569bb	Made better with Pabstology (tm)	2015-05-12 15:53:49 +02:00
PabstMirror	ddbb6ab2bb	#1119 - Manually sync ammo globably on belt reload.	2015-05-11 23:51:42 -05:00
jaynus	7efe8ccba5	Added: waveHeightAt Function, refs #1024 for use.	2015-05-11 16:44:17 -07:00
ViperMaul	e75c4594e6	Added missing $PBOPREFIX$ for respawn	2015-05-11 15:17:44 -07:00
VKing	ef836d1191	Hacked order to fix order of comanche zoom levels	2015-05-11 23:17:17 +02:00
jaynus	8e7763af08	Removed: systemChat debug in captive	2015-05-11 13:50:24 -07:00
jaynus	991ecdfe01	Removed: Debug sidechat in laser seeker code.	2015-05-11 13:37:50 -07:00
ViperMaul	0bb158bd14	Merge pull request #1109 from acemod/makeNewVersionStamping ... Make new version stamping	2015-05-11 11:16:14 -07:00
ViperMaul	5092d586fd	Exception handling and clean up. ... #1105	2015-05-11 10:06:40 -07:00
commy2	c0e2af2e66	quotes in config arrays	2015-05-11 18:50:04 +02:00
jaynus	9660978b92	Changed: search for ace_server, not ace_serverconfig	2015-05-11 09:02:13 -07:00
ViperMaul	9c288ffa12	Merge pull request #1108 from acemod/missingPBOPREFIX ... Added missing PBOPREFIX files	2015-05-11 08:54:03 -07:00
ViperMaul	b0051a6638	Merge pull request #1094 from acemod/fixUnSurrender ... Fix not being able to UnSurrender (currentWeapon)	2015-05-11 08:39:39 -07:00