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
4a6730341a
Fix p3d paths
2015-11-07 00:16:08 -06: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
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
SilentSpike
f65f6e9b72
Add support for virtual cargo
...
Allows cargo objects to be added via classname and reduces simulation/synchronization overhead. Objects become physical upon unloading and cannot be re-made virtual, only scripts can add such virtual objects.
Also separates the player feedback from the loading/unloading code and adds a progress bar.
2015-09-27 17:34:37 +01:00
commy2
e9770fcb97
remove obsolete functions
2015-09-27 17:15:59 +02:00
commy2
1613ce3ff6
correct comment
2015-09-27 16:55:43 +02:00
commy2
b6532a05cc
new function to select a grenade
2015-09-27 16:47:02 +02:00
commy2
f8819d3ee4
WeaponSelect cleanup
2015-09-27 14:55:36 +02:00
commy2
e3b926296f
Merge branch 'master' of https://github.com/acemod/ACE3 into 340weaponselectcleanup
2015-09-27 13:53:00 +02:00
commy2
af24428363
Merge pull request #2607 from acemod/340cleanupBackpacks
...
Code cleanup Backpacks
2015-09-27 13:50:20 +02:00
commy2
1a5f65ec5a
Merge pull request #2625 from acemod/340safetymodecleanup
...
Code Cleanup SafetyMode, also fixes "cannot load sound .wss" RPT error
2015-09-27 13:50:11 +02:00
commy2
92ae1da660
Merge pull request #2622 from jonpas/aliveCommand
...
Replaced isAlive function with alive command
2015-09-27 13:49:58 +02:00
commy2
5387700460
Merge pull request #2610 from acemod/340cleanupNoRadio
...
Code Cleanup NoRadio
2015-09-27 13:49:08 +02:00
commy2
0500d4385d
Merge pull request #2611 from acemod/340cleanupHitReactions
...
Code Cleanup HitReactions
2015-09-27 13:48:57 +02:00
commy2
fbe157614b
Merge pull request #2612 from acemod/340cleanupGrenades
...
Code Cleanup Grenades, fix dedicated server AI thrown flasbangs do nothing
2015-09-27 13:48:46 +02:00
commy2
3211e6432e
Merge pull request #2614 from jonpas/loadCargoOptionalHint
...
Optionalized Cargo Loaded Hint
2015-09-27 13:48:27 +02:00
commy2
a078d73230
Code Cleanup WeaponSelect
2015-09-27 08:51:42 +02:00
commy2
50046decf3
Code Cleanup SafetyMode
2015-09-27 08:28:55 +02:00
PabstMirror
4a935eb129
Remove debug
2015-09-26 22:02:44 -05:00
PabstMirror
174d8ac306
#2486 - Run color setup on settingsInit
2015-09-26 22:02:05 -05:00
jonpas
2ab58ab9ce
Replaced common,isAlive function with alive command
2015-09-27 02:23:56 +02:00
jonpas
f35b13bf29
Merge branch 'master' into sittingFramework
2015-09-27 02:16:51 +02:00
jonpas
ae07a71b0d
Minimized XEH to ThingX config level
2015-09-27 02:13:32 +02:00
jonpas
cd510c8ff7
Added carrying to chairs
2015-09-27 02:05:38 +02:00
jonpas
85cff04e0c
Stored scroll-wheel action ID into already existing player setVariable instead of having 2
2015-09-27 01:37:19 +02:00
jonpas
dbd0beb514
Stored a global variable in player setVariable
2015-09-27 01:31:23 +02:00
jonpas
a7a716ca8d
Better sitting framework in terms of interactions
2015-09-27 01:20:40 +02:00
jonpas
e3985dce3e
Cleanup sitRotation as it's no longer needed
2015-09-27 00:40:59 +02:00
jonpas
151903ace4
Expanded optional hint to addCargoItem and AddCargoByClass event
2015-09-27 00:31:23 +02:00
jonpas
b345db4ae9
Added Zeus modules for adding Spare Tracks and Wheels
2015-09-27 00:29:19 +02:00
jonpas
30544dc757
Make cargo loaded hint optional, disable it when not loading manually
2015-09-26 23:16:05 +02:00
jonpas
498dddcc26
Used isEqualTo
2015-09-26 23:06:35 +02:00
jonpas
b787286837
Fixed allowed data types
2015-09-26 23:02:18 +02:00
jonpas
4a5d6cade1
Bracket to Brace
2015-09-26 22:54:31 +02:00
jonpas
64d6a172c7
Improved public function parameter handling, Fixed issue with synchronized objects
2015-09-26 22:53:49 +02:00
commy2
cd839a0ddc
remove superfluous brackets
2015-09-26 22:42:47 +02:00
commy2
6cc920dc34
Code Cleanup Grenades, fix dedicated server AI thrown flasbangs do nothing
2015-09-26 22:39:12 +02:00
commy2
028aa404e9
change description in function header
2015-09-26 21:27:00 +02:00
commy2
c12584e15c
Code Cleanup HitReactions
2015-09-26 21:23:18 +02:00
commy2
0509e26690
Code Cleanup NoRadio
2015-09-26 20:45:19 +02:00
commy2
9ae215704c
Code cleanup Backpacks
2015-09-26 20:29:08 +02:00
commy2
f77242fce3
Merge pull request #2604 from acemod/340fixunconaftersettngsinit
...
delay setUnconscious until the settings are inited
2015-09-26 19:54:09 +02:00
commy2
07774647e9
delay setUnconscious until the settings are inited, fix #148
2015-09-26 19:30:13 +02:00
Niner1309
1a43341506
Fixed Laser Update Position Bug
2015-09-26 19:15:09 +02:00
commy2
93114802d2
Merge pull request #2603 from acemod/340fixcargodestroyed
...
dont access cargo of destroyed vehicles, fix #2523
2015-09-26 18:29:56 +02:00
commy2
8affae9f7a
dont access cargo of destroyed vehicles, fix #2523
2015-09-26 18:16:38 +02:00
commy2
777ac05d16
Merge pull request #2602 from acemod/340respawncleanup
...
Code cleanup respawn module, close #2184
2015-09-26 17:58:17 +02:00
commy2
6d9943ff2e
fix wrong macro, missing ;
2015-09-26 16:45:39 +02:00
commy2
b1fb7befe8
remove wrong isServer check
2015-09-26 16:32:29 +02:00
commy2
5425836e47
cleanup respawn module, close #2184
2015-09-26 16:28:18 +02:00
commy2
f0584adeff
Merge pull request #2601 from acemod/340fixfixfloatingSelections
...
fix fixFloating resetting reflector hitpoints, close #2279
2015-09-26 14:45:50 +02:00
commy2
dc7d24a3fd
fix fixFloating resetting reflector hitpoints, close #2279
2015-09-26 14:38:50 +02:00
PabstMirror
8bb5f71ba1
Macro for non spawned CBA Debug Logging
2015-09-25 22:30:57 -05:00
commy2
2fe142032e
rework modifier key, cleanup sandbags, tripod, ladder, fix #2590
2015-09-26 03:16:55 +02:00
SilentSpike
5f7c30dd7c
Merge pull request #2597 from Cuel/delay-spectator
...
fix spectator view if called instantly
2015-09-25 13:34:37 +01:00
jokoho48
4ad16ed938
fix that waitUntilAndExecute have a return
2015-09-25 13:29:39 +02:00
jokoho48
998fbcc403
Merge remote-tracking branch 'remotes/acemod/master' into waitUntilAndExecute
...
Conflicts:
addons/common/XEH_postInit.sqf
2015-09-25 13:19:19 +02:00
Cuel
dcbf977d6d
fix spectator view if called instantly
...
If you call setSpectator directly from init.sqf you'll be put into some
weird limbo mode with borders and spectator not working. This should fix
it
2015-09-25 12:51:13 +02:00
commy2
43cdfaecc0
Merge branch 'master' of https://github.com/acemod/ACE3
2015-09-25 11:15:46 +02:00
commy2
412685e0ff
fix some code was commented out in loadPersonLocal and unloadPersonLocal
2015-09-25 11:15:25 +02:00
jokoho48
f7787730e1
fix Littergeneric fly over ground(add Landcontact Points)
2015-09-23 20:17:16 +02:00
jokoho48
d6203d0f2e
Posible Fix for Invisible Tactical Ladder V2
2015-09-23 19:54:12 +02:00
jokoho48
dce49721e4
Posible Fix for Invisible Tactical Ladder
2015-09-23 19:17:57 +02:00
KoffeinFlummi
3471ebef16
Merge https://github.com/dudakov/ACE3 into russian-merge
2015-09-23 19:17:52 +02:00
alganthe
10296d2883
PAK and Surgical Kit strings normalized inside modules.
...
Signed-off-by: alganthe <alganthe@live.fr>
2015-09-23 15:50:50 +02:00
bux578
95ec25736e
Merge pull request #2563 from gienkov/missing-strings
...
Missing english strings
2015-09-23 09:48:54 +02:00
PabstMirror
ebcc540943
Merge pull request #2572 from acemod/fixClickExplosivePlace
...
Delay one frame when selecting explosives
2015-09-22 13:23:33 -05:00
PabstMirror
5add8d6789
#2537 - Delay one frame when selecting explosives
2015-09-22 11:31:58 -05:00
jonpas
a42685af2e
Removed copy/pasted maintainer intruder
2015-09-22 18:04:27 +02:00
Grzegorz
1848ea6325
fixez
2015-09-22 14:58:59 +02:00
[OMCB]kaban
49d1355ad8
Fix due to review
2015-09-22 11:52:06 +03:00
PabstMirror
cf8a7f742e
#2541 - Attach getIn/Out run on local unit
2015-09-21 22:50:48 -05:00
PabstMirror
f93538eb9a
#2423 - assign vehicle module fix for prefilled veh
2015-09-21 21:44:52 -05:00
PabstMirror
079d88ded7
Merge pull request #2509 from acemod/miscFixNilFunctions
...
Fix some nil functions
2015-09-21 20:36:09 -05:00
PabstMirror
bf0cdbaf77
Merge pull request #2534 from acemod/unconcHandcuffs
...
Take Unconscious captive
2015-09-21 20:35:02 -05:00
Grzegorz
55eae90484
tabz
2015-09-22 02:35:06 +02:00
gienkov
bbccfbaa35
pl medical string
2015-09-22 01:04:46 +02:00
commy2
24f0df55a2
Merge pull request #2559 from acemod/340disableuserinputcleanup
...
Use CBA PFH in disableUserInput
2015-09-22 00:52:58 +02:00
commy2
617b1ec78d
Merge pull request #2556 from acemod/340deprecation
...
add deprecated warnings
2015-09-22 00:52:43 +02:00
gienkov
229ba1f758
Merge remote-tracking branch 'upstream/master' into missing-strings
2015-09-22 00:36:32 +02:00
gienkov
b05f0c62ff
missing english respawn strings
2015-09-22 00:36:10 +02:00
PabstMirror
45e44251b6
Merge branch 'release'
...
Conflicts:
addons/repair/stringtable.xml
2015-09-21 17:14:53 -05:00
PabstMirror
6702a1faa4
Fix warnings for WeaponHolderSimulated
2015-09-21 16:34:02 -05:00
jonpas
2e3014daa3
Merge branch 'master' into parseList
...
Conflicts:
addons/common/functions/fnc_assignObjectsInList.sqf
2015-09-21 22:46:01 +02:00
commy2
23e3db9cc0
use CBA pfh in disableUserInput and fix key input weirdness
2015-09-21 22:42:31 +02:00
Glowbal
62ad9d4284
Version 3.3.2
2015-09-21 22:31:01 +02:00
Glowbal
42b2c18509
Merge pull request #2542 from acemod/FixSparePartsCargo
...
Fix cargo setVariable on server with InitPost
2015-09-21 22:28:59 +02:00
Glowbal
6b93760f9b
Merge pull request #2557 from alganthe/torso_diag_fix
...
Torso diag fix
2015-09-21 22:27:13 +02:00
Glowbal
bbed98fbef
Merge pull request #2394 from jonpas/cleanupRepairRelease
...
Minor Repair Cleanup for release
2015-09-21 22:25:58 +02:00
commy2
f1abd4698f
remove superfluous ;
2015-09-21 22:12:17 +02:00
commy2
08a6da7ed5
Merge branch '340deprecation' of https://github.com/acemod/ACE3 into 340deprecation
2015-09-21 22:10:11 +02:00
commy2
f134a77e98
add and use deprecated macro
2015-09-21 22:09:54 +02:00
PabstMirror
d3c2420381
Merge branch 'master' into miscFixNilFunctions
...
Conflicts:
addons/common/functions/fnc_doAnimation.sqf
2015-09-21 15:08:43 -05:00
PabstMirror
9996aa22ab
Replace googles - isTurnedOut
2015-09-21 15:03:34 -05:00
commy2
a98e490f5c
Merge pull request #2512 from acemod/340fixaidisposable
...
fix ai seemingly reloading disposable launcher at mission start, fix #2508
2015-09-21 22:00:55 +02:00
commy2
f8676afca4
use correct macro for rpt writing
2015-09-21 21:56:18 +02:00
commy2
020915a52a
Revert "fix broken log warning macro"
...
This reverts commit b1f79f0383
2015-09-21 21:51:05 +02:00
commy2
441efcd65f
change version number in deprecated log
2015-09-21 21:48:18 +02:00
commy2
b1f79f0383
fix broken log warning macro
2015-09-21 21:39:45 +02:00
commy2
af309b937b
add depracted warnings
2015-09-21 21:25:18 +02:00
commy2
a1b2d63417
Merge pull request #2551 from acemod/commoncleanup11
...
common code cleanup part 11
2015-09-21 21:12:42 +02:00
commy2
0070ba113c
Merge pull request #2546 from acemod/overheatJamFFV
...
Allow fixing jam when in FFV slot
2015-09-21 19:51:14 +02:00
PabstMirror
1d5217d165
Medical - delayedUnconsicous fix waitAndExecute
2015-09-21 12:43:35 -05:00
commy2
5a5242f1c9
more common code cleanup
2015-09-21 19:19:49 +02:00
PabstMirror
4cc9b91d68
Merge pull request #2463 from acemod/cleanupNightvision
...
Cleanup Nightvision
2015-09-21 12:06:15 -05:00
PabstMirror
5a67b00540
Merge pull request #2507 from acemod/pythonSearchNilFuncs
...
Script to search for undefined functions
2015-09-21 12:05:27 -05:00
commy2
8503d15c9b
more common code cleanup
2015-09-21 18:37:19 +02:00
commy2
1a4ebdac51
more common code cleanup
2015-09-21 17:32:21 +02:00
commy2
13b487e13b
fix missing ;
2015-09-21 17:13:28 +02:00
commy2
b5b5c761c4
fix missing '' in info log macro
2015-09-21 17:09:10 +02:00
commy2
3037181fc2
more common code cleanup
2015-09-21 17:00:53 +02:00
commy2
df3211cc42
more common code cleanup
2015-09-21 14:20:53 +02:00
commy2
b0f9eab1f7
more common code cleanup
2015-09-21 13:53:12 +02:00
commy2
5adca6616d
Merge branch '323cleanuphitpoints' into commoncleanup10
2015-09-21 13:24:12 +02:00
commy2
9fa6eb0651
more common code cleanup
2015-09-21 13:08:10 +02:00
commy2
ef099861a3
Merge pull request #2545 from acemod/commoncleanup9
...
common code cleanup part 9
2015-09-21 09:24:41 +02:00
bux578
9be4072a10
Merge pull request #2547 from gienkov/patch-34
...
Add missing english string
2015-09-21 08:44:31 +02:00
bux578
549a3e0a2a
Merge pull request #2548 from gienkov/patch-35
...
Add missing english string
2015-09-21 08:44:16 +02:00
commy2
d802cdfb23
more common code cleanup
2015-09-21 01:41:17 +02:00
commy2
d449e4bd83
more common code cleanup
2015-09-21 01:07:49 +02:00
PabstMirror
5555eb195a
Also search for missing stringtable entries
2015-09-20 17:46:43 -05:00
Grzegorz
89a1495534
Add missing english string
2015-09-21 00:42:08 +02:00
Grzegorz
29db26eb58
Add missing english string
2015-09-21 00:40:14 +02:00
Grzegorz
fe75aa55cf
Add missing english string
2015-09-21 00:39:13 +02:00
commy2
5f7d8c0095
more common code cleanup
2015-09-21 00:34:04 +02:00
commy2
1679235b51
more common code cleanup
2015-09-21 00:28:25 +02:00
PabstMirror
345b1f0f98
Merge branch 'master' into miscFixNilFunctions
...
Conflicts:
addons/common/functions/fnc_execPersistentFnc.sqf
addons/common/functions/fnc_execRemoteFnc.sqf
2015-09-20 17:02:49 -05:00
PabstMirror
79d4eb62be
Allow fixing jam when in FFV slot
2015-09-20 16:55:33 -05:00
commy2
1d4eb209a4
fix missing ; in dumpPerformanceCounters
2015-09-20 23:50:30 +02:00
commy2
ffc5a16384
more common code cleanup
2015-09-20 23:40:51 +02:00
commy2
a98a45e5d1
more common code cleanup
2015-09-20 23:18:51 +02:00
commy2
62ec00a251
more common code cleanup
2015-09-20 22:36:05 +02:00
commy2
5fd1938f25
more common code cleanup
2015-09-20 22:29:38 +02:00
commy2
493ce1b092
more common code cleanup
2015-09-20 22:16:51 +02:00
commy2
2348c25e1a
more common code cleanup
2015-09-20 20:25:25 +02:00
PabstMirror
86fae2c251
#2528 - addToLog date / missing string fullHeal
2015-09-20 13:19:51 -05:00
PabstMirror
0c8a694b96
Medical_menu settings under medical category
2015-09-20 12:07:44 -05:00
PabstMirror
610fb0bb2c
Fix Merge
2015-09-20 11:28:43 -05:00
PabstMirror
7687374fcf
Merge branch 'master' into miscFixNilFunctions
...
Conflicts:
addons/common/functions/fnc_resetAllDefaults.sqf
2015-09-20 11:25:33 -05:00
Alessandro Foresi
aabc437314
Remove: pain diagnosis on dead patients
2015-09-20 17:37:33 +02:00
PabstMirror
9c61f256bc
Rem debug
2015-09-20 10:06:24 -05:00
PabstMirror
789f3843d5
#2488 - Fix cargo setVariable on server with InitPost
2015-09-20 10:05:34 -05:00
commy2
0a01bbdc76
more common code cleanup
2015-09-20 16:56:35 +02:00
commy2
e62683a0c4
more common code cleanup
2015-09-20 16:40:49 +02:00
commy2
e8ebe87450
more common code cleanup
2015-09-20 15:52:40 +02:00
alganthe
4265b11d51
wrong target fixed
...
Signed-off-by: alganthe <alganthe@live.fr>
2015-09-20 14:13:22 +02:00
Glowbal
461028b4e8
Merge pull request #2521 from acemod/fix-ctd-medical
...
Fixed CTD on overpressure with advanced medical enabled
2015-09-20 12:44:58 +02:00
Glowbal
8279f60d09
Merge pull request #2529 from acemod/repairCanInteractCheck
...
Add CanInteractWith checks for repair
2015-09-20 11:48:10 +02:00
Glowbal
409c2d5f78
Merge pull request #2505 from acemod/fixBFT
...
Run BFT module on server
2015-09-20 11:46:03 +02:00
commy2
4c4785c140
Merge pull request #2535 from acemod/commoncleanup7
...
common code cleanup part 7
2015-09-20 11:06:38 +02:00
commy2
d33a98c612
set variable public didn't work / didn't work on server and headless client
2015-09-20 11:02:15 +02:00
commy2
8c8b23ec18
Merge pull request #2530 from acemod/commoncleanup6
...
common code cleanup part 6
2015-09-20 10:44:31 +02:00
PabstMirror
05f4dad764
maptools - Remove debug
2015-09-19 20:42:46 -05:00
commy2
dfa6d71a64
more common code cleanup
2015-09-20 00:55:58 +02:00
commy2
73a9c1b5f8
more common code cleanup
2015-09-19 23:18:07 +02:00
commy2
6b96c7fd7c
more common code cleanup
2015-09-19 22:27:23 +02:00
commy2
bfd5d13de8
more common code cleanup
2015-09-19 21:33:25 +02:00
bux578
450ee98004
Merge pull request #2515 from acemod/340fixinventoryeh
...
fix playerInventoryChanged eventhandler triggers when current weapon is changed fix #2513
2015-09-19 21:04:48 +02:00
PabstMirror
db41537f56
#2524 - Take Unconscious captive
2015-09-19 13:58:34 -05:00
commy2
09f133b7f8
more common code cleanup
2015-09-19 20:55:35 +02:00
SilentSpike
35d94e8d5c
Fix medical litter scopeCurator values
...
Solves #2526 where medical litter would appear in zeus with no name.
2015-09-19 19:37:38 +01:00
commy2
3ddaa5ed4a
more common code cleanup
2015-09-19 20:34:07 +02:00
commy2
1636e3976d
more common code cleanup
2015-09-19 20:17:38 +02:00
commy2
cbc7f961b2
more common code cleanup
2015-09-19 19:40:56 +02:00
commy2
20a5c79431
more common code cleanup
2015-09-19 19:26:45 +02:00
commy2
6ee5c6d9f8
Merge pull request #2510 from acemod/commoncleanup5
...
common code cleanup part 5
2015-09-19 18:50:28 +02:00
commy2
fb71e0594e
lsd module, use global variable for color
2015-09-19 18:47:00 +02:00
PabstMirror
8573238cff
Merge branch 'release'
2015-09-19 11:21:33 -05:00
PabstMirror
3c93c2c95c
#2525 - Add CanInteractWith checks for repair
2015-09-19 11:07:03 -05:00
PabstMirror
79d985a648
Fix XEH Warning Debug
...
Wait 5 to let supMon run first, and only show visual error if actually
missing pbo.
2015-09-19 10:43:29 -05:00
PabstMirror
2e09a7aa4b
"cherrypick" PR #2496 (lockpick)
2015-09-19 10:02:37 -05:00
Alessandro Foresi
22ac16ead5
Changed: Seeker to aimPoint instead of ASL position
2015-09-19 16:22:36 +02:00
Glowbal
1d7cbf40ca
Fixed incorrect handleDamage call
2015-09-19 11:52:35 +02:00
commy2
e08c6c343e
fix LSD module, cutback on global variable usage
2015-09-19 09:24:28 +02:00
commy2
1357d72f16
fix broken LSD module
2015-09-19 02:44:02 +02:00
commy2
25d1e46422
Merge branch 'commoncleanup5' of https://github.com/acemod/ACE3 into commoncleanup5
2015-09-19 01:50:37 +02:00
commy2
c7d636a533
more common code cleanup
2015-09-19 01:50:17 +02:00
jokoho48
e7ff41a03c
Merge branch 'commoncleanup5' of https://github.com/acemod/ACE3 into commoncleanup5
2015-09-19 01:12:20 +02:00
jokoho48
f2070deee8
Change spawn while to CBA PFH
2015-09-19 01:12:03 +02:00
commy2
f8ecf1b8ab
fnc_debug was broken
2015-09-19 00:30:36 +02:00
commy2
30ba4f5586
this append should've been pushBack
2015-09-18 23:34:49 +02:00
commy2
56f4cbb39e
fix playerInventoryChanged eventhandler triggers when current weapon is changed fix #2513
2015-09-18 23:03:35 +02:00
commy2
2e48a92eef
fix ai seemingly reloading disposable launcher at mission start, fix #2508
2015-09-18 22:25:09 +02:00
commy2
85fd9d9d75
more common code cleanup
2015-09-18 21:46:21 +02:00
PabstMirror
5f0d73bab6
Cleanup more stuff
2015-09-18 14:24:20 -05:00
commy2
f3a175e9d6
remove obsolete private
2015-09-18 21:15:06 +02:00
commy2
5d0a7ed062
more common code cleanup
2015-09-18 21:12:40 +02:00
PabstMirror
c62ea5e406
Fix some nil functions
2015-09-18 13:47:19 -05:00
commy2
a53d158a89
Merge pull request #2501 from acemod/commoncleanup4
...
common code cleanup part 4
2015-09-18 19:54:04 +02:00
PabstMirror
65b8585d60
Use _player instead of ACE_player
2015-09-18 12:48:59 -05:00
commy2
8704cd0321
fix additional bracket, formatting
2015-09-18 19:40:48 +02:00
PabstMirror
c21a5d6f08
Merge pull request #2496 from acemod/fixLockPick
...
Fix for #2495
2015-09-18 12:28:51 -05:00
PabstMirror
97921aa665
#2503 - run BFT module on server
2015-09-18 12:18:43 -05:00
commy2
a18f63d861
more common code cleanup
2015-09-18 19:12:38 +02:00
commy2
2674310e65
remove another deprecated function
2015-09-18 18:45:41 +02:00
esteldunedain
a621a0c693
Fixes to spanish translations
2015-09-18 13:36:57 -03:00
commy2
1fd2fcafb0
remove old, not working functions
2015-09-18 18:34:29 +02:00
commy2
1b96caedc0
more common code cleanup
2015-09-18 18:28:19 +02:00
esteldunedain
3422f5a7f1
Merge branch 'master' of https://github.com/Legolasindar/ACE3 into spanish-translation
...
Conflicts:
addons/medical/stringtable.xml
addons/repair/stringtable.xml
2015-09-18 13:20:22 -03:00
commy2
a8ba96a01b
more common code cleanup
2015-09-18 16:41:00 +02:00
commy2
39786420fa
more common cleanup
2015-09-18 16:33:53 +02:00
commy2
c0fdd80ba4
formating
2015-09-18 16:00:58 +02:00
commy2
7efcfcc8a0
more common cleanup
2015-09-18 15:40:51 +02:00
commy2
f83dea6e01
formatting, remove an obsolete private
2015-09-18 14:32:58 +02:00
commy2
b0704e486f
more common cleanup
2015-09-18 13:09:40 +02:00
commy2
3a027ff26f
more common cleanup
2015-09-18 09:38:19 +02:00
commy2
e833c3fc42
more common cleanup
2015-09-18 08:47:14 +02:00
commy2
fc82018c49
more common cleanup
2015-09-18 08:23:18 +02:00
commy2
df2c7dce78
replace old pushback macro
2015-09-18 07:53:36 +02:00
commy2
475c193060
common code cleanup part 2
2015-09-18 07:42:10 +02:00
jokoho48
c5eb6e0070
posible fix for #2495
2015-09-18 04:12:18 +02:00
commy2
37c1dbd6f7
Merge pull request #2490 from acemod/commoncleanup
...
cleanup common
2015-09-17 23:59:10 +02:00
PabstMirror
a9946e26a5
Merge pull request #2489 from acemod/fixSpareParts
...
only run addSpareParts on server
2015-09-17 16:44:31 -05:00
PabstMirror
81f427ad82
Merge branch 'fixSpareParts' into release
2015-09-17 16:43:54 -05:00
commy2
27ca3dc7bd
Merge pull request #2471 from acemod/340noactionmenu
...
optional pbo to hide select weapon actions
2015-09-17 22:47:35 +02:00
commy2
3927103a86
Merge pull request #2483 from acemod/340staticmgfcs
...
add fcs to static machine guns
2015-09-17 22:47:23 +02:00
commy2
ca43520b7f
Merge pull request #2482 from acemod/340fixdaylaserlight
...
fix daylasers being a virtual light source
2015-09-17 22:47:13 +02:00
commy2
cfc7102cb6
Merge pull request #2481 from acemod/340loadcargohint
...
display text when loading / unloading cargo
2015-09-17 22:47:05 +02:00
commy2
7336e694c1
Merge pull request #2480 from acemod/340doanim2tweak
...
tweak doAnimation switchMove to do no akward camera jumps whenever possible
2015-09-17 22:46:54 +02:00
PabstMirror
7faee2e6ff
Merge pull request #2492 from acemod/fixCPR
...
Fix CPR params
2015-09-17 12:37:45 -05:00
PabstMirror
5fc127e94c
#2491 - fix params
2015-09-17 11:34:32 -05:00
commy2
36a279012c
cleanup common
2015-09-17 18:25:02 +02:00
PabstMirror
3b1a9ab415
#2488 - only run addSpareParts on server
2015-09-17 11:19:47 -05:00
commy2
a03bc44ba0
add fcs to static machine guns, close #1188
2015-09-17 14:40:58 +02:00
commy2
864c0b4baf
fix daylasers being a virtual light source, fix #2416
2015-09-17 14:17:48 +02:00
commy2
42a754a981
display text when loading / unloading cargo
2015-09-17 13:43:55 +02:00
KoffeinFlummi
067b08611e
Fix missing newlines
2015-09-17 12:54:26 +02:00
KoffeinFlummi
49cc207e6b
Merge remote-tracking branch 'origin/pr/2397' into polish-merge
2015-09-17 12:53:47 +02:00
commy2
a09ca8fb80
tweak doAnimation switchMove to do no akward camera jumps whenever possible, fix #2474
2015-09-17 12:23:56 +02:00
kaban
4d2707eae2
Russian Translations - Update
2015-09-17 12:21:21 +03:00
kaban
341e122e4c
Russian Translations - Update
2015-09-17 11:43:14 +03:00
commy2
014203413d
handle optional pbos in checkFiles
2015-09-17 02:13:21 +02:00
commy2
ca72770c48
add english translation to switch units module
2015-09-16 23:49:34 +02:00
commy2
6d80740a20
don't default to english on the switch units module description
2015-09-16 23:29:07 +02:00
PabstMirror
b8c687611e
Merge branch 'release'
2015-09-16 14:10:02 -05:00
ViperMaul
c748e56f4a
bump v3.3.1.2
2015-09-16 11:42:01 -07:00
commy2
b7715152e2
correct cargo capacities for quads, karts, boats and jets
2015-09-16 20:12:56 +02:00
alganthe
49e0befbaf
added diagnose to torso
...
Signed-off-by: alganthe <alganthe@live.fr>
2015-09-16 19:44:44 +02:00
commy2
f383e8701d
increase trucks cargo space
2015-09-16 19:27:32 +02:00
PabstMirror
06a9f60281
Cleanup Nightvision
2015-09-16 10:55:23 -05:00
PabstMirror
539e158a97
Merge branch 'release'
2015-09-16 10:35:19 -05:00
ViperMaul
e78b59c28a
bump to 3.3.1.1
2015-09-16 05:09:48 -07:00
ViperMaul
f83a76b304
Merge pull request #2458 from acemod/FixAB
...
Fix Advaced Basllistic Performance bug
2015-09-16 05:07:26 -07:00
jokoho48
c1baf4f8f7
tweak Vales for B_Truck_01_Base and B_Truck_01_box_F
2015-09-16 12:45:08 +02:00
Ivan Navarro Cabello
463e21dd91
330
2015-09-16 12:40:30 +02:00
jokoho48
a24e5b4665
fix Performance issue in AB
2015-09-16 11:54:49 +02:00
gienkov
e2f9b31fb2
small fix + repair translation
2015-09-16 11:53:05 +02:00
gienkov
a66f4d0e09
Merge remote-tracking branch 'origin/master' into pl-translation-8
2015-09-16 11:44:35 +02:00
gienkov
b94df35c08
Revert "fixed duplicate stringtable entries"
...
This reverts commit ab02bed1c1
2015-09-16 11:42:45 +02:00
ViperMaul
8330aadb6f
bump version to 3.3.1
2015-09-15 17:56:57 -07:00
PabstMirror
2c2d79cfe0
Merge pull request #2439 from acemod/badXEHcheck
...
Bad xeh check
2015-09-15 19:46:10 -05:00
PabstMirror
e254af9964
Fix missing )
2015-09-15 19:26:37 -05:00
PabstMirror
1ea1094a73
Merge branch 'release'
2015-09-15 16:16:10 -05:00
Glowbal
a124b05672
Revert "disable a10 tracers, commanche tracers only nvg"
2015-09-15 21:25:01 +02:00
Glowbal
c6c51af548
Updated build version
2015-09-15 21:13:36 +02:00
Glowbal
7e5ab07e32
Merge pull request #2387 from acemod/FixHCPPE
...
Fix that PPEffects Throw a error on HC
2015-09-15 21:04:37 +02:00
Glowbal
b2b221db20
Merge pull request #2441 from SzwedzikPL/air_no_tracers
...
disable a10 tracers, commanche tracers only nvg
2015-09-15 21:02:40 +02:00
PabstMirror
88f89b8d76
also check allDeadMen
2015-09-15 13:30:04 -05:00
PabstMirror
a8688609d7
Typo
2015-09-15 13:10:06 -05:00
Glowbal
3cc2ccf025
Merge pull request #2438 from acemod/wheelRepairSettingToolkit
...
Add Setting for toolkit requirement for wheel repair
2015-09-15 20:04:38 +02:00
PabstMirror
0e32c28552
#2437 - Warn users when mods break XEH
2015-09-15 12:55:08 -05:00
PabstMirror
db37fa0e04
Update stringtable.xml
2015-09-15 11:45:02 -05:00
PabstMirror
c50c53e5bb
remove debug
2015-09-15 09:57:53 -05:00
PabstMirror
9cd470b849
Add Setting for toolkit requirement for wheel repair
2015-09-15 09:54:55 -05:00
commy2
2c7a2b4140
Merge pull request #2406 from acemod/captiveOnRespawn
...
Reset captive status on respawn for reliability
2015-09-15 16:37:01 +02:00
gienkov
6588237e8c
stringtable DAGR
2015-09-15 15:05:30 +02:00
PabstMirror
17fdce7196
Cleanup preInit
2015-09-15 08:03:56 -05:00
Glowbal
478b618e4b
Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros
...
Feature/switch to log macros
2015-09-15 14:51:23 +02:00
PabstMirror
d6d64b58b0
Merge pull request #2430 from acemod/microDagr-customDrawEvents
...
microDagr - Add ability to access draw event for minimap
2015-09-14 23:36:07 -05:00
PabstMirror
f419762653
Fix time of flight display
2015-09-14 23:33:32 -05:00
PabstMirror
db41512dc0
#2349 - Don't disable locking for base RocketPods
2015-09-14 22:11:12 -05:00
PabstMirror
61cbe543ee
Fix #2432 - Don't check for null attached when mounted
2015-09-14 18:06:46 -05:00
PabstMirror
e029e8318f
microDagr - Add ability to access draw event for minimap
2015-09-14 16:37:39 -05:00
Glowbal
16b7bb389c
Merge pull request #2428 from acemod/FixMainMenuInfo151
...
Fix main menu info151
2015-09-14 23:30:00 +02:00
Glowbal
d52cc917ea
Merge pull request #2419 from acemod/FixBBTexturePath2
...
Fix Bandage Texture Path and UV
2015-09-14 23:26:00 +02:00
Glowbal
4b6082d836
Merge pull request #2424 from acemod/medical-tweaks
...
Medical tweaks
2015-09-14 23:20:50 +02:00
Glowbal
7b7ad6eea8
fixed tweak to basic bandage
2015-09-14 23:18:20 +02:00
PabstMirror
f7bd557a30
Fix some stringtable weirdness
2015-09-14 16:11:43 -05:00
Glowbal
10ac127159
Fixed incorrect new damage value in handleDamage advanced.
...
The new handleDamage from BI added a new value to the parameters that we didn't account for in handleDamage advanced.
2015-09-14 21:15:57 +02:00
Glowbal
33ac78dbac
Addresses the large amount of bandages required in basic medical
...
This should restore the bandaging behavior back to how it is before the adjustments made to basic medical
2015-09-14 21:14:56 +02:00
Glowbal
8c60e76979
Tweaks made to improve determine if fatal algorithm
2015-09-14 21:13:58 +02:00
Glowbal
37639066c2
Include missing frame in the caching execution
2015-09-14 15:19:58 +02:00
Glowbal
6d4744b9ea
Increased duration of knock down for basic medical
2015-09-14 15:19:18 +02:00
Glowbal
032dd6c87c
Tweaked visual effects.
2015-09-14 15:18:56 +02:00
jokoho48
fb75f6ad9e
Fix Bandage Texture Path and UV
2015-09-13 18:57:07 +02:00
gienkov
530dfa041d
stringtable DAGR
2015-09-12 21:25:02 +02:00
jokoho48
b2b41ce8af
Merge branch 'release' of https://github.com/acemod/ACE3 into release
2015-09-12 18:13:12 +02:00
jokoho48
5feee53c69
Posible fix for #2407
2015-09-12 18:12:57 +02:00
SilentSpike
7c846502b5
Reset captive status on respawn for reliability
...
Previously we were resetting on death, but this caused problems when the respawnDelay was 0 as the dead unit wasn't actually the player.
To account for "group" and "side" respawn types where you change unit on respawn and could potentially become a captive unit, I am explicity checking the mission respawn type before resetting variables.
2015-09-12 15:42:20 +01:00
SilentSpike
e6c2916a14
Fix spectator template for negligible respawnDelay
...
When the value of respawn delay is 0 the timing of the killed and respawn events can be a little strange and result in spectator being entered but never exited. The respawn template should just do nothing when the delay is so small.
2015-09-12 14:02:42 +01:00
bux578
9748abdb48
change order of BloodPressure readout, fix #2400
2015-09-12 10:58:29 +02:00
BaerMitUmlaut
8ee1136758
Rewrite canPassMagazine condition
2015-09-11 23:52:00 +02:00
gienkov
ef36b27fe2
medical pl translation
2015-09-11 23:49:41 +02:00
gienkov
ab02bed1c1
fixed duplicate stringtable entries
2015-09-11 23:42:03 +02:00
jonpas
3de783d3a7
Cleanup for branch release, picked from #2366
2015-09-11 19:57:21 +02:00
BaerMitUmlaut
ccf1bf1de7
Cleaned up canPassMagazine condition
2015-09-11 18:24:46 +02:00
jonpas
6fb22ebd11
Added isNull check to PFH for explicity
2015-09-11 17:55:28 +02:00
jonpas
efa8252b45
Remove debug
2015-09-11 17:43:29 +02:00
jonpas
2d3a02085e
Improved comment
2015-09-11 17:27:08 +02:00
jonpas
d49798144c
Replaced hasChairMoved with isEqualTo, fixed missing variable
2015-09-11 17:25:46 +02:00
jokoho48
b7e02da1cc
remove if (!hasInterface) from PFH
...
move ! in ()
2015-09-11 16:58:26 +02:00
jonpas
c5f9f85d27
Updated comment
2015-09-11 16:53:09 +02:00
jonpas
0b9c6254e4
Removed redundant rotation control - changed to config
2015-09-11 16:46:51 +02:00
SilentSpike
aa7b6cf39f
Improve angular behaviour of spectator camera
...
Changes the position calculation of the external spectator camera to correctly retain the pan and tilt of the free camera. Makes transitioning between the two less disorienting for the user.
2015-09-11 14:46:21 +01:00
SilentSpike
77c2b99ee5
Change spectator external camera behaviour
...
Using the "external" view is limited by the server difficulty setting. Instead the spectator external camera has been replaced with an oribtal camera as was originally planned to be added alongside the default views.
2015-09-11 14:46:21 +01:00
BaerMitUmlaut
a29902ddb3
More use of params, event system, removed compile
2015-09-11 15:36:23 +02:00
SilentSpike
17f9eab03a
Improve display name of medical heal hitpoints setting
...
ace_medical_healHitPointAfterAdvBandage had a slightly misleading display name that didn't quite convey what it is actually doing
2015-09-11 12:33:18 +01:00
BaerMitUmlaut
45bfa3eaf5
Fixed vanishing mags and localized hint
2015-09-10 22:23:37 +02:00
Glowbal
f60954a49b
increased build number (3.3.0.1)
2015-09-10 22:18:13 +02:00
KoffeinFlummi
70dfbe2ec0
Fix some merging errors
2015-09-10 22:11:09 +02:00
KoffeinFlummi
63c2712360
Merge branch 'release' into portuguese
2015-09-10 21:59:30 +02:00
KoffeinFlummi
c2ffe7cad0
Merge branch 'release' into russian
2015-09-10 21:05:32 +02:00
KoffeinFlummi
a5621604fd
Merge branch 'release' into czech
2015-09-10 20:51:33 +02:00
KoffeinFlummi
83aa2cc68c
Merge branch 'release' into french
2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be
Update French translations
2015-09-10 19:14:51 +02:00
jokoho48
cc9cdae972
Merge branch 'release' of https://github.com/acemod/ACE3 into FixHCPPE
2015-09-09 20:25:48 +02:00
Glowbal
82d9e70c88
Merge pull request #2385 from jokoho48/BackBlastEnhanced
...
Back blast enhanced
2015-09-09 19:39:32 +02:00
jonpas
e07b71faf0
Merge branch 'master' into parseList
...
Conflicts:
addons/medical/functions/fnc_moduleAssignMedicRoles.sqf
addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
2015-09-09 19:13:04 +02:00
jokoho48
defbdf1b1a
fix that HC throw a issue if PPEffect was used/applyed
2015-09-09 17:05:48 +02:00
Michael Braun
a5fb09a7e1
Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
...
Conflicts:
addons/repair/functions/fnc_moduleRepairSettings.sqf
2015-09-09 02:55:12 +02:00
jokoho48
1ed52e08bf
fix missing default
2015-09-08 19:45:46 +02:00
Glowbal
6a31140f7d
Version 3.3.0
2015-09-08 19:38:52 +02:00
Glowbal
d6b51b2138
Merge pull request #2374 from acemod/microDagr
...
Move MicroDAGR 3D model from BFT branch to microdagr module reopen #2373
2015-09-08 19:31:02 +02:00
Glowbal
0c371ddf37
disabled debug for medical
2015-09-08 19:06:01 +02:00
BaerMitUmlaut
c26107bc5c
Added ability to pass a magazine
2015-09-08 14:07:16 +02:00
ProfessorCZ
a28e9d96c7
Czech Translations - Update
2015-09-07 17:40:14 +02:00
gienkov
ad50c1ab4b
medical and repair translation
2015-09-07 16:15:18 +02:00
jokoho48
7f6e7de68c
Add LoD
...
Lower Poly in Shadow LoD
2015-09-07 16:10:55 +02:00
gienkov
c4475ff5be
Merge branch 'pl-translation-7' of https://github.com/gienkov/ACE3 into pl-translation-7
2015-09-07 16:06:17 +02:00
gienkov
1edcc320d1
Merge remote-tracking branch 'origin' into pl-translation-7
2015-09-07 16:05:45 +02:00
Glowbal
7b349ab388
Merge pull request #2361 from acemod/medical-adjustments2
...
Medical adjustments2
2015-09-07 15:51:27 +02:00
nsgundy
eee5664ec5
Move MicroDAGR 3D model from BFT branch to microdagr module
2015-09-07 11:05:18 +02:00
ViperMaul
2fc35338d5
Build number for Release Candidate
2015-09-06 21:37:20 -07:00
jokoho48
45eb8c4822
Add Code for CBA update 2.1
2015-09-06 19:34:46 +02:00
commy2
adb1a11211
increase leg and arm armor value, more TRACE debug
2015-09-06 11:49:08 +02:00
[OMCB]kaban
78084f271a
Changed "Effect Zeus RC" to "Affects Zeus RC"
2015-09-06 07:11:27 +03:00
jonpas
f45c0334fc
Added spaces
2015-09-06 03:49:52 +02:00
ViperMaul
98202f4f38
Additional debug statements for caching and wounds.
2015-09-05 15:31:14 -07:00
jonpas
f2bfc385eb
Merge branch 'master' into removeVignetteAndCleanUI
...
Conflicts:
addons/ui/README.md
addons/ui/config.cpp
2015-09-05 22:00:51 +02:00
jonpas
ce1c735d89
Removed Vignette, Cleaned up UI
2015-09-05 21:57:22 +02:00
Glowbal
a745b07cb6
Merge pull request #2365 from jonpas/addSparePartsSettingInitDelay
...
Used new setting init delay function in addSpareParts
2015-09-05 21:18:25 +02:00
jonpas
06baa5e4d3
Fixed nilCheck, changed moduleAddSpareParts to use new parseList
2015-09-05 20:51:48 +02:00
jonpas
8fc061bfd6
Merge branch 'master' into parseList
2015-09-05 20:16:59 +02:00
jonpas
a2dd77ca70
Use splitString instead of BIS_fnc_splitString
2015-09-05 20:15:31 +02:00
Jonathan Pereira
7147891710
Added latest ACE3 PT-BR translations
2015-09-05 15:12:31 -03:00
jonpas
f22072a94d
Use pushBack instead of array compiling
2015-09-05 19:57:35 +02:00
jonpas
a8412361bd
Use setting init delay function for addSpareParts
2015-09-05 19:33:25 +02:00
TheMagnetar
27a0e8f639
Repair: Fix possible out of bounds setting
...
Setting "engineerSetting_fullRepair" had an out of bounds default value.
2015-09-05 16:30:00 +02:00
Glowbal
315f46c6c6
Merge branch 'master' into medical-adjustments2
2015-09-05 14:41:25 +02:00
Glowbal
0a6b77b902
Removed more deprecated wound sync code
2015-09-05 14:10:28 +02:00
Glowbal
e4c246984f
Removed another debug trace that should not be there
2015-09-05 14:10:04 +02:00
Glowbal
d9af19df28
properly fixes unconscious weird behavior. Because it never registered any unconscious conditions.
2015-09-05 14:08:46 +02:00
Glowbal
41db78b52b
Merge pull request #2341 from acemod/323tracers
...
better scaling for tracer sizes, fix #1008
2015-09-05 13:47:37 +02:00
commy2
46d741281b
Merge pull request #2358 from acemod/322flashbangexplosive
...
sort flashbang under explosive grenades, not misc grenades
2015-09-05 13:40:24 +02:00
Glowbal
a4b4c5d2a3
Merge pull request #2187 from jonpas/trackToTrackedVehicles
...
Added Spare Parts module handling
2015-09-05 13:36:42 +02:00
Glowbal
dad96822be
Only add 1/4 of the new damage to pain instead of everything.
2015-09-05 13:27:02 +02:00
Glowbal
6405ef7d91
Merge branch 'master' into medical-adjustments2
2015-09-05 13:22:44 +02:00
Glowbal
f15a1c033d
Added allowSelfTreatment attribute to treatment actions
2015-09-05 13:20:19 +02:00
Glowbal
f0a074072f
Merge pull request #2329 from acemod/323medicalstrcturaldamage
...
setStructuralDamage function
2015-09-05 13:16:13 +02:00
Glowbal
446f367f8b
Merge pull request #2359 from acemod/fixRestoreGear
...
fix restore gear
2015-09-05 13:09:21 +02:00
Glowbal
9c7f7429d1
Merge pull request #2350 from jonpas/cargoHideActionOnLocked
...
Prevent Cargo opening if vehicle is locked
2015-09-05 13:09:14 +02:00
Glowbal
a4e406658f
Reduced initial knockdown time for basic medical
2015-09-05 13:02:19 +02:00
Glowbal
17ad7ecb8c
replaced diag_logs by trace
2015-09-05 12:59:09 +02:00
Glowbal
9c0288cd3f
Removed debug message
2015-09-05 12:55:49 +02:00
Glowbal
c8a7b94777
Merge pull request #2363 from acemod/MedicalMenuBlackoutBlur
...
Add Screen Blur and Blackout for Medical Menu by Interact_menu setting
2015-09-05 12:53:04 +02:00
Glowbal
d617fba6c6
Merge branch 'master' into medical-adjustments2
2015-09-05 12:51:18 +02:00
