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,133 Commits 73 Branches 88 Tags 752 MiB
ff4406e411
Commit Graph

6707 Commits

Author SHA1 Message Date
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
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
IngoKauffmann
1804215dbb Readded caliber for ACE_Hydra70_DAGR 2015-10-18 13:21:20 +02:00
IngoKauffmann
f02c57b599 Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm 
Conflicts:
	addons/missileguidance/CfgAmmo.hpp
 2015-10-18 13:19:27 +02:00
IngoKauffmann
5a453a7074 Fixed flying 
Moved attached ammo further away
 2015-10-18 13:11:28 +02:00
IngoKauffmann
8a4b3a117a Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm 2015-10-18 12:49:36 +02: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
da2d140a39 Cleanup unnecessary statement 2015-10-17 14:30:59 -05:00
jokoho48
bfcf057dab extract Gestures to own Module and Port THS to ACE 2015-10-17 21:17:37 +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
fa7299ba1b Add array info to header 2015-10-16 08:28:54 -05:00
PabstMirror
94e3cd1f79 Replace old use of showHud 2015-10-15 22:45:35 -05:00
PabstMirror
bec884e581 showHud handler 2015-10-15 22:33:05 -05:00
PabstMirror
6ffde8150f Simplify Map Light Interactions 2015-10-14 14:36:40 -05:00
jokoho48
2dcdd224bd fix privates in Map module 2015-10-14 19:56:54 +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
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
BaerMitUmlaut
2fe53431c7 Split event handlers 2015-10-08 19:29:30 +02:00
BaerMitUmlaut
e50a28874f Fix for BI bug, FFV support 2015-10-08 11:31:29 +02: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
BaerMitUmlaut
edb76ffae4 Initial commit 2015-10-07 20:11:07 +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
BaerMitUmlaut
1effe61aa9 Removed parent condition 2015-10-06 19:09:51 +02:00
BaerMitUmlaut
090384c014 Fixed canPassMagazine header 2015-10-06 17:56:32 +02:00
BaerMitUmlaut
d6dcd4112e Resolved merge conflicts 2015-10-06 17:50:55 +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
SilentSpike
52d703c2eb Improve spectator seagull handling 
Previously they were only hidden, but this didn't account for the annoying audio they play so now they're entirely staged like a spectator unit would be.
 2015-10-04 18:17:02 +01:00
SilentSpike
f0f822b4bc Decrease default spectator camera speed 2015-10-04 18:17:01 +01:00
SilentSpike
b1dda86cb2 End spectator interface when the mission ends 
Fixes #2592 (in theory) by forcing spectator closed on mission end
 2015-10-04 18:17:01 +01:00
PabstMirror
616bc9f8a0 local-private waitAndXX PFEH 2015-10-04 11:38:31 -05:00
PabstMirror
f3e61e2136 Merge branch 'master' into commonCleanupX 2015-10-04 11:31:05 -05:00
SilentSpike
0beaa40fbc Add API parameter to allow for unforced spectator 
Adds an optional boolean paremeter to the setSpectator function for forcing the interface. It is forced by default, so if `false` is passed as the value the spectator will be able to close the interface with the escape button.
 2015-10-04 13:52:54 +01:00
gienkov
b6d2cdee69 Merge remote-tracking branch 'origin/master' into pl-strings 2015-10-04 12:25:55 +02:00
commy2
d9595b6176 fix fnc_binocularMagazine on remote and dead units 2015-10-04 12:10:08 +02:00
commy2
92ed7eeac2 remove check ammo action on destroyed static weapons, fix #2671 2015-10-04 11:58:26 +02:00
commy2
42ce11cfee Merge pull request #2679 from acemod/340missingmags 
fix missing magazines after certain scenarios
 2015-10-04 11:46:36 +02:00
commy2
5ed290362d Merge pull request #2663 from acemod/340rallypointminutes 
fix broken time format for rallypoints, fix #2662
 2015-10-04 11:46:25 +02:00
commy2
040a63bd8f Merge pull request #2254 from acemod/waitUntilAndExecute 
Add WaitUntilAndExecute Function
 2015-10-04 11:45:54 +02:00
commy2
a2b6166aa0 optimization waitUntilAndExecute, add comments 2015-10-04 11:43:13 +02:00
Glowbal
f8cebd9403 Merge pull request #2007 from jokoho48/codeCleanupWeather 
Code cleanup Weather module
 2015-10-04 09:36:32 +02:00
Glowbal
58ea8d5e2c Merge pull request #2543 from alef/feature/death_short_diagnose 
Remove: pain diagnosis on dead patients
 2015-10-04 09:34:10 +02:00
Glowbal
9ce4ce6cdd Merge pull request #2582 from acemod/fixLitterFloating 
fix Littergeneric fly over ground
 2015-10-04 09:32:03 +02:00
Glowbal
e36df978ec Merge pull request #2646 from DerekSauer/FixArmaInjury 
Fix healHitPointAfterAdvBandage - Issue #2498.
 2015-10-04 09:28:47 +02:00
Glowbal
2c292af77e Merge pull request #2680 from acemod/cargoLockedVeh 
Disable loading into locked vehicles.
 2015-10-04 09:26:53 +02:00
Glowbal
4445ecd7c4 Merge pull request #2581 from acemod/invisibleLadder 
Invisible Tactical Ladder
 2015-10-04 09:26:34 +02:00
Glowbal
a823eff37f Merge pull request #2674 from acemod/triageCardGameTime 
Use ACE_gameTime for triage card
 2015-10-04 09:22:18 +02:00
PabstMirror
59da3e1c35 Optimize PFEH Funcs 2015-10-03 23:05:46 -05:00
PabstMirror
c75d219b65 Cleanup Undefined Functions 2015-10-03 21:34:46 -05:00
PabstMirror
7315dd650f Merge branch 'master' into vehDetachLocalfix 2015-10-03 19:44:20 -05:00
PabstMirror
21f35dc7d0 #2664 - Disable loading into locked vehicles. 2015-10-03 19:42:40 -05:00
commy2
f0036fabbb use BIS fnc for time format 2015-10-04 02:15:38 +02:00
commy2
38422e6586 fix missing magazines after certain scenarios 2015-10-04 01:26:38 +02:00
PabstMirror
10950d5fab Merge pull request #2623 from acemod/interactMenuSet 
Interact menu settings after init
 2015-10-03 12:49:04 -05:00
PabstMirror
12c663978a Merge pull request #2649 from acemod/captiveEvents 
Global Event for "CaptiveStatusChange"
 2015-10-03 12:47:58 -05:00
PabstMirror
b0b755720c #2672 - Use ACE_gameTime for triage card 2015-10-03 12:28:54 -05:00
jokoho48
25166226a0 change by idea from @jonpas 2015-10-03 17:38:24 +02:00
jokoho48
1de012b7a7 simplify frag config(Macros FTW) 2015-10-03 12:34:04 +02:00
gienkov
3d4a37614c Merge remote-tracking branch 'origin/master' into pl-strings 2015-10-03 12:19:48 +02:00
commy2
94eaeb38cc move variable out of params 2015-10-01 21:34:40 +02:00
commy2
7f1f56c121 fix broken time format for rallypoints, fix #2662 2015-10-01 21:28:00 +02:00
commy2
ea01db4030 Merge pull request #2648 from acemod/340goggles 
Code cleanup / refactoring Goggles
 2015-10-01 16:54:57 +02:00
licht-im-Norden87
66e8914360 Update stringtable.xml 2015-10-01 04:38:21 +02:00
Derek Sauer
f9352de489 Clarified comment slightly. 2015-09-30 20:34:51 -04:00
Derek Sauer
0a788a282e Improved efficiency of wound counting. 
Using a switch/case conditional since it offers early termination if a
matching condition is found before all conditions are checked. It also
unnecessary to use a conditional to confirm whether a limb is wounded or
not. Number of Wounds multiplied by Blood loss will return zero for
a fully bandaged body part, not incrementing the wound counter; or it will
return some other number which will increment the wound counter.
 2015-09-30 20:27:40 -04:00
licht-im-Norden87
88ee846d7d Update Stringtable, german: "captives" 2015-10-01 01:36:27 +02:00
commy2
1fdedb5785 delay scroll wheel init 2015-09-30 19:29:17 +02:00
Derek Sauer
f69f4066e9 Fix capitalization on forEach and getVariable. 2015-09-30 06:17:54 -04:00
commy2
945ec7a388 more goggles code cleanup 2015-09-30 01:31:45 +02:00
commy2
dc882a3c66 more goggles code cleanup 2015-09-30 01:26:08 +02:00
commy2
c0105bf083 Merge branch 'master' of https://github.com/acemod/ACE3 into 340goggles 2015-09-30 00:28:26 +02:00
commy2
75d1ea7df3 Merge branch 'master' of https://github.com/acemod/ACE3 2015-09-30 00:14:41 +02:00
commy2
9f3615ea06 change function header of removeEventhandler and waitAndExecute to public: yes 2015-09-30 00:14:21 +02:00
commy2
8bbd6b69f0 change function header of removeEventhandler and waitAndExecute to public: yes 2015-09-30 00:12:35 +02:00
commy2
28e0e781f5 Merge pull request #2645 from acemod/340fixopticszeus 
fix zeus forced interface broken, fix #2642
 2015-09-29 23:04:51 +02:00
Derek Sauer
2824009317 Incorrectly retrieving list of current wounds. 
Used the wrong method to retrieve the target's current wounds and was
getting an empty array. This caused bandaging any wound even once to
completely heal the target on the Arma side.
 2015-09-29 17:00:49 -04:00
commy2
8d5ce1dbe2 more goggles code cleanup 2015-09-29 22:24:25 +02:00
Derek Sauer
8d05214eb0 Resolve merge conflict from upstream pull. 2015-09-29 16:24:17 -04:00
gienkov
ba42e3e295 pl string for dragging, tactical ladder 2015-09-29 22:12:11 +02:00
commy2
62349f685c more goggles code cleanup 2015-09-29 22:01:40 +02:00
gienkov
d88d2fe578 Merge remote-tracking branch 'origin' into pl-strings 2015-09-29 21:56:29 +02:00
commy2
b7ce315240 more goggles code cleanup 2015-09-29 21:28:57 +02:00
gienkov
251437c415 pl translation 2015-09-29 20:37:30 +02:00
commy2
d1aacf3fef more goggles code cleanup 2015-09-29 19:51:41 +02:00
commy2
53bfcdb61e more goggles code cleanup 2015-09-29 18:51:24 +02:00
PabstMirror
d454271fb9 Give the event the D 2015-09-29 11:40:32 -05:00
PabstMirror
c0b78ecf3a Set Default Channel at mission start 2015-09-29 11:36:30 -05:00
commy2
d051d4c208 more goggles code cleanup 2015-09-29 17:57:09 +02:00
PabstMirror
16b1244b0a Global Event for "CaptiveStatusChange" 2015-09-29 10:17:17 -05:00
commy2
477e9f06b6 more goggles code cleanup 2015-09-29 17:09:23 +02:00
commy2
2731ac360a more goggles code cleanup 2015-09-29 16:56:10 +02:00
commy2
d25d79c485 Goggles Code refactoring initial commit 2015-09-29 16:22:57 +02:00
Derek Sauer
954fad615a Reformatted to follow ACE3 coding guidelines. 2015-09-29 06:36:36 -04:00
Derek Sauer
8619f02538 Take into account wounds that do no cause blood loss. 2015-09-29 06:19:49 -04:00
PabstMirror
6e24d2868c Fix playerChanged event 2015-09-28 22:41:45 -05:00
Derek Sauer
a864a3411c Clarified a comment. 2015-09-28 21:32:04 -04:00
commy2
1ec4556bb8 fix zeus forced interface broken, fix #2642 2015-09-29 02:48:22 +02:00
Derek Sauer
488541bba6 Fix for Arma wounds not being healed with healHitPointAfterAdvBandage. 2015-09-28 20:08:07 -04:00
commy2
19131f001d fix error in handleplayerchanged for tacticl ladder 2015-09-28 21:16:13 +02:00
commy2
bc8cefa5e7 manual merge 2015-09-28 21:06:40 +02:00
commy2
34793ce044 Merge pull request #2635 from acemod/340interactcleanup 
Code Cleanup Interaction
 2015-09-28 21:04:28 +02:00
commy2
6c968d8bc7 per frame handler for incremental door opening 2015-09-28 20:07:01 +02:00
commy2
443cbf8be3 fix compile error when trying to open a locked door by shortcut 2015-09-28 19:03:37 +02:00
commy2
6f64fcd0fb search for door in geometry lod (lineintersectssurface) 2015-09-28 18:45:10 +02:00
commy2
6289a0cadb Merge pull request #2626 from acemod/340weaponselectcleanup 
Code Cleanup WeaponSelect
 2015-09-28 18:10:16 +02:00
commy2
5a3a32f236 more interaction cleanup 2015-09-28 18:06:25 +02:00
commy2
9bf7b68d76 fix errors on game start 2015-09-28 17:28:51 +02:00
commy2
5c5a65443b more interaction cleanup 2015-09-28 17:20:56 +02:00
commy2
f48636e633 more interaction cleanup, remove dead code 2015-09-28 17:11:53 +02:00
Glowbal
e1bbc06ef8 Merge pull request #2613 from jonpas/improveSlideshowParams 
Improved Slideshow API
 2015-09-28 16:38:00 +02:00
jonpas
4521df0a57 Add synchronizedObjects vehicle support to assignObjectsInList with an optional parameter 2015-09-28 16:17:12 +02:00
jonpas
db2572acfd Merge branch 'master' into parseList 
Conflicts:
	addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
 2015-09-28 16:06:32 +02:00
jonpas
e4d8f13c89 Change may to must in slideshow error log 2015-09-28 16:02:18 +02:00
Glowbal
7215dd9082 Merge pull request #2368 from jonpas/removeVignetteAndCleanUI 
Removed Vignette and Cleaned up UI component
 2015-09-28 15:56:34 +02:00
commy2
9189148b3f more interaction cleanup 2015-09-28 15:37:18 +02:00
Glowbal
74805caa5d Merge pull request #2565 from acemod/medVehAssignFix 
assign vehicle module fix for prefilled veh
 2015-09-28 15:02:48 +02:00
commy2
4b536425b1 Code Cleanup Interaction 2015-09-28 14:36:51 +02:00
SilentSpike
f5e46bf089 Merge remote-tracking branch 'origin/master' into cargoClassnames 2015-09-27 17:41:38 +01:00