Commit Graph

7853 Commits

Author SHA1 Message Date
PabstMirror
d6000ae985 local -> private 2015-11-17 14:33:17 -06:00
PabstMirror
87b9ff9785 Hearing - Reset earplugs on respawn, addItem setting
Fix #2835 - readd item on respawn
Fix #2837 - setVariable false on respawn
2015-11-10 20:44:55 -06: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
5a599816f6 Merge pull request #2831 from acemod/realName-ka60v22
RealisticNames - add ka-60 v2 (black and white)
2015-11-07 18:36:05 -06:00
PabstMirror
dad1388eec RealisticNames - add ka-60 v2 (black and white) 2015-11-07 18:34:46 -06: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
bux578
c3653094ea Merge pull request #2827 from ToasterBR/Translations03
Added ace_captives translation to PT-BR
2015-11-07 17:37:31 +01:00
Jonathan Pereira
7ec480c98e Added ace_captives translation to PT-BR 2015-11-07 11:39:02 -02:00
Jonathan Pereira
f0fa9875d1 Merge remote-tracking branch 'refs/remotes/acemod/master' into Translations03 2015-11-07 11:31:49 -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
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
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
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
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