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
7,975 Commits 73 Branches 88 Tags 752 MiB
8fc52a4dfb
Commit Graph

6559 Commits

Author SHA1 Message Date
PabstMirror
e2e74e0f5d DAGR - Fix degrees (° - seems to need UTF-8 BOM) 2015-11-10 16:17:22 -06:00
PabstMirror
830e7d9be4 Merge pull request #2278 from jokoho48/codeCleanUpDagr 
Code cleanup of Dagr module
 2015-11-10 16:15:12 -06:00
Thomas Kooi
d91ae9082e Merge pull request #2628 from acemod/cargoClassnames 
Add support for virtual cargo
 2015-11-10 08:38:17 +01:00
Thomas Kooi
ec1187e79b Merge pull request #2830 from acemod/mixedMedicalDisplay 
Display basicMed wounds for AI in mixed mode
 2015-11-10 08:33:21 +01:00
PabstMirror
845909f8af #2833 - Add earplugs based on loudness (+MGs) 
Use same loudness calc as firedNear (replacing old audibleFire)
Give ear plugs to machine gunners (depends on magzine size)
 2015-11-08 14:02:00 -06:00
PabstMirror
28738517e8 Merge pull request #2829 from acemod/FlashlightProxyModel 
Fix empty flashlightProxy model + Delete map glow lights from disconnecting players
 2015-11-08 11:25:06 -06:00
PabstMirror
5b16638ae5 Always force param settings 2015-11-08 11:22:41 -06:00
PabstMirror
dad1388eec RealisticNames - add ka-60 v2 (black and white) 2015-11-07 18:34:46 -06:00
[OMCB]kaban
2dd90824aa Map Gestures translations update 2015-11-08 02:52:16 +03:00
PabstMirror
01d679c5dc #2810 - Delete map glow light from DC players 2015-11-07 14:33:41 -06:00
PabstMirror
ff60cdcfa3 #2828 - Fix empty flashlightProxy model 2015-11-07 11:44:31 -06:00
[OMCB]kaban
34163b5e56 Nametags translations are rolled back 2015-11-07 19:54:48 +03:00
Jonathan Pereira
7ec480c98e Added ace_captives translation to PT-BR 2015-11-07 11:39:02 -02:00
Glowbal
caa36aa4f6 Merge pull request #2819 from acemod/medicalTranslateHitpoints 
Medical - Better handle odd selection/hitpoint names
 2015-11-07 11:06:49 +01:00
PabstMirror
826b4fd20b Cleanup 2015-11-06 20:53:05 -06:00
PabstMirror
e0506f29bc Read settings from paramsArray (params in description.ext) 
for now just limited to SCALAR/BOOL
 2015-11-06 20:46:06 -06:00
PabstMirror
c91789f3c4 Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking 2015-11-06 20:30:12 -06:00
SilentSpike
6e30e9e0df Fix overpressure priority evaluation 
The code was checking the wrong configs for priority because of some missing variables.
 2015-11-06 19:02:54 +00:00
PabstMirror
9161f8e2fb Merge pull request #2824 from acemod/acreIsSpeaking 
Nametags - Cleanup isSpeaking for ACRE
 2015-11-06 09:58:16 -06:00
PabstMirror
c326bc2f87 #2772 - Display basicMed wounds for AI in mixed mode 2015-11-06 01:05:25 -06:00
ViperMaul
4b200d6909 bump to v3.3.3 2015-11-05 14:00:01 -08:00
PabstMirror
fabbf6d14d Nametags - Cleanup isSpeaking for ACRE 2015-11-05 13:13:37 -06:00
[OMCB]kaban
59b9e9a7df Missing periods added. 2015-11-05 03:45:34 +03:00
kaban
e2763dde27 Russian Translations - Update 2015-11-05 03:28:53 +03:00
PabstMirror
38105136fa #2820 - Fix target event error 2015-11-04 17:43:51 -06:00
PabstMirror
1cebe613fa Fix Capitialzation 2015-11-04 14:38:32 -06:00
PabstMirror
c5da32e470 Medical Handle Damage - check hitpoints if selection is weird 2015-11-04 14:36:26 -06: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
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
cfba7c01e8 Merge branch 'master' into settingsErrorChecking 
Conflicts:
	addons/map_gestures/stringtable.xml
 2015-11-03 12:09:36 -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
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
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
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
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
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
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
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
SilentSpike
b6dd7b941f Reduce overhead of spectator map icons 
Fixes #2514 by only rendering individual unit icons when zoomed in and only rendering the units currently within the screen bounds.

Behaves as expected, but whether or not it has a significant performance increase under scaled up testing conditions remains to be seen.
 2015-10-17 13:23:51 +01: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
IngoKauffmann
b5568ca0db Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel 
Conflicts:
	optionals/compat_bwa3/config.cpp
 2015-10-10 13:13:30 +02: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
f8ca3693fd #2709 - Fix AB handleFired _muzzleVelocityShift 2015-10-08 21:22:00 -05:00
PabstMirror
326d549510 #2696 - Rangecard check bounds before select 2015-10-08 20:32:14 -05:00
PabstMirror
f3c4ff66ca #2701 - Fix gun smoke on AMV 2015-10-08 02:51:54 -05:00
jonpas
e6a5d8c990 Remove enable optics in adjusted prone stances 2015-10-07 23:00:35 +02: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
SilentSpike
e5b29727a5 Merge pull request #2617 from jonpas/zeusSpareparts 
Add Zeus Modules for Adding Spare Parts
 2015-10-05 19:01:50 +01:00
SilentSpike
780e0aa270 Add vision mode support to spectator external cam 
Since external view is actually another camera, vision modes should also apply to it too.
 2015-10-04 19:26:53 +01:00
SilentSpike
4079ca354e Update spectator function headers 2015-10-04 18:30:07 +01:00
SilentSpike
c1dc8a6493 Fix spectator 3D icons not rendering 
Fixes #2676 as per voiperr's suggestion (working with camera can be really strange, I swear this worked before)
 2015-10-04 18:17:07 +01:00