Commit Graph

4754 Commits

Author SHA1 Message Date
ViperMaul
47ef53201a Set version number to 3.1.1 2015-06-16 22:41:04 -07:00
Glowbal
a8998690ea Merge pull request #1650 from acemod/tacticalladderFixes
Fixed model.cfg and requiredAddons
2015-06-17 07:36:01 +02:00
ulteq
82d80359d1 Fixes: https://github.com/acemod/ACE3/issues/1646 2015-06-16 21:57:12 +02:00
Nicolás Badano
2afcf92643 Merge pull request #1440 from legman/akalegman
IED Class Inheritance Fixes
2015-06-16 13:35:19 -03:00
PabstMirror
196f3bd86b Add concertinawire to wirecutters 2015-06-15 23:59:21 -05:00
AKALegman
c027db2e0e final fixes 2015-06-15 20:55:49 +01:00
Nicolás Badano
fbf99224c4 Merge pull request #1635 from jonpas/fixCheckPBOkick
Fixed CheckPBO Kick
2015-06-15 15:43:28 -03:00
jonpas
04c06b51ed Fixed #1632 - CheckPBOs kick serverCommand changed to display 46 2015-06-15 20:23:16 +02:00
jonpas
f61066f11a Fixed checkPBO function not executing on server 2015-06-15 19:55:30 +02:00
Glowbal
f8aa9a3171 Merge pull request #1621 from acemod/hrIncrease
Medical - change hrIncrease random min/max
2015-06-15 10:42:43 +02:00
AKALegman
5915e24f5d some fixes 2015-06-14 16:09:01 +01:00
ulteq
32f02b72a5 Fixed missing 'HitEngine' RPT warning. 2015-06-14 13:57:38 +02:00
Ivan Navarro Cabello
76f7962dac Updated spanish stringatable
Updated spanish stringatable for (Common, Medical, Optionsmenu,
Tacticalladder).
2015-06-14 13:52:55 +02:00
ulteq
14fd5c930b You can no longer connect to destroyed HuntIR cameras 2015-06-14 12:54:10 +02:00
ulteq
af2e2f71fd Added 'parachute' and 'camera' hitpoints to the HuntIR model:
* You can now shoot the parachute to make it fall faster
* And you can shoot the camera to kill the video feed
2015-06-14 12:25:56 +02:00
PabstMirror
1c5788baab Medical - change hrIncrease random min/max 2015-06-14 03:54:50 -05:00
ulteq
8d6b7de0ad Fixed model.cfg and requiredAddons 2015-06-14 10:37:21 +02:00
AKALegman
0690e6f745 fixed conflicts 2015-06-14 09:36:03 +01:00
ulteq
906e365b94 DAGR now supports the new multiple devices framework 2015-06-14 09:59:06 +02:00
ulteq
48d8d5e076 Empty default keys for the DAGR to prevent conflicts 2015-06-14 09:38:25 +02:00
PabstMirror
dff99c4736 Tweak HTML Size 2015-06-13 20:41:57 -05:00
Glowbal
91b54bfc3a Adds a back up function in sqf to assign open wounds. 2015-06-13 23:20:01 +02:00
ViperMaul
4c572ef298 Set version number to 3.1.0 2015-06-13 13:46:24 -07:00
jonpas
670d23e14c Fixed Black Cellphone Display after 1.46 2015-06-13 22:12:32 +02:00
jonpas
1eeca28a3d Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting 2015-06-13 22:08:13 +02:00
PabstMirror
4a8344e1a4 Merge branch 'master' into userActionPrototype
Conflicts:
	addons/interact_menu/ACE_Settings.hpp
	addons/interact_menu/stringtable.xml
	extensions/CMakeLists.txt
2015-06-13 15:05:57 -05:00
PabstMirror
f811fc797e Suppress optionsmenu debug 2015-06-13 15:03:22 -05:00
jonpas
254b386805 Allowed Kestrel4500 Inside and Sitting 2015-06-13 21:46:55 +02:00
ViperMaul
1322da5537 Merge pull request #1587 from acemod/fixVehicleUnconcious
fix animation and consistently unload units from vehicle
2015-06-13 12:44:34 -07:00
jonpas
29ce8f635e Merge branch 'master' into sitting
Conflicts:
	addons/kestrel4500/CfgVehicles.hpp
	addons/microdagr/CfgVehicles.hpp
2015-06-13 21:43:42 +02:00
ViperMaul
132ec343b0 Suppress debug 2015-06-13 12:39:29 -07:00
ViperMaul
911a18d169 Expand maxDistance for findEmptyPosition from 10 to 13 to support the GhostHawk
Convert ASLtoPosition
#1575 and #1577
2015-06-13 12:37:10 -07:00
PabstMirror
849a45d68b DAGR - has item check 2015-06-13 14:29:34 -05:00
PabstMirror
b2d69611d7 Merge pull request #1118 from acemod/multipleDevices
Multiple Devices
2015-06-13 14:20:38 -05:00
PabstMirror
e7347be47b Increase delete delay for attached IR grenades (#1615) 2015-06-13 14:08:25 -05:00
Nicolás Badano
d262dc790f Merge pull request #1616 from acemod/addMk16ToClaymore
Make claymores detonatable by MK16. Close #1603
2015-06-13 16:07:56 -03:00
PabstMirror
0c45d2308a Merge pull request #1150 from acemod/mainMenuVersionHTML
Show Version / HTML Git Version on main menu
2015-06-13 14:07:36 -05:00
Nicolás Badano
179ad6c214 Merge pull request #1526 from acemod/rainExperiment
Update rain each frame
2015-06-13 16:07:25 -03:00
esteldunedain
1237b1cb4a Make claymores detonatable by MK16. Close #1603 2015-06-13 16:05:18 -03:00
PabstMirror
f68a2310a8 Merge pull request #1589 from acemod/laserPointerSetting
Optional setting to disable laser pointer system
2015-06-13 13:56:01 -05:00
ulteq
c459a80bcb Merge pull request #1613 from ProfessorCZ/master
CZ - Translation (medical, tacticalladder)
2015-06-13 20:48:34 +02:00
Glowbal
5013254769 Merge pull request #1530 from legman/akalegman_zeus_unconscious
Fixed Zeus Unconscious
2015-06-13 20:48:18 +02:00
esteldunedain
d53ee1cf85 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into removeFrisk
Conflicts:
	addons/captives/CfgVehicles.hpp
2015-06-13 15:19:52 -03:00
PabstMirror
fdb30f4e68 Merge pull request #1599 from acemod/captivesFixes
Captives fixes
2015-06-13 13:15:29 -05:00
Glowbal
1c066a0b3f Merge pull request #1586 from acemod/dynamicPAKtreatmentTime
PAK treatment time based on total amount of damage.
2015-06-13 20:14:57 +02:00
PabstMirror
6dba8b33da Merge pull request #1507 from acemod/fixJavelinLocking
Fix javelin locking
2015-06-13 12:54:06 -05:00
Glowbal
3e24749948 Merge pull request #1477 from alganthe/longer_flares
flares modified
2015-06-13 19:51:27 +02:00
ProfessorCZ
c9f29aefa2 CZ - Translation (medical, tacticalladder) 2015-06-13 19:49:59 +02:00
ProfessorCZ
bf464ffe00 CZ - Translation (medical, tacticalladder) 2015-06-13 19:46:31 +02:00
ulteq
c3340b174e Merge pull request #1609 from acemod/ace2EarRinging
Ported the ACE2 ear ringing logic
2015-06-13 19:44:15 +02:00
esteldunedain
3d5afd7d8f Close #1018 2015-06-13 14:32:18 -03:00
PabstMirror
6ab8b129fa Merge branch 'master' into multipleDevices
Conflicts:
	addons/common/XEH_postInit.sqf
2015-06-13 12:30:35 -05:00
ulteq
badfc4017c Reset 'deaf' on respawn 2015-06-13 19:27:30 +02:00
PabstMirror
e9750ddc9b Merge pull request #1611 from acemod/refineStaticInteration
Manual MainActions position for some statics weapons
2015-06-13 12:18:28 -05:00
ulteq
6d6c3a4285 Fixed function header 2015-06-13 19:17:26 +02:00
ulteq
022f9286e2 Fixed a bug in the caching routine 2015-06-13 19:12:24 +02:00
ulteq
3427f655b9 Removed debug output 2015-06-13 19:01:40 +02:00
ulteq
6d4f58c18e weapon magazines caching 2015-06-13 18:57:02 +02:00
ulteq
d9722db15e Abort if distance > 50m 2015-06-13 18:42:09 +02:00
ulteq
2509f1d840 Missing privates 2015-06-13 18:34:30 +02:00
ulteq
b6a710d282 Implemented a proper magazine lookup routine 2015-06-13 18:32:48 +02:00
ulteq
38dca2bb9e New loudness calculation for different ammo types 2015-06-13 18:19:35 +02:00
PabstMirror
2efc095c93 Merge branch 'master' into laserPointerSetting
Conflicts:
	addons/laserpointer/XEH_postInit.sqf
2015-06-13 11:02:00 -05:00
ulteq
db68b6c155 Increased loudness of missles and rockets. 2015-06-13 17:43:27 +02:00
Nicolás Badano
b17b44b869 Merge pull request #1601 from acemod/laserpointerCleanup
Privates, newline braces, typos
2015-06-13 12:25:21 -03:00
ulteq
feec8a14b7 Removed debug output 2015-06-13 17:23:45 +02:00
ulteq
eacd8e5a49 Removed debug output 2015-06-13 17:22:45 +02:00
ulteq
833634f010 Ported the ACE2 ear ringing logic 2015-06-13 17:16:18 +02:00
Nicolás Badano
c168afe8bb Merge pull request #1598 from acemod/serverModulesFirst
Fix Server not reading modules
2015-06-13 12:01:22 -03:00
ViperMaul
cb1d016a39 Merge pull request #1592 from ProfessorCZ/master
CZ - Translation
2015-06-13 07:39:18 -07:00
ViperMaul
cbb620ba98 Change setPos to setPosASL to support roof tops and multi-level objects and faster code.
#1575 and #1577
2015-06-13 07:24:50 -07:00
gienkov
3d440fc0da PL tactical ladder translation 2015-06-13 14:36:42 +02:00
Glowbal
e0bb3c0a4e Merge pull request #1602 from acemod/medicalFallingFix2
[Adv. Medical] Improved falling damage
2015-06-13 13:39:22 +02:00
Glowbal
ce908f0fb3 Merge pull request #1579 from acemod/medicalModuleOptions
[Adv. Medical]  New module options
2015-06-13 13:37:02 +02:00
ulteq
1c4566984f Removed debug output 2015-06-13 12:13:58 +02:00
ulteq
84d20f9794 Further improved the handling of falling damage:
* Makes sure _projectile is always "falling"
* Enables the creation of wounds in multiple body parts at once
* Caches the initial impact velocity for later damage calculation
* Adjusts the maxDamage value of Large Abrasions
2015-06-13 11:53:30 +02:00
ulteq
234b62b409 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medicalFallingFix2 2015-06-13 11:12:37 +02:00
ulteq
9b2ebfcbe8 Privates, newline braces, typos 2015-06-13 10:41:19 +02:00
ulteq
6eeeb22fcd Made use of the new stringtable macros 2015-06-13 09:51:49 +02:00
ulteq
b86e6b6043 Merge pull request #1493 from acemod/tacticalladder
Initial draft of the ACE2 tactical ladder port.
2015-06-13 09:37:41 +02:00
PabstMirror
45912c6ddb Handcuff icon for passengerActions 2015-06-13 00:12:13 -05:00
PabstMirror
9f15cfb650 Merge branch 'master' into captivesFixes 2015-06-13 00:02:41 -05:00
PabstMirror
58e5bc3581 Switch unload captive to passenger actions 2015-06-13 00:02:30 -05:00
PabstMirror
affe323435 Fix bodybag string macro 2015-06-12 23:19:17 -05:00
PabstMirror
177f590dda Make "InitSettingsFromModules" pfeh run on dedicated 2015-06-12 22:57:01 -05:00
PabstMirror
1804c6ceab Merge branch 'master' into serverModulesFirst 2015-06-12 22:40:04 -05:00
ViperMaul
1c0811aa31 Change from globalEvent to targetEvent
#1575 and #1577
2015-06-12 16:56:13 -07:00
ulteq
4160c7668c Workaround to prevent accidentally canceling the ladder deployment 2015-06-13 00:01:48 +02:00
ulteq
8336f1d192 Complete overhaul of the ladder interaction routine 2015-06-12 23:54:51 +02:00
ulteq
9499592322 Cleanup 2015-06-12 22:45:41 +02:00
ulteq
fd40c3a947 New backpack model from raspu:
* Fixes incorrect positioning
2015-06-12 22:14:19 +02:00
ulteq
1cbe972999 Merge pull request #1585 from acemod/huntirParachuteSpeed
HuntIR parachute falling speed experiment
2015-06-12 21:41:46 +02:00
ulteq
62fc0a90e6 Removed the model.cfg 2015-06-12 21:41:17 +02:00
ulteq
6fe7b15832 Removed debug output 2015-06-12 21:40:44 +02:00
Nicolás Badano
c45b443bbc Merge pull request #1597 from SzwedzikPL/interact_passengers_icons
slot icons in passengers menu
2015-06-12 15:38:45 -03:00
SzwedzikPL
ac87a28daa role icon for passengers 2015-06-12 20:32:10 +02:00
ulteq
1393b79a82 Reduced the descending speed of the parachute:
* Adjusted the geometry LOD mass in the huntir.p3d
* Fixed the calculating of the recording time
2015-06-12 20:22:09 +02:00
SzwedzikPL
19d3cd168c del extra space 2015-06-12 19:54:45 +02:00
SzwedzikPL
805c0e1c68 Open action for boxes 2015-06-12 19:48:28 +02:00
ulteq
9130546c8c DAGR overlay auto hide 2015-06-12 18:23:01 +02:00
ulteq
4b0c4b9dd6 handleDamage EH for the HuntIR 2015-06-12 18:01:53 +02:00
ProfessorCZ
acc5f4d29f CZ - Translation 2015-06-12 15:05:04 +02:00
ProfessorCZ
531372b2a3 CZ - Translation
Already in README
2015-06-12 14:50:50 +02:00
ulteq
604cd122d3 Experiment 2015-06-12 13:54:52 +02:00
ulteq
f84a936d95 Merge pull request #1504 from acemod/concertina_wire
Ported the ACE2 Concertina Wire
2015-06-12 13:42:32 +02:00
ulteq
2e0b837190 Merge pull request #1534 from acemod/dagr
Initial draft of the ACE2 DAGR port
2015-06-12 13:42:25 +02:00
ulteq
6ac2ca9208 Fixes _projectile not being updated 2015-06-12 11:48:49 +02:00
ulteq
46a73f3177 Added a function to calculate the PAK treatmentTime 2015-06-12 11:42:49 +02:00
PabstMirror
b960ae5d6b Optional setting to disable laser pointer system 2015-06-12 00:58:04 -05:00
PabstMirror
f48777462f Text Spacing 2015-06-11 23:59:51 -05:00
ViperMaul
072f2cc3a7 fix animation and consistently unload units from vehicle
#1575 and #1577
2015-06-11 15:56:11 -07:00
ulteq
99b13a584a PAK treatment time based on total amount of damage. 2015-06-11 22:54:08 +02:00
ulteq
be6d72606a Pain is always suppressed again 2015-06-11 22:35:50 +02:00
jonpas
b974a63947 Lowercased function, comment 2015-06-11 21:51:41 +02:00
ulteq
eff31db128 HuntIR parachute falling speed experiment 2015-06-11 21:50:43 +02:00
ulteq
d8877d0dbd Fixed 'spotterscope' typo; Moved m_m1070.paa into \data folder 2015-06-11 21:28:44 +02:00
jonpas
491e2a4429 Handle handcuffing 2015-06-11 20:01:38 +02:00
jonpas
0a71bd6931 Restricted sitting rotation 2015-06-11 19:46:16 +02:00
ulteq
ab85a9ceb6 Merge pull request #1582 from acemod/destroyableHuntIR
Made the HuntIR camera destroyable:
2015-06-11 19:40:00 +02:00
ulteq
f7a76480f9 Made the HuntIR camera destroyable:
* Shooting the parachute will increase its damage
* The falling speed now increases with damage
* Damaged cameras won't be able to transmit video
* The HuntIR spawn positions now really depends on the grenade trajectory
2015-06-11 19:37:51 +02:00
Nicolás Badano
0981a8dc3e Merge pull request #1581 from acemod/execNextFramePFEH
One PFEH for execNextFrame and waitAndExec
2015-06-11 13:53:08 -03:00
ulteq
35e2047dca Fixed two RVMAT files 2015-06-11 17:56:25 +02:00
ulteq
eef7c1295a Added new adv. medical module option 'painIsOnlySuppressed' 2015-06-11 17:36:18 +02:00
jonpas
46020259fd Fixed typo 2015-06-11 16:48:08 +02:00
ulteq
0c40c1b439 Added Adv. Medical module option 'healHitPointAfterAdvBandage':
* Changed the default value to '0'
2015-06-11 15:30:39 +02:00
ulteq
5394131fd1 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into tacticalladder 2015-06-11 12:44:15 +02:00
ulteq
0ec729ccd8 Allow configuring the DAGR while the map is opened. 2015-06-11 12:43:42 +02:00
ulteq
292e24e414 Merge pull request #1576 from acemod/keybindExceptions
Allowed using the ATrag, Kestrel and Rangecards inside of vehicles.
2015-06-11 12:06:01 +02:00
ulteq
ba15db7d6a Allowed using the ATrag, Kestrel and Rangecards inside of vehicles. 2015-06-11 12:05:46 +02:00
ulteq
b3538c972f Finished the DAGR port:
* Added keybinds
* Shortened the function names
* Made use of the GVAR macro for all global variable names
2015-06-11 11:56:25 +02:00
Glowbal
9d82b9a1f3 Merge pull request #1550 from acemod/medicalVanillaDamageFix
Attempt to fix #1465 and #1354
2015-06-11 10:25:50 +02:00
Glowbal
b6ed944123 Merge pull request #1563 from acemod/medicalCleanup
Cleanup
2015-06-11 10:25:28 +02:00
PabstMirror
3e396b416a One PFEH for execNextFrame and waitAndExec 2015-06-11 02:45:42 -05:00
PabstMirror
84a12bcd56 Can't escort when mounted (passenger actions) 2015-06-10 22:44:54 -05:00
ulteq
eb7a38e137 Merge pull request #1567 from acemod/rangecardMenu
Reordered the rangecard menu entries:
2015-06-10 22:57:16 +02:00
ulteq
3c753d74ec Reordered the rangecard menu entries:
* Also added the ability to copy your own rangecards
* Reference: https://github.com/acemod/ACE3/pull/1118
2015-06-10 22:56:35 +02:00
ulteq
3e25a8b4a9 Finished ACE2 port:
* The concertina wire can now be placed in the editor
* Added handleDamage EH to avoid wire destruction with bullets/grenades
* Added proper detection routine of what killed the wire
2015-06-10 22:29:33 +02:00
AKALegman
5431ab5e01 fixed conflicts 2015-06-10 20:03:00 +01:00
ulteq
f0f36ea9b2 Fixed incorrect CSTRING 2015-06-10 18:10:12 +02:00
ulteq
249a55d041 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into dagr 2015-06-10 17:44:01 +02:00
ulteq
8a7d3e9ede handleDamage_advanced cleanup 2015-06-10 17:10:09 +02:00
ulteq
91ce327580 Newline 2015-06-10 17:07:35 +02:00
ulteq
caae62b2af Reverted handleDamage_advanced 2015-06-10 17:07:00 +02:00
ulteq
245151d8c2 Removed spaces 2015-06-10 17:03:09 +02:00
ulteq
1c2c7ef8d7 Fixed empty selectionNames in vehicle crashes 2015-06-10 17:02:14 +02:00
ulteq
9336e7c9e1 [WIP] Various handleDamage_caching fixes 2015-06-10 16:51:46 +02:00
ulteq
772a1e508b Cleanup 2015-06-10 16:07:09 +02:00
ulteq
0661d25ae3 Removed debug output 2015-06-10 16:06:46 +02:00
ulteq
3d744be2a8 Fixes the map grid calculation for negative stepY values:
* On maps like Utes, Chernarus, ...
2015-06-10 15:54:50 +02:00
ulteq
d2ad0255e9 Fixed DAGR icon size 2015-06-10 13:48:39 +02:00
ulteq
c617372612 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into concertina_wire 2015-06-10 13:40:34 +02:00
ulteq
0f6c93852c Fixed handling of falling damage 2015-06-10 12:59:55 +02:00
ulteq
8bb3dbbaf6 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medicalVanillaDamageFix 2015-06-10 12:59:11 +02:00
ulteq
7318aae629 Cleanup 2015-06-10 12:47:22 +02:00
Glowbal
efa9cf4709 Fix handleDamage caching return value
Should never return nil. Instead, return a 0 as it's expecting new damage. this may fix the random vanilla damage kicking in.
2015-06-10 12:21:06 +02:00
PabstMirror
e2890b0699 #1473 - Fix Medical Log Localization
also swap some common EFUNCs
2015-06-09 17:30:02 -05:00
ulteq
9d0c034b72 Merge pull request #1556 from acemod/kestrel_rvmat
Increased specular of the Kestrel texture
2015-06-09 23:02:23 +02:00
ulteq
b16d341c0d Increased specular of the Kestrel texture 2015-06-09 23:01:48 +02:00
ulteq
2a929c4c6b Replaced all spawn, sleep, and fsm code. 2015-06-09 22:46:04 +02:00
jonpas
51e83ba0fa Handle kileld and disconnect while sitting 2015-06-09 18:52:12 +02:00
jonpas
5bfa2425bb Git hates me 2015-06-09 18:33:39 +02:00
jonpas
3a4cd99001 Changed setPos to setPosASL for reliability, Fixed module icon name 2015-06-09 18:33:07 +02:00
jonpas
f1f9ee1365 Added module icon, removed comment 2015-06-09 18:27:58 +02:00
jonpas
36d4d01a30 Adjusted Chair (Plastic) sitting position 2015-06-09 16:55:06 +02:00
jonpas
3e0d4d1f7b Fixed Rattan Chair position, doAnimation before moving player 2015-06-09 16:48:58 +02:00
jonpas
3510d43a17 Removed isNotInside from Sandbag, SpottingScope and Tripod placement 2015-06-09 16:20:43 +02:00
jonpas
332afb2174 Allow certain self-interactions while sitting 2015-06-09 16:17:05 +02:00
jonpas
951f9d32c3 Allow interaction menu while sitting 2015-06-09 16:04:37 +02:00
jonpas
f9d292e9c2 Missing privates 2015-06-09 15:52:41 +02:00
ulteq
d454a2ccfc Attempt to fix #1465 and #1354 2015-06-09 15:46:00 +02:00
PabstMirror
8abd488a43 Read server modules before "SettingsInitialized" on clients 2015-06-09 01:27:59 -05:00
jonpas
95ec2ea1f9 Added isNotSitting exception, Renamed sitting QGVAR 2015-06-08 23:39:14 +02:00
jonpas
c6b5c705c7 Added Sitting Settings and Module 2015-06-08 23:25:15 +02:00
PabstMirror
b61bd1fb75 1.46 New RscInfoType (fix UBC) 2015-06-08 13:26:18 -05:00
AKALegman
1ae8e29ac2 updated isPlayer v2 2015-06-08 19:12:16 +01:00
Nicolás Badano
1def1ee7e4 Merge pull request #1546 from SilentSpike/zeusUpdate
Update ace_zeus with 1.46 changes
2015-06-08 14:44:12 -03:00
SilentSpike
f9d1a39adf Updated edited BI functions with 1.46 changes 2015-06-08 18:18:40 +01:00
jonpas
2104e5b45f Optimized condition functions, Removed redundant toLower for animation names 2015-06-08 17:52:33 +02:00
ulteq
fb76cd730f Proper handling of grid boundaries 2015-06-08 14:32:42 +02:00
ulteq
9fe6f269be More cleanup 2015-06-08 14:31:55 +02:00
SilentSpike
f193204195 Simplify the renderZeus code 2015-06-08 13:12:27 +01:00
SilentSpike
246d303943 menuClosed event before variable clearing 2015-06-08 13:00:03 +01:00
ulteq
264b05e3ec Removed unused privates 2015-06-08 13:42:58 +02:00
ulteq
29c55a5495 Cleanup 2015-06-08 12:57:16 +02:00
Ivan Navarro Cabello
d15bae105d Updated spanish translation
Updated spanish translation
2015-06-08 12:43:07 +02:00
AKALegman
96fccbedf9 updated isPlayer 2015-06-08 11:09:49 +01:00
ulteq
47d0d98680 Merge pull request #1537 from gienkov/pl-translation-2
captives and tripod PL translation
2015-06-08 00:34:56 +02:00
Glowbal
610f74d9d6 Merge pull request #1523 from AgentRev/onSetDead
Added "medical_onSetDead" local event in fnc_setDead.sqf
2015-06-07 23:58:22 +02:00
AgentRev
f7007b4175 Fixed "medical_onSetDead" event 2015-06-07 17:52:42 -04:00
PabstMirror
6b612a9890 Merge pull request #1520 from acemod/hideFakeWeapon
Hide fake weapon
2015-06-07 16:37:26 -05:00
jonpas
4cea9bd1bc Added Sitting README.md 2015-06-07 22:38:23 +02:00
jonpas
eb0541d726 Added icons 2015-06-07 22:36:22 +02:00
jonpas
78c9991f68 Added Polish stringtable 2015-06-07 22:25:43 +02:00
jonpas
c3c2fd0074 Initial Sitting commit 2015-06-07 22:00:43 +02:00
PabstMirror
64d529ed3c Merge pull request #1538 from acemod/unHolsterWeapon
#1208 - Holster key also unholsters
2015-06-07 14:25:06 -05:00
SilentSpike
cb1b0c6262 Added zeus exception for interaction conditions 2015-06-07 20:21:51 +01:00
PabstMirror
6eb7497cdf #1208 - Holster key also unholsters 2015-06-07 12:59:53 -05:00
PabstMirror
3bf9592a5d Macroize huntIR 2015-06-07 12:39:24 -05:00
PabstMirror
fb9c1e14a3 Merge branch 'master' into allStringtableMacros
Conflicts:
	addons/kestrel4500/CfgWeapons.hpp
2015-06-07 12:24:40 -05:00
ulteq
b2221b683f Introduced ACE_Rain 2015-06-07 18:57:16 +02:00