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,326 Commits 73 Branches 88 Tags 752 MiB
a161008eb7
Commit Graph

8326 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
commy2
a0bfcdd04c Revert "rename hasHatch to canTurnOut, change description in function header" 
This reverts commit 932f09ce60.
 2015-10-28 19:01:47 +01:00
commy2
932f09ce60 rename hasHatch to canTurnOut, change description in function header 2015-10-28 18:57:47 +01:00
BaerMitUmlaut
7d7aa5b67f !hasHatch condition part 2 2015-10-28 17:15:46 +01:00
BaerMitUmlaut
a1d72b81bf Switch to unit namespace, added !hasHatch condition 2015-10-28 17:13:05 +01:00
ColdEvul
6ac1d8361d Fixed small UAV carrying allot of cargo. 2015-10-28 16:00:24 +01:00
commy2
643f4d36dc add FUNC(hasHatch) 2015-10-28 08:01:25 +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
Jonathan Pereira
f6dbf9ab42 Merge remote-tracking branch 'refs/remotes/acemod/master' 2015-10-26 21:09:28 -02:00
Jonathan Pereira
0832437a41 Merge remote-tracking branch 'refs/remotes/acemod/master' 2015-10-26 21:05:41 -02:00
PabstMirror
2c995f9c2c Minor Cleanup 2015-10-26 10:49:39 -05:00
PabstMirror
fefe24b7eb Disable debug in parachute 2015-10-24 19:07:23 -05:00
Glowbal
b5539db27f Merge pull request #2767 from acemod/canTreatLocation 
Fix medical location check when set to disabled for PAK/Surgical
 2015-10-24 00:55:51 +02:00
PabstMirror
1c26f6c9f5 Captives - Module to set handcuffing 
also add player check for GVAR(requireSurrender) in canApplyHandcuffes
 2015-10-23 14:17:31 -05:00
PabstMirror
ef681e4332 Captives - Fix adding duplicate animEH 2015-10-23 13:11:11 -05:00
PabstMirror
e340f5164c Wirecutters - Update Fence Configs, Use faster getModelInfo 2015-10-22 20:54:09 -05:00
VKing
069169cc72 Changed ACE_time back to time in comments where appropriate 2015-10-21 22:52:21 +02:00
Felix Wiegand
5d7a8afb7f Merge pull request #2779 from acemod/fixFCSLead 
Fix lead calculation for vehicle FCS
 2015-10-21 22:33:29 +02:00
VKing
a899c74133 ace_fcs_ace_time -> ace_fcs_time 2015-10-21 22:17:28 +02:00
VKing
0936238862 Fix lead calculation for vehicle FCS 2015-10-21 21:52:48 +02:00
PabstMirror
554c303be0 InteractionMenu - Auto Expand First Level 2015-10-20 13:31:09 -05:00
PabstMirror
7db5a34b24 Interaction Menu - Add setting for animation speed 2015-10-20 13:26:42 -05:00
jonpas
349447c5ea Readd prone down optics removal 2015-10-20 19:37:49 +02:00
BaerMitUmlaut
c227f05f8a Deprecated isWater 2015-10-19 23:28:50 +02:00
Glowbal
57abe3b885 Merge pull request #2743 from acemod/medicalStuff 
Medical Menu Fixes
 2015-10-19 22:47:13 +02:00
[OMCB]kaban
16792fe9f1 Merge pull request #2 from acemod/master 
Fork update from master
 2015-10-19 23:22:12 +03:00
bux578
a8295b6d53 Merge pull request #2769 from licht-im-Norden87/patch-14 
Readme_DE.md,  small grammar fix
 2015-10-19 21:34:30 +02:00
PabstMirror
acc3504d7b Merge branch 'master' into fixFlashlightPrivates 
Conflicts:
	addons/map/stringtable.xml
 2015-10-19 13:59:15 -05:00
licht-im-Norden87
9c28ea5004 Readme_DE.md, small grammar fix 2015-10-19 17:21:54 +02:00
bux578
8f33790bf2 Merge pull request #2759 from acemod/reorderReadme 
Improve readme
 2015-10-19 11:03:34 +02:00
bux578
5db3f61113 add back the flat-square styles 2015-10-19 10:59:48 +02:00
bux578
a74908a905 fix merge conflicts 2015-10-19 10:40:31 +02:00
Felix Wiegand
ece11c335d Merge pull request #2756 from acemod/flat-badges 
Use "flat-square" badge style
 2015-10-19 09:45:31 +02:00
KoffeinFlummi
c5fd41b9a1 Add flat badges to other READMEs 2015-10-19 09:44:40 +02:00
PabstMirror
cfde11d2fa Fix medic treatment location check as well 2015-10-19 01:45:30 -05:00
PabstMirror
aad6cab896 #2765 - Fix location check when set to disabled 2015-10-19 01:20:11 -05:00
bux578
0ef6de0404 Merge branch 'licht-im-Norden87-patch-12' 2015-10-19 07:37:41 +02:00
bux578
a873481c36 improve german readme 2015-10-19 07:37:14 +02:00
bux578
94b90fe0b4 Merge branch 'patch-12' of git://github.com/licht-im-Norden87/ACE3 into licht-im-Norden87-patch-12 2015-10-19 07:30:59 +02:00
bux578
e186266133 Merge branch 'licht-im-Norden87-patch-11' 2015-10-19 07:29:30 +02:00
bux578
602832cc0c adjust german translations 2015-10-19 07:29:02 +02:00
bux578
f7b717db64 Merge branch 'patch-11' of git://github.com/licht-im-Norden87/ACE3 into licht-im-Norden87-patch-11 2015-10-19 07:23:51 +02:00
PabstMirror
af80635a3f ST Map Gesture Force Color Settings 2015-10-18 23:59:40 -05:00
PabstMirror
64de91ed06 Add warning for duplicate setting modules. 2015-10-18 23:34:11 -05:00
PabstMirror
16180686d2 PV GVAR(settings) after modules, add error debug 2015-10-18 18:49:03 -05:00
PabstMirror
26c051d397 Sitting - Fix missing semicolon 2015-10-18 11:48:21 -05:00
BaerMitUmlaut
98c6c37d9c Merge remote-tracking branch 'refs/remotes/acemod/master' 2015-10-18 17:58:37 +02:00
IngoKauffmann
1804215dbb Readded caliber for ACE_Hydra70_DAGR 2015-10-18 13:21:20 +02:00
IngoKauffmann
f02c57b599 Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm 
Conflicts:
	addons/missileguidance/CfgAmmo.hpp
 2015-10-18 13:19:27 +02:00
IngoKauffmann
5a453a7074 Fixed flying 
Moved attached ammo further away
 2015-10-18 13:11:28 +02:00
IngoKauffmann
8a4b3a117a Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm 2015-10-18 12:49:36 +02:00