432 Commits

Author	SHA1	Message	Date
Glowbal	abadf05342	Merge remote-tracking branch 'gienkov/module-translations' ... Conflicts: addons/medical/stringtable.xml	2015-05-14 16:01:41 +02:00
jaynus	ed2f73d4d9	Merge pull request #1117 from acemod/waveHeightAtFunc ... Added: waveHeightAt Function	2015-05-12 21:15:35 -07: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
PabstMirror	e613db1fea	Add missing script_component include	2015-05-12 15:40:12 -05: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
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
jaynus	7efe8ccba5	Added: waveHeightAt Function, refs #1024 for use.	2015-05-11 16:44:17 -07:00
jaynus	9660978b92	Changed: search for ace_server, not ace_serverconfig	2015-05-11 09:02:13 -07:00
jaynus	e1c3c40cdd	I need more coffee. this should be more accurate.	2015-05-10 07:50:58 -07:00
jaynus	318b2437f9	Applied virtual time acceleration to the master ACE_time. Created ACE_tickTime macro, to provide same-frame millisecond resolution.	2015-05-10 07:42:53 -07:00
Alessandro Foresi	2dd06babec	Added: Italian translations completed. ... Fixed: BOM markers where missing	2015-05-10 11:44:46 +02:00
Alessandro Foresi	643df71932	Added: Italian translation from Blackedsoul p#20	2015-05-10 11:05:16 +02:00
jaynus	7fb7b04a85	And one final bugfix for fast machines.	2015-05-09 23:13:02 -07:00
jaynus	8e34b99c0f	Optimization of variables.	2015-05-09 23:09:33 -07:00
jaynus	b3833c665d	Time magic.	2015-05-09 22:53:20 -07:00
commy2	aa6c3ddf2c	fix: check files script, order in activatedAddons is not guaranteed	2015-05-09 19:34:35 +02:00
commy2	7fb56d4fd5	simple check to compare client and server version of ace	2015-05-09 17:03:51 +02:00
commy2	3976c4d64f	the spaces	2015-05-09 16:06:44 +02:00
commy2	f0cca5b33e	ignore ace in checkPBO module, also fix #1020	2015-05-09 16:01:53 +02:00
commy2	57131496f2	check for outdated pbo files	2015-05-09 13:25:19 +02:00
Glowbal	518dfb4373	Added missing privates	2015-05-07 21:51:03 +02:00
PabstMirror	d8a6dd1bbd	Stuff	2015-05-01 12:58:56 -05:00
PabstMirror	8d1ac26e24	Save and replay valid awake animations	2015-05-01 12:12:13 -05:00
PabstMirror	0f736ae684	GetDeathAnim	2015-05-01 03:13:26 -05:00
Glowbal	349d723fea	Merge pull request #928 from acemod/AdjustUnloadPerson ... Adjust unload person	2015-04-30 20:55:17 +02:00
Glowbal	67370f3340	Handles waking up	2015-04-30 20:49:38 +02:00
Glowbal	432a0102e8	Improved unloadPerson function ... Removed caller parameter.	2015-04-30 20:44:43 +02:00
bux578	367da1f4bf	cleaned up insignias	2015-04-30 19:36:35 +02:00
commy2	8e54e6ec13	fix setFWS locality issues, fix #892	2015-04-30 00:53:49 +02:00
bux578	fce91279b5	add ace3 and banana insignia ... `[this,"ACE_insignia_logo"] call BIS_fnc_setUnitInsignia;` and `[this,"ACE_insignia_banana"] call BIS_fnc_setUnitInsignia;`	2015-04-29 22:04:31 +02:00
Glowbal	dfbc9b74fd	Added arsenalScope #913	2015-04-29 15:14:37 +02:00
commy2	d149db61e8	ace insignia, #906	2015-04-29 13:01:08 +02:00
KoffeinFlummi	b263ac6847	Merge branch 'patch-5' of https://github.com/VyMajoris/ACE3 into portuguese-merge ... Conflicts: addons/common/stringtable.xml	2015-04-29 12:57:48 +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
NukeDev	1d434949de	Some Italian Translation's Changes	2015-04-28 17:46:35 +02:00
VyMajoris	ba89bc8faa	Added - Myself to AUTHORS.txt	2015-04-26 03:15:25 -03:00
Nou	7c857a5a7e	Make sure load spawns the function, not calls it.	2015-04-25 00:52:51 -07:00
Nou	c8e6e7018c	Moved infinite spawned loop to Loaded event for handing save game loads. Events for the win! diag_activeSQFScripts as of this build returns empty on a bare mission.	2015-04-25 00:49:47 -07:00
Nicolás Badano	1bfb13abac	Revert "remove author from items inheriting ACE_ItemCore"	2015-04-21 19:07:42 -03:00
bux578	3897b73d56	remove author from items inheriting ACE_ItemCore	2015-04-21 19:16:54 +02:00
Glowbal	89a1306605	Merge branch 'master' into KeyPressesWhileUnconscious	2015-04-20 22:19:40 +02:00
Glowbal	362051e2db	Merge pull request #717 from acemod/medicalFixes ... Medical fixes	2015-04-20 22:16:57 +02:00
commy2	ea368511b7	ace extensions class for modularity	2015-04-20 18:48:58 +02:00
commy2	14214090dc	manual merge	2015-04-20 18:22:17 +02:00
Glowbal	b71ac1485d	Merge branch 'master' into medicalFixes	2015-04-19 12:06:54 +02:00
commy2	c9a2505031	Merge pull request #755 from acemod/fixoptics2 ... Fix for PIP scopes, fix #547	2015-04-19 07:46:41 +02:00
jaynus	dccc869a6a	Merge pull request #753 from acemod/fixSettingsLocalization ... Fix settings localization is done by the server instead of client	2015-04-18 20:09:56 -07:00