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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
26c051d397
|
Sitting - Fix missing semicolon
|
2015-10-18 11:48:21 -05:00 |
|
Glowbal
|
843eb16837
|
Merge pull request #2650 from acemod/setDefaultChannel
Set Default Channel at mission start
|
2015-10-18 12:28:13 +02:00 |
|
Glowbal
|
f57eb08ce5
|
Merge pull request #2620 from jonpas/sittingFramework
Sitting Framework
|
2015-10-18 12:26:53 +02:00 |
|
Glowbal
|
8e4bc264cc
|
Merge branch 'master' into map_gestures
Conflicts:
AUTHORS.txt
|
2015-10-18 12:20:54 +02:00 |
|
Glowbal
|
9a0aa2b14c
|
Merge pull request #2152 from jokoho48/codeCleanupKestrel4500
Code cleanup of Kestrel 4500 module
|
2015-10-18 12:16:44 +02:00 |
|
Glowbal
|
76efdbcc1c
|
Merge pull request #2257 from jonpas/parseList
Parse List Common Function
|
2015-10-18 12:14:18 +02:00 |
|
Glowbal
|
ebe2bf96cd
|
Merge pull request #2277 from jokoho48/codeCleanUpConcertina_wire
Code cleanup of Concertina_wire Module
|
2015-10-18 12:13:44 +02:00 |
|
Glowbal
|
3682a1710b
|
Merge pull request #2527 from alef/issues/titan_miss
Fix: Titan hitting ground instead of vehicle
|
2015-10-18 12:11:09 +02:00 |
|
bux578
|
b3032da51c
|
reorder badges, social networks
|
2015-10-17 11:48:12 +02:00 |
|
KoffeinFlummi
|
38be666b37
|
Use "flat-square" badge style
|
2015-10-16 18:34:31 +02:00 |
|
PabstMirror
|
cb65a67a3e
|
Merge pull request #2745 from acemod/fixChairsOverWater
Use AGL for sitting setPos
|
2015-10-14 13:19:54 -05:00 |
|
PabstMirror
|
f7fe0c08e0
|
#2391 - Use AGL for sitting setPos
|
2015-10-14 11:15:44 -05:00 |
|
PabstMirror
|
733c695c41
|
Merge pull request #2736 from acemod/mapEffectsTrippleHead
Map effects / flashlights for TrippleHead
|
2015-10-14 10:46:38 -05:00 |
|
PabstMirror
|
680f52cd27
|
Handle Distance when mounted
|
2015-10-13 13:40:16 -05:00 |
|