Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,206 Commits 73 Branches 88 Tags 752 MiB
59d0e6e788
Commit Graph

137 Commits

Author SHA1 Message Date
Glowbal
c1fa81f28b Fix tabs in sqf files 2015-12-21 17:05:48 +01:00
PabstMirror
cae9f436f6 Merge branch 'release' 2015-12-08 15:14:33 -06:00
ProfessorCZ
cf41ac5fba Czech Translations - Update 2015-12-04 22:28:10 -06:00
commy2
5a1aae6028 manual merge 2015-11-30 17:44:15 +01:00
commy2
a9ebcf8543 fix setVariable and getVariable capitalization 2015-11-30 17:27:09 +01:00
commy2
d9b90258bc fix typeOf capitalization 2015-11-30 17:19:57 +01:00
Thomas Kooi
ced94d73a7 Merge pull request #2797 from ColdEvul/RoadBarrierRoadCone 
[REMADE] RoadCone_F and its inhered RoadBarrier_F intractable
 2015-11-28 20:51:39 +01:00
kaban
e2763dde27 Russian Translations - Update 2015-11-05 03:28:53 +03:00
PabstMirror
a3443cae43 Merge pull request #2780 from acemod/fixTimeInComments 
Changed ACE_time back to time in comments where appropriate
 2015-11-04 13:04:05 -06:00
ColdEvul
03b82e5859 Adjusted interaction nod, changed carrying height for he barrier. 2015-11-01 22:38:55 +01:00
Broström.A | Evul
100c20fc83 Fixed missing strings 
XEH_ENABLED
carryPosition
carryDirection
dragPosition
dragDirection
 2015-11-01 20:33:18 +01:00
ColdEvul
b82350baa2 Made ``RoadCone_F` and its inhered `RoadBarrier_F`` dragable, carryable and storeable. 
I remade it and removed comments and unnecessary strings. I also removed the unworking one from the last version.
 2015-10-28 21:33:00 +01:00
Jonathan Pereira
ce5364d7af Added PT-BR translations 
Added all remaining translations, including dagr, dragging, map,
map_gestures, medical, repair, tacticalladder and zeus.
 2015-10-26 22:04:03 -02:00
VKing
069169cc72 Changed ACE_time back to time in comments where appropriate 2015-10-21 22:52:21 +02:00
Glowbal
f57eb08ce5 Merge pull request #2620 from jonpas/sittingFramework 
Sitting Framework
 2015-10-18 12:26:53 +02:00
gienkov
ba42e3e295 pl string for dragging, tactical ladder 2015-09-29 22:12:11 +02:00
commy2
bc8cefa5e7 manual merge 2015-09-28 21:06:40 +02:00
jonpas
2ab58ab9ce Replaced common,isAlive function with alive command 2015-09-27 02:23:56 +02:00
jonpas
ae07a71b0d Minimized XEH to ThingX config level 2015-09-27 02:13:32 +02:00
jonpas
cd510c8ff7 Added carrying to chairs 2015-09-27 02:05:38 +02:00
commy2
2fe142032e rework modifier key, cleanup sandbags, tripod, ladder, fix #2590 2015-09-26 03:16:55 +02: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
Glowbal
19bfa478d1 Revert use of param in action string 2015-08-26 10:13:30 +02:00
Glowbal
0d7e7fa0cc should be type of 2015-08-26 10:08:32 +02:00
Glowbal
81068e6086 fixed dragging getWeight 2015-08-26 10:05:30 +02:00
Glowbal
1a0abf31fd fix global variable in local name space 2015-08-26 09:11:43 +02:00
Glowbal
65e16da998 fix missing semi column and bracket 2015-08-26 09:10:29 +02:00
Glowbal
5bec26c721 Merge pull request #2086 from jokoho48/codeCleanUpDragging 
Code cleanup of Dragging module
 2015-08-26 08:45:30 +02:00
jokoho48
644c13c971 fix Typo 
Remove macro GETVAR
 2015-08-24 13:43:11 +02:00
jonpas
de033f0ff2 README.md files added to all modules 2015-08-19 04:18:33 +02:00
jokoho48
79cf8dd98e Fixing Some Spelling 
Remove Some forgotten Commands
 2015-08-09 15:20:50 +02:00
jokoho48
323832474f Code cleanup of Dragging module 2015-08-09 14:53:13 +02:00
Glowbal
1ad2a5cdf1 Merge branch 'master' into repair 
Conflicts:
	addons/interaction/CfgVehicles.hpp
 2015-07-03 22:29:29 +02:00
ProfessorCZ
acc5f4d29f CZ - Translation 2015-06-12 15:05:04 +02:00
ProfessorCZ
531372b2a3 CZ - Translation 
Already in README
 2015-06-12 14:50:50 +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
ulteq
4802ffeebf Fixes random teleport when dragging/carrying inside of buildings. 2015-05-31 18:34:48 +02:00
jonpas
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
PabstMirror
3978445837 Draggin Privates 2015-05-12 23:01:59 -05:00
Alessandro Foresi
643df71932 Added: Italian translation from Blackedsoul p#20 2015-05-10 11:05:16 +02:00
Alessandro Foresi
9e093b9459 Added: More italian translations 2015-05-09 23:52:01 +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
KoffeinFlummi
761e23001f Merge https://github.com/Dimaslg/ACE3 into spanish-merge 
Conflicts:
	addons/medical/stringtable.xml
	addons/missileguidance/stringtable.xml
	addons/optionsmenu/stringtable.xml
 2015-05-01 16:51:20 +02:00
Glowbal
8d358f3ab5 can only carry/drag units that are not in a vehicle 2015-04-30 20:44:59 +02:00
Dimaslg
f8d5c423ae Merge conflicts resolved 2015-04-29 21:15:22 +02:00
PabstMirror
2beaf8ddeb Merge pull request #905 from acemod/fixDragAnim 
Fix Dragging StanceChange Anim
 2015-04-29 13:34:16 -05:00