Commit Graph

6432 Commits

Author SHA1 Message Date
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
03d3d1c764 Merge pull request #2789 from ToasterBR/translation02
Remaining PT-BR translations
2015-10-31 06:14:37 +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
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
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
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
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
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
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
PabstMirror
f7fe0c08e0 #2391 - Use AGL for sitting setPos 2015-10-14 11:15:44 -05:00
PabstMirror
680f52cd27 Handle Distance when mounted 2015-10-13 13:40:16 -05:00
PabstMirror
8ffe1b4e01 #2528 (2) - Integrate Dragging 2015-10-13 02:20:19 -05:00
PabstMirror
ad1191cdd5 #2528 - Medical Menu Work
(1) Verify target is valid and in reasonable range
2015-10-13 02:01:59 -05:00
PabstMirror
5d76395914 #2734 - Map effects / flashlights for TrippleHead 2015-10-12 11:27:38 -05:00
PabstMirror
7062f60f0a Fix UBC from #2726 2015-10-12 01:07:20 -05:00
Glowbal
1e26fee3ba Merge pull request #2683 from acemod/commonCleanupX
Common cleanup x
2015-10-11 12:15:27 +02:00
Glowbal
8db8e87c53 Merge pull request #2560 from acemod/lockingMissles
#2349 - Don't disable locking for base RocketPods
2015-10-11 12:06:11 +02:00
Glowbal
94ed78a173 Merge pull request #2578 from alganthe/strings_fix
PAK and Surgical Kit strings normalized inside modules.
2015-10-11 12:05:11 +02:00
PabstMirror
4ba0d72bfd #2580 (1) - Fix bandages always created at terrain level. 2015-10-10 23:09:52 -05:00
PabstMirror
53f833b68c #2702 - Cargo: Make "Supply Box" pallets heavy 2015-10-10 00:19:09 -05:00
PabstMirror
f2c66240ca #2717 - Cleanup Coax Weapon Mempoints 2015-10-08 22:32:07 -05:00
PabstMirror
f3c4ff66ca #2701 - Fix gun smoke on AMV 2015-10-08 02:51:54 -05:00
PabstMirror
39b838c7ab Merge pull request #2681 from acemod/vehDetachLocalfix
Attach getIn/Out run on local unit
2015-10-06 13:49:58 -05:00
commy2
9c22052871 Merge pull request #2685 from acemod/340removeactionsondead
remove check ammo action on destroyed static weapons
2015-10-06 19:36:19 +02:00