Commit Graph

120 Commits

Author SHA1 Message Date
PabstMirror
61cbe543ee Fix #2432 - Don't check for null attached when mounted 2015-09-14 18:06:46 -05:00
KoffeinFlummi
83aa2cc68c Merge branch 'release' into french 2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be Update French translations 2015-09-10 19:14:51 +02:00
PabstMirror
d06680e2a0 #1571 - Handle Null Attached Objects 2015-08-29 11:47:56 -05:00
PabstMirror
f6c752045c Cleanup 2015-08-29 09:38:57 -05:00
PabstMirror
007859d42e Attach - getin/out/killed event handlers (#2200 #2300) 2015-08-28 16:57:16 -05:00
gienkov
cf585790db fixes done 2015-08-22 11:41:15 +02:00
jonpas
683e727cb4 Readded items 2015-08-19 04:22:39 +02:00
jonpas
de033f0ff2 README.md files added to all modules 2015-08-19 04:18:33 +02:00
PabstMirror
8e905af444 Merge pull request #1977 from acemod/attachClickCooldown
Mouse cooldown for click to interact option
2015-08-08 11:18:20 -05:00
PabstMirror
f1d44972c9 Attach fix and param trace 2015-08-06 13:17:59 -05:00
jokoho48
3ea545782f Updated parameterization in Attach module. 2015-08-05 00:47:31 +02:00
PabstMirror
eb5ac22b8d Cleanup 2015-08-02 01:05:28 -05:00
PabstMirror
5bcc867bac #1785 - Handle option for all "deploy" actions 2015-08-01 18:26:38 -05:00
PabstMirror
c5a371e9b6 #1965 - Mouse cooldown for click to interact option 2015-08-01 15:07:09 -05:00
PabstMirror
bf802f4f5d Merge branch 'master' into virtualAttachObject 2015-07-17 17:56:22 -05:00
Joko
d92e6af1c2 Add IRStrobe to CfgMagazines 2015-07-16 15:17:09 +02:00
Joko
9aa0285064 Revert LoD Changes 2015-07-15 21:13:05 +02:00
Joko
fd4d4abb73 Move UAV Battery form models to data
change LoD Distance
Fix IVBag names(my issue)
2015-07-15 20:51:06 +02:00
Joko
a72312738e Add to all Objects a LoD with nothing in for "hiding" Objects in Distance
Remove Old Earplugs
Use 3 Object instead of 9 for IVBag with Using of Model Config
2015-07-15 20:34:35 +02:00
PabstMirror
499a63e8e3 External - Move to right of head 2015-07-08 15:53:31 -05:00
Joko
fa900452ea Add DAGR (by Blackpixxel)
Add QuikClot to Medical (by Blackpixxel)
Add QuikClot Litter (by Blackpixxel)
Update Blackpixxel at Author
Fix IRStrobe Texture Path
2015-07-05 22:21:17 +02:00
Joko
240b26b9ac Add IRStrobe 3D Object to attach
Add M57 Clacker to explosives
Add New LowPoly Earplug to Hearing
Add WireCutter to logistics_wirecutter
Reduce UAVBattery Texture Size in logistics_uavbattery
Add MapTools to maptools
2015-07-04 19:56:54 +02:00
PabstMirror
b02086ca52 Intersection Check / FOV adjustment 2015-07-01 14:53:59 -05:00
PabstMirror
4570f77249 Privates / Cleanup 2015-06-20 20:40:17 -05:00
PabstMirror
25df7aad09 Attach use purely virtual object (no setPos) 2015-06-19 13:32:42 -05:00
PabstMirror
e7347be47b Increase delete delay for attached IR grenades (#1615) 2015-06-13 14:08:25 -05:00
Nicolás Badano
ddc6688d03 Merge pull request #1505 from alganthe/strobe-intensity
strobe light more bearable
2015-06-04 15:34:20 -03:00
Josuan Albin
70e83707c4 strobe light more bearable
changed the intensity of the strobe light, it's still VERY visible on a
very long distance, (around 1.6k maybe more)
2015-06-04 17:40:49 +02:00
jonpas
541f1010a7 Merge branch 'master' into macroSTR
Conflicts:
	addons/attach/functions/fnc_attach.sqf
	addons/captives/functions/fnc_moduleSurrender.sqf
	addons/common/CfgVehicles.hpp
	addons/explosives/CfgModule.hpp
	addons/hearing/CfgVehicles.hpp
	addons/interaction/CfgVehicles.hpp
	addons/map/CfgVehicles.hpp
	addons/microdagr/CfgVehicles.hpp
	addons/mk6mortar/CfgVehicles.hpp
	addons/nametags/CfgVehicles.hpp
	addons/nightvision/functions/fnc_changeNVGBrightness.sqf
	addons/respawn/CfgVehicles.hpp
	addons/switchunits/CfgVehicles.hpp
	addons/vehiclelock/CfgVehicles.hpp
	addons/winddeflection/stringtable.xml
2015-06-02 22:14:32 +02:00
PabstMirror
f57427ec96 switch waitAndExecute with 0 delay to execNextFrame
Should Fix #1463
2015-06-01 13:14:05 -05:00
jonpas
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
jonpas
0b0f7274d7 Applied ESTRING and ECSTRING macros 2015-05-27 22:04:41 +02:00
jonpas
87db721d4f Stringtable fixes up to medical 2015-05-27 21:19:14 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
Kavinsky
8e9b35c757 Fixed Capitalized folders on include paths 2015-05-20 23:28:10 +02:00
Alessandro Foresi
643df71932 Added: Italian translation from Blackedsoul p#20 2015-05-10 11:05:16 +02:00
Alessandro Foresi
6695a8793b Added: Some italian translastions 2015-05-09 23:43:03 +02:00
ToasterBR
021b00c722 Translation to Portuguese
Done all remaining portuguese translations, including some minor
corrections
2015-05-02 03:38:53 -03:00
ulteq
2c97b20781 Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master
Conflicts:
	addons/atragmx/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/medical/stringtable.xml
	addons/missileguidance/stringtable.xml
	addons/overheating/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/vehiclelock/stringtable.xml
2015-04-30 13:20:31 +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
0b4bb6e4c9 Italian's Translation fixes
atragmx, attach, ballistics, captives languages fixes
2015-04-28 19:40:36 +02:00
KoffeinFlummi
06a4f3d10e Remove tabler comments. 2015-04-20 15:48:50 +02:00
Grzegorz Sikora
8530684fa6 PL fix #2 2015-04-19 23:09:11 +02:00
KoffeinFlummi
592e0d2dd3 Merge https://github.com/ruPaladin/ACE3 into russian-merge
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
2015-04-19 00:51:09 +02:00
FreeZbe
f55bd5a629 French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
ruPaladin
af876e3370 attach 2015-04-17 15:27:53 +03:00
PabstMirror
638433614c Some missing private defines. 2015-04-16 12:36:16 -05:00
Tachii
dca11e523b Update stringtable.xml 2015-04-16 18:08:58 +03:00
KoffeinFlummi
2ffbccbf20 Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-04-15 12:59:56 +02:00