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
8,203 Commits 73 Branches 88 Tags 752 MiB
1aa192f7e0
Commit Graph

6754 Commits

Author SHA1 Message Date
jokoho48
fd1c38c612 Merge branch 'master' of https://github.com/acemod/ACE3 into handSignals 2015-11-24 22:44:32 +01:00
jokoho48
352db4cb66 remove some crap code 
replace some variables with macros
 2015-11-24 22:43:42 +01:00
PabstMirror
cfefb1c40e Cleanup spotting scope configs 2015-11-24 15:24:14 -06:00
PabstMirror
2c6cfcf294 Merge pull request #2832 from p1nga/Spotting-Scope-Update 
Updated spotting scope model.
 2015-11-24 15:23:12 -06:00
PabstMirror
9ecffcd133 Merge pull request #2746 from acemod/fixFlashlightPrivates 
fix privates in Map module
 2015-11-24 15:18:38 -06:00
IngoKauffmann
f9266764fb Moved module to ACE_Logistics 2015-11-24 21:33:38 +01:00
IngoKauffmann
1a6730340c Move module to ACE_Logistics category, removed single interact point 2015-11-24 21:30:08 +01:00
PabstMirror
2c76bc3b10 Merge pull request #2605 from TheNiner/master 
Fixed Laser Update Position Bug
 2015-11-24 13:43:53 -06:00
BaerMitUmlaut
818466d296 Added ACE setting to hide interaction 2015-11-24 19:07:17 +01:00
PabstMirror
51a463de24 Fix tap shoulder msg display 
Missing efunc on displayTextStructured
Calculate a shoulder side when using keybind
 2015-11-24 11:25:56 -06:00
IngoKauffmann
8fc52a4dfb Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel 2015-11-24 17:57:21 +01:00
PabstMirror
86f7ee2ad2 Merge pull request #2834 from acemod/addEarPlugsLoudness 
Hearing - Add earplugs based on loudness and give to MGs and fix respawn issues
 2015-11-24 10:52:11 -06:00
IngoKauffmann
d4c708e731 Missing ; 2015-11-24 17:33:33 +01:00
PabstMirror
ddc8b16db2 Merge pull request #2857 from acemod/invResize154 
Inventory Resize UI - changes for 154 GL-Mags
 2015-11-24 10:24:06 -06:00
PabstMirror
4ae209ab44 Merge pull request #2865 from acemod/154UBC 
Fix UBC for 1.54
 2015-11-24 10:23:48 -06:00
jokoho48
773b30df33 Merge branch 'master' of https://github.com/acemod/ACE3 into handSignals 2015-11-24 15:14:30 +01:00
PabstMirror
7981faad64 private -> local 2015-11-23 17:47:58 -06:00
PabstMirror
0273dd1d4d Merge branch 'master' into fixFlashlightPrivates 2015-11-23 17:45:41 -06:00
commy2
1d315bee6f cleanup laserpointer 2015-11-23 20:52:04 +01:00
IngoKauffmann
fd2fd3241e Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm 2015-11-23 19:37:10 +01:00
IngoKauffmann
cbe8d98f86 Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel 2015-11-23 19:29:05 +01:00
IngoKauffmann
931c6830fc Added reset 
It's now possible to reset a fuel truck by console command:
[fuel_truck] call ace_refuel_fnc_reset
 2015-11-23 19:28:51 +01:00
IngoKauffmann
763df43fbc Added possibility to disallow rearm 
> vehicle setVariable ["ace_rearm_disabled", true, true];
Also added ammo compatibility for RHS Mi24 with turret
 2015-11-23 17:08:06 +01:00
commy2
3be60a2f6e Merge pull request #2842 from acemod/fcsUpdateDisplay 
Update FCS display after distance adjust
 2015-11-23 16:34:09 +01:00
IngoKauffmann
113ac0f370 Minor improvements 
fnc_reset is still WIP
 2015-11-21 23:24:24 +01:00
SilentSpike
f07f06c843 Merge pull request #2760 from acemod/spectatorUpdates 
Spectator updates
 2015-11-21 15:00:44 +00:00
PabstMirror
c2564de5ef Fix UBC for 1.54 
Soldiers no longer inherit hitpoints from CaManBase
Adds a macro to deal with them
 2015-11-20 23:27:29 -06:00
PabstMirror
ab769757d9 Skip Depends Hitpoints - Use HitPoints selPos for wheels 
Stuff

Normalize Depends - Skip Glass Repair

Fix spawned wheel/track not having correct damage

getHitpointString robustness, hatchback fuelHitpoint, fix count errors

-

Formatting

local -> private

Fix Stuff
 2015-11-20 21:11:50 -06:00
SilentSpike
839c022b84 Fix broken repair point selection code 
Only valid hit selection + hit point combinations are usable for repair points:

- Empty hit points mean there isn't enough information to display to the user
- Empty hit selections mean that the hit point doesn't actually exist
 2015-11-20 21:11:23 -06:00
PabstMirror
4e93b9c72d 2307 - Repair sub-turrets 
Privates

Cleanup debug

Add repair actions for sub turrets

Cleanup

Fix Header

Error Handling

Cleanup setHitpointDamage

Fix common ACE_isEngineer to handle scalar or bool

Claim and release repair objects (wheel/track)

Repair sub-turrets
 2015-11-20 21:11:05 -06:00
Glowbal
d0cb09196d Merge branch 'master' of github.com:acemod/ACE3 2015-11-20 23:29:33 +01:00
Glowbal
67345b0178 Fix incorrect variable 
_items was the old variable name.
 2015-11-20 23:28:52 +01:00
PabstMirror
979ff8b479 Local -> private 2015-11-20 16:13:20 -06:00
PabstMirror
0f62168250 Merge pull request #2840 from acemod/fixOverpressure 
Overpresure - Misc fixes
 2015-11-20 15:38:24 -06:00
PabstMirror
08813c1b75 Convert local keywords to private 2015-11-20 15:36:37 -06:00
Thomas Kooi
801120fb39 Merge pull request #2841 from acemod/medicalAiBandage 
Move bandage log before basic exit
 2015-11-20 22:28:55 +01:00
Thomas Kooi
4a19fcc5a5 Merge pull request #2771 from BaerMitUmlaut/inWater-deprecation 
inWater -> isUnderwater
 2015-11-20 22:28:43 +01:00
Thomas Kooi
a652be8248 Merge pull request #2847 from BaerMitUmlaut/cleanup-moduleAmbianceSound 
Cleanup ambient sounds module
 2015-11-20 22:27:57 +01:00
PabstMirror
063042cb36 Merge pull request #2777 from acemod/interactionAnimationSetting 
Interaction Menu Animation Setting And PreExpand First Level
 2015-11-20 14:56:37 -06:00
PabstMirror
7b526a99a3 Cleanup 2015-11-20 14:53:16 -06:00
PabstMirror
c4117e1283 Merge branch 'master' into settingsErrorChecking 
Conflicts:
	addons/map_gestures/stringtable.xml
 2015-11-20 14:37:23 -06:00
PabstMirror
69b53af1d3 1.54 - Replace typeName with isEqualType 2015-11-20 11:40:31 -06:00
PabstMirror
9a9029fa49 Merge pull request #2839 from acemod/abFixTwist 
AB - Fix ACE_twistDirection
 2015-11-20 10:32:28 -06:00
PabstMirror
e81dd0729e Inventory Resize UI - changes for 154 GL-Mags 2015-11-19 15:54:43 -06:00
SilentSpike
f8e293d04d Localise spectator hotkeys in help window 2015-11-18 15:18:21 +00:00
SilentSpike
0567d1c2a1 Fix spectator unit list key press handling 
By setting maxHistroyDelay really high, the unit list shouldn't be messed with via key press very often.
 2015-11-18 15:02:17 +00:00
SilentSpike
0110ada1b5 Fix zeus waypoint formation actions 2015-11-18 14:54:17 +00:00
SilentSpike
d1dff4a24a Merge branch 'master' into fixForEachDeleteAt 
# Conflicts:
#	addons/common/XEH_postInit.sqf
 2015-11-18 13:27:04 +00:00
SilentSpike
49d4f233d9 Revert commit a718c82780 2015-11-18 13:19:12 +00:00
bux578
3b2b7fd78d Merge pull request #2821 from dudakov/master 
Russian Translations - Update
 2015-11-18 08:30:46 +01:00
PabstMirror
ebbf2b373a goggles - prevent CBA PFEH warning 
fix "x\cba\addons\common\fnc_removePerFrameHandler.sqf:30","WARNING:
Invalid or not existing PFH ID."
 2015-11-17 23:44:50 -06:00
kaban
da16fc1038 \addons\captives\stringtable.xml - resolving conflicts. 2015-11-18 06:50:00 +03:00
kaban
f8481ae5f2 Merge branch 'master' of https://github.com/acemod/ACE3.git into develop 
Conflicts:
	addons/captives/stringtable.xml
 2015-11-18 06:39:58 +03:00
PabstMirror
d6000ae985 local -> private 2015-11-17 14:33:17 -06:00
PabstMirror
3ec9fca73e local -> private 2015-11-17 14:06:12 -06:00
PabstMirror
75d80be143 Merge branch 'master' into interactionAnimationSetting 2015-11-17 14:05:31 -06:00
PabstMirror
5cbfe4f2a5 local -> private 2015-11-17 14:02:20 -06:00
PabstMirror
896615beb1 Merge pull request #2826 from acemod/settingsParamsArray 
Read settings from paramsArray (params in description.ext)
 2015-11-17 14:01:16 -06:00
PabstMirror
5823749f0c Merge branch 'master' into settingsErrorChecking 2015-11-17 14:00:22 -06:00
PabstMirror
6d04156f69 local -> private 2015-11-17 13:56:55 -06:00
commy2
a57d1bca75 replace local keyword with private 2015-11-17 17:43:07 +01:00
SilentSpike
a718c82780 Implement nice index deletion iteration solution 
Previously when iterating over an array and modifying the same array via deletion of the current index, incorrect means was used to account for the change in index resulting in any further deletions being applied to the wrong elements.

This solution does not require duplication of the array or the use of external variables to track the number of deleted elements. We simply lower the `_forEachIndex` by 1 whenever an element is removed.
 2015-11-17 16:02:56 +00:00
SilentSpike
23e110d7ce Remove depreciated spectator hotkey 2015-11-17 15:26:34 +00:00
commy2
b6f9a2b776 Merge pull request #2703 from jonpas/removeAdjustedProneOptics 
Remove enable optics in adjusted prone stances
 2015-11-17 16:24:27 +01:00
jokoho48
561f6126dc fix missing bracket 2015-11-17 13:34:34 +01:00
jokoho48
f3c5c64390 fix Issue with forEach Loops and deleteAt Index 2015-11-17 04:31:17 +01:00
BaerMitUmlaut
e008f87fb8 Cleanup ambience sound module 2015-11-16 19:00:02 +01:00
Jonathan Pereira
6ebd76ff2f Added PT-BR translations to Cargo 2015-11-14 12:24:01 -02:00
SilentSpike
cf368f240f Remove ear ringing upon spectator entry 
Volume updating was disabled, however any existing ringing would persist. Setting the volume to 0 should make the hearing PFH stop playing sound.
 2015-11-13 13:00:04 +00:00
PabstMirror
a621eaab24 #2750 - Update FCS display after distance adjust 2015-11-13 02:57:06 -06:00
PabstMirror
c3e6990d00 #2528 (6) - Move bandage log before basic exit 
In advanced medical without enableFor AI. Bandaging an AI would exit
before adding log.
 2015-11-12 01:06:29 -06:00
PabstMirror
9b2c79e7e1 getDistance - use lineIntersectsSurfaces 2015-11-11 14:12:42 -06:00
PabstMirror
391bfc160a Overpresure - Misc fixes 
- Fix passing magazine/ammo to overpressure event
- Use AGL for nearEntities
- Fix getDistance returning nil
 2015-11-11 13:24:27 -06:00
PabstMirror
9d2d5b9c7c AdvanBalls - Fix ACE_twistDirection 2015-11-11 01:58:12 -06:00
PabstMirror
e72c1d874a Merge branch 'master' into fixFlashlightPrivates 
Conflicts:
	addons/map/functions/fnc_determineMapLight.sqf
 2015-11-10 21:21:06 -06:00
PabstMirror
99852f2071 Merge pull request #2718 from acemod/rangeCards-scriptError 
RangeCard / AB fixes
 2015-11-10 21:02:16 -06:00
PabstMirror
4ff31771d3 DAGR - missing ( 2015-11-10 20:51:00 -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
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
P1NGA
6dd3aebe63 Authors.... 2015-11-08 15:26:17 +11:00
P1NGA
5ffa646ded updated spotting scope model and textures. 2015-11-08 15:18:31 +11: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
gienkov
0b6fcacaf0 pl translation 2015-11-06 00:56:15 +01: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
ColdEvul
03b82e5859 Adjusted interaction nod, changed carrying height for he barrier. 2015-11-01 22:38:55 +01:00
Broström.A | Evul
100c20fc83 Fixed missing strings 
XEH_ENABLED
carryPosition
carryDirection
dragPosition
dragDirection
 2015-11-01 20:33:18 +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
BaerMitUmlaut
8f473b4a27 Removed all assignTeam occurrences 2015-10-30 16:50:13 +01:00
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
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
BaerMitUmlaut
7d7aa5b67f !hasHatch condition part 2 2015-10-28 17:15:46 +01:00
BaerMitUmlaut
a1d72b81bf Switch to unit namespace, added !hasHatch condition 2015-10-28 17:13:05 +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
2c995f9c2c Minor Cleanup 2015-10-26 10:49:39 -05: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
acc3504d7b Merge branch 'master' into fixFlashlightPrivates 
Conflicts:
	addons/map/stringtable.xml
 2015-10-19 13:59:15 -05:00