[OMCB]kaban
c992458964
Merge pull request #3 from acemod/master
...
Fork update from master
2015-11-04 23:28:21 +03:00
PabstMirror
39d4383a04
Merge pull request #2781 from acemod/updateWirecutters
...
Wirecutters - Update Fence Configs, Use faster getModelInfo
2015-11-04 13:17:15 -06:00
PabstMirror
c88f77403b
Merge pull request #2805 from jonpas/cleanupMacros
...
Cleanup Macro Definitions
2015-11-04 13:16:14 -06:00
PabstMirror
af5b646adb
Update CBA Includes
...
From
354f1b189e
2015-11-04 13:15:45 -06: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
PabstMirror
50ab2aa904
MicroDagr - move drawEH array define to preInit
...
Fix load order problems (init.sqf can be before postInit)
2015-11-02 15:21:34 -06:00
Glowbal
ac22ca3637
Merge pull request #2813 from acemod/medical-hitpoints-fix
...
Add method to deal with new hitpoints
2015-11-02 20:20:23 +01:00
Joko
bd97c1ee96
fix Docu in waitUntilAndExecute
2015-11-02 12:05:43 +01:00
Glowbal
8f6e9be636
Add method to deal with new hitpoints
...
This addition tries to deal with the new hitpoints introduced in Arma3 v1.50 and above. It converts new selection names to by the current medical system usable selection names.
This is only a temporarily patch, while we are still working on a larger overhaul to account both the new hitpoints and any potential new features / polishing.
2015-11-01 16:35:25 +01:00
bux578
224bfad1d5
Merge pull request #2809 from jonpas/fixContributingLinks
...
Fix contributing guidelines links
2015-11-01 08:07:19 +01:00
jonpas
8d3d9ff8f4
Properly fix links
2015-10-31 15:26:24 +01:00
jonpas
d24569953b
Fix CONTRIBUTING.md links
2015-10-31 15:21:54 +01:00
bux578
03d3d1c764
Merge pull request #2789 from ToasterBR/translation02
...
Remaining PT-BR translations
2015-10-31 06:14:37 +01:00
jonpas
998f3e996c
Cleanup macro definitions
2015-10-30 21:59:46 +01:00
PabstMirror
a432687552
make.py - fix last input spacing
...
no blocking on import
2015-10-29 21:07:33 -05:00
SilentSpike
11ab5197dc
Merge pull request #2799 from ColdEvul/master
...
Add ColdEvul to authors.txt
2015-10-30 00:25:04 +00:00
Broström.A | Evul
de90960127
Update AUTHORS.txt
2015-10-29 22:51:06 +01:00
Broström.A | Evul
909f8f1cb6
Merge pull request #1 from ColdEvul/CargoFixForTheAutonomus
...
Fixed small UAV carrying allot of cargo.
2015-10-28 20:39:18 +01:00
PabstMirror
10d17a8117
Merge pull request #2783 from acemod/captivesStuff
...
Captives Fix duplicate animEH and add handcuffing module
2015-10-28 14:09:13 -05:00
commy2
2cd2675919
Merge pull request #2795 from acemod/fixtracercolor
...
fix merkava, patria tracer color
2015-10-28 19:54:27 +01:00
commy2
7d69b7a3f4
fix merkava, patria tracer color
2015-10-28 19:48:49 +01:00
commy2
97999cde04
Merge pull request #2708 from acemod/amvGunSmoke
...
- Fix gun smoke on AMV
2015-10-28 19:33:47 +01:00
commy2
d424eadd48
delete superfluous space ocd
2015-10-28 19:25:59 +01:00
commy2
09ba2c8216
Merge pull request #2793 from ColdEvul/CargoFixForTheAutonomus
...
Fixed small UAV carrying allot of cargo.
2015-10-28 19:10:56 +01:00
commy2
55d066d122
Merge pull request #2792 from acemod/hasHatch
...
add FUNC(hasHatch)
2015-10-28 19:07:29 +01:00
commy2
049d40b96e
change description in function header
2015-10-28 19:02:54 +01:00
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
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
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
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
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
