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
6,434 Commits 73 Branches 88 Tags 752 MiB
94a5b38cf6
Commit Graph

5249 Commits

Author SHA1 Message Date
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
PabstMirror
a48aded5e5 Fix Keybind 2015-06-09 15:02:22 -05:00
PabstMirror
c5c36c42e1 GVAR(enabled) - readme 2015-06-09 14:02:19 -05: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
PabstMirror
7cf77de8cf Opps 2015-06-09 00:53:40 -05:00
PabstMirror
5ce7ec48e7 Minor Cleanup 2015-06-09 00:51:48 -05:00
PabstMirror
7d08469df9 Module for setting 2015-06-09 00:00:00 -05:00
PabstMirror
9d914d655a Convert Finger to CBA/ACE format 2015-06-08 20:34:29 -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
PabstMirror
ebc55ca6cd Merge pull request #1542 from TheDrill/master 
Base Finger Port
 2015-06-07 15:04:45 -05: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
gienkov
ecf7873f33 captives and tripod PL translation 2015-06-07 18:55:49 +02:00
ulteq
be68284911 Fixed a typo 2015-06-07 18:20:14 +02:00
ulteq
39ba85b213 New low-poly Kestrel model 2015-06-07 18:17:09 +02:00
ulteq
eae8c8cae2 Initial draft of the ACE2 DAGR port 2015-06-07 17:53:37 +02:00
ulteq
5b3fd31b1b Merge pull request #1525 from acemod/HuntIR 
ACE2 HuntIR port
 2015-06-07 17:47:27 +02:00
ulteq
b1b8fe3645 Removed debug output 2015-06-07 14:48:46 +02:00
ulteq
cb2b120023 Reduced the max. transmission range 2015-06-07 14:47:56 +02:00
ulteq
618d557227 Layer IDs are now stored in #defines 2015-06-07 13:55:35 +02:00
ulteq
9ce655dcd2 Fixes stuck camera on remote controlled units. 2015-06-07 13:50:38 +02:00
ulteq
9561957fd6 Merge pull request #1245 from acemod/ChatColours 
Chat visibility enhancement
 2015-06-07 13:35:02 +02:00
AKALegman
d3eae58237 Fixed Zeus Unconscious 2015-06-07 12:17:52 +01:00
ulteq
fb1ddb4dd6 Removed HuntIR explosion sound 2015-06-07 12:48:01 +02:00
ulteq
665fa55adf Further reduced the container shell timeToLive value. 2015-06-07 12:12:06 +02:00
ulteq
5e30c88d11 Made use of the += operator 2015-06-07 11:58:56 +02:00
ulteq
9818f65545 Improved HuntIR descriptions 2015-06-07 11:58:34 +02:00
ulteq
0f186154c0 Tabs -> Spaces 2015-06-07 11:44:28 +02:00
ulteq
4339344aee Merge branch 'HuntIR' of https://github.com/KoffeinFlummi/ACE3 into HuntIR 2015-06-07 11:43:42 +02:00
ulteq
48f8730415 Removed dead code 2015-06-07 11:43:32 +02:00
ulteq
66193a8c67 Removed duplicate code 2015-06-07 11:36:58 +02:00
Drill
ac40e7cc59 Change default keybinding from Ctrl-Tilda to Shift-Tilda for 
finger-pointing module
 2015-06-07 12:15:23 +03:00
Drill
96e073e66d Initial commit for finger-pointing module 2015-06-07 12:10:50 +03:00
ulteq
6a792a7a82 Merge pull request #1528 from acemod/rangecardGuiFix 
Barrel length is now displayed in half inch accuracy.
 2015-06-07 10:17:02 +02:00
ulteq
a9b6af38e1 Barrel length is now displayed in half inch accuracy. 2015-06-07 10:16:30 +02:00
PabstMirror
abf2887826 Manual MainActions position for some statics weapons 2015-06-07 00:25:52 -05:00
PabstMirror
0f03bef5f1 Merge pull request #1524 from acemod/handleFiredCleanup 
Removed some dead code
 2015-06-06 23:31:07 -05:00
PabstMirror
24cdf77de0 Move to right side, directly under BIS news 2015-06-06 23:28:52 -05:00
Glowbal
c75ae71adf Merge pull request #1497 from acemod/Fix-PlayFiremodeChangedSound 
Fixed find file extension in playChangefiremode
 2015-06-06 21:39:34 +02:00
KoffeinFlummi
c47e0ce796 Merge https://github.com/ODK-Bn/ACE3 into russian-merge 2015-06-06 21:13:03 +00:00
AKALegman
0e375075ea improved explosives v2.1 2015-06-06 19:04:58 +01:00
AKALegman
46ed9416ed improved explosives v2 2015-06-06 18:58:42 +01:00
SilentSpike
85a281d586 Fixed random missing english string 2015-06-06 17:41:24 +01:00
SilentSpike
822dd11ec6 Moved base ACE_ZeusActions to ace_interaction 2015-06-06 17:33:13 +01:00
SilentSpike
5cc6abd49a Open menu over zeus inerface 2015-06-06 16:20:22 +01:00
ulteq
833335ddb9 Call setRain each frame 2015-06-06 14:16:05 +02:00
ulteq
a870d5d760 ACE2 HuntIR port 2015-06-06 14:13:34 +02:00
AKALegman
f9a7ab5ae0 improved explosives 2015-06-06 10:11:00 +01:00
ulteq
cfc23fe3e7 Removed some dead code 2015-06-06 10:01:30 +02:00
PabstMirror
732dbd315a Tripod - use addToInventory 2015-06-05 21:13:33 -05:00
AgentRev
4a416a12a2 Added "medical_onSetDead" local event in fnc_setDead.sqf 2015-06-05 22:03:27 -04:00
PabstMirror
32ce0aa6fd Macroize all stringtables 2015-06-05 21:02:24 -05:00
PabstMirror
560609fbed Cleanup 2015-06-05 19:46:19 -05:00
PabstMirror
470492759c Merge branch 'master' into multipleDevices 
Conflicts:
	addons/atragmx/initKeybinds.sqf
	addons/common/XEH_postInit.sqf
	addons/kestrel4500/CfgVehicles.hpp
	addons/kestrel4500/initKeybinds.sqf
	addons/microdagr/CfgVehicles.hpp
	addons/microdagr/XEH_clientInit.sqf
 2015-06-05 17:50:04 -05:00
PabstMirror
a0f4ea4e93 Resize, User Option, Localization 2015-06-05 17:23:51 -05:00
PabstMirror
3c3affa69f Merge branch 'master' into mainMenuVersionHTML 2015-06-05 16:48:59 -05:00
PabstMirror
237b5b4e35 Merge pull request #1239 from acemod/laserPointerAsdgConflict 
ASDG- Fail gracefully if attachments not compatible
 2015-06-05 16:40:49 -05:00
PabstMirror
827c51c088 Merge pull request #1488 from acemod/captiveModuleSettings 
Captive module settings
 2015-06-05 16:40:36 -05:00
PabstMirror
b6951b7a13 #1022 - reset hearing deafness on respawn 2015-06-05 16:37:27 -05:00
PabstMirror
84428e5e6c Medical - unconsciousness: fix exitWith scope 2015-06-05 15:43:09 -05:00
PabstMirror
4e8fc49b5e Always remove fakeWeapon after adding 
Should fix #1500
 2015-06-05 15:38:45 -05:00
SilentSpike
8a4b4a7e0c Added a bunch of basic actions 2015-06-05 18:37:29 +01:00
ulteq
595e4e7529 Merge pull request #1371 from gienkov/pl-translation-1 
Polish translations
 2015-06-05 17:58:14 +02:00
ulteq
c22a66bad4 Merge pull request #1515 from acemod/spotting_scope 
Ported the ACE2 Spotting Scope
 2015-06-05 17:03:14 +02:00
ulteq
04ae03695b Reverted dragging init. 2015-06-05 17:03:09 +02:00
ulteq
7fed1085a6 Merge pull request #1509 from acemod/SSWT_Kit 
Ported the ACE2 Tripod
 2015-06-05 16:53:47 +02:00
PabstMirror
3f3ffe117e Inherit ACE_Actions - addToInventory 2015-06-05 03:32:55 -05:00
gienkov
de13985492 interact_menu translation 2015-06-05 09:55:13 +02:00
gienkov
c1a7374404 Merge remote-tracking branch 'upstream/master' into pl-translation-1 
Conflicts:
	addons/interact_menu/stringtable.xml
 2015-06-05 09:40:50 +02:00
ulteq
993ee2d498 Ported the ACE2 spotting scope 2015-06-05 09:34:27 +02:00
PabstMirror
e01ba64683 Fix Missing Strings 2015-06-04 22:51:40 -05:00
SilentSpike
25f613b712 Initial implementation of static zeus menu 2015-06-04 23:24:57 +01:00
ulteq
04e6acfc6a Merge pull request #1479 from acemod/sandbag 
Ported the ACE2 sandbags
 2015-06-04 23:02:55 +02:00
ulteq
52b40a50d9 Merge pull request #1491 from acemod/Yardage450 
Ported the ACE2 Yardage 450 laser rangefinder
 2015-06-04 23:02:06 +02:00
ulteq
618e7e6ea1 Added polish translation. 2015-06-04 23:01:07 +02:00
PabstMirror
9997b94fb1 Merge pull request #1510 from acemod/settingInDebug 
Dump settings to debug
 2015-06-04 15:54:29 -05:00
jonpas
e7cfda5c77 Added Macro Guard to string macros 2015-06-04 22:46:06 +02:00
PabstMirror
1cb1468183 Remove unused control 2015-06-04 15:40:56 -05:00
Glowbal
e13992d896 Merge pull request #1508 from SilentSpike/strings 
Macroified ACE_Zeus Strings
 2015-06-04 22:36:34 +02:00
PabstMirror
1221498357 Dump settings to debug 2015-06-04 15:31:10 -05:00
Glowbal
7f2ada38a2 Merge branch 'checkpboSettings' of github.com:usecforce/ACE3 
Conflicts:
	addons/common/CfgVehicles.hpp
	addons/common/config.cpp
 2015-06-04 21:51:54 +02:00
Glowbal
e103007ae7 Merge pull request #1492 from GitHawk/master 
Disabled pain effect while unconscious
 2015-06-04 21:45:48 +02:00
ulteq
f88d23d3ca Update $PBOPREFIX$ 
Fixed a typo
 2015-06-04 21:39:39 +02:00
ulteq
91c288123a Fixed dragging position 2015-06-04 21:20:15 +02:00
ulteq
e7add69556 Ported the ACE2 Tripod 2015-06-04 21:13:44 +02:00
SilentSpike
2b79838555 Use existing disabled string 2015-06-04 19:40:11 +01:00
Nicolás Badano
ddc6688d03 Merge pull request #1505 from alganthe/strobe-intensity 
strobe light more bearable
 2015-06-04 15:34:20 -03:00
SilentSpike
94a6eefa32 using new string macros 2015-06-04 19:33:19 +01:00
PabstMirror
cecc133a59 Missing </Key> in stringtable 2015-06-04 13:22:55 -05:00
PabstMirror
b466566104 Switch to new CSTRING 2015-06-04 13:19:05 -05:00
PabstMirror
e5edc0345b Merge branch 'master' into captiveModuleSettings 
Conflicts:
	addons/captives/CfgVehicles.hpp
 2015-06-04 13:15:53 -05:00
PabstMirror
21db1bcf46 Fix Ammo check / formating 2015-06-04 13:08:01 -05:00
ulteq
fb2f3f8c3f Added function headers / Fixed requiredAddons 2015-06-04 17:51:04 +02:00
Josuan Albin
70e83707c4 strobe light more bearable 
changed the intensity of the strobe light, it's still VERY visible on a
very long distance, (around 1.6k maybe more)
 2015-06-04 17:40:49 +02:00
ulteq
e728003725 Removed newline bracket 2015-06-04 17:23:01 +02:00
jonpas
9fbf256acd Merge branch 'master' into macroSTR 
Conflicts:
	addons/hearing/functions/fnc_putInEarplugs.sqf
	addons/interact_menu/ACE_Settings.hpp
 2015-06-04 17:13:09 +02:00
ulteq
39a6c29e3e ACE2 concertina wire port. 2015-06-04 17:11:09 +02:00
Nicolás Badano
aae8f4cf19 Merge pull request #1487 from SzwedzikPL/interact_menu_background 
Interact menu - background options
 2015-06-04 11:23:11 -03:00
bux578
ee85aab791 fix #1439 2015-06-04 14:30:38 +02:00
bux578
2bf2b5737a Merge pull request #1489 from acemod/DocumentationFixes 
fix documenation typos
 2015-06-04 13:48:08 +02:00
ulteq
da28aa3c64 More sandbag features: 
* You can now carry sandbags
* Different sandbag model during deployment (no geometry)
* Deploying sandbags now requires an appropriate surface
* Proper PhysX activation chain when you deploy/pickup sandbags
* Sandbags are now destructible
* Some stringtable fixes
 2015-06-04 11:13:12 +02:00
Glowbal
9bbeb7183e Fixed find file extension in playChangefiremode 2015-06-04 10:39:43 +02:00
gienkov
46dbd3113c Fix 2015-06-04 01:38:57 +02:00
gienkov
fb10961a9b PL translation for new things 2015-06-04 01:34:58 +02:00
gienkov
b5eb39291c Merge remote-tracking branch 'origin' into pl-translation-1 
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/frag/stringtable.xml
 2015-06-04 00:52:35 +02:00
ulteq
68b652cee9 Initial draft of the ACE2 tactical ladder port. 2015-06-03 20:27:52 +02:00
ViperMaul
237f5c1130 Merge pull request #1304 from acemod/debugButton 
Export debug report from options menu
 2015-06-03 09:28:37 -07:00
IngoKauffmann
ede8d74c54 Disabled pain effect while unconscious 
If the player is unconscious the pain effect is disabled.
 2015-06-03 17:53:09 +02:00
IngoKauffmann
e60cfddc77 Limited strength of pain effect while unconscious 
Limited _strength to 0.1 so a player does not have to watch a flashing
screen while he can't do anything about it. Otherwise we need to include
a serious epilepsy warning!
 2015-06-03 17:17:35 +02:00
ulteq
24f70e1012 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into Yardage450 
Conflicts:
	addons/apl/data/default.rvmat
 2015-06-03 16:28:22 +02:00
ulteq
682af84425 Ported the ACE2 Yardage 450 laser rangefinder 2015-06-03 16:26:30 +02:00
bux578
9096f38777 Ear Plugs -> Earplugs 
http://en.wikipedia.org/wiki/Earplug
 2015-06-03 15:29:38 +02:00
ulteq
dc66e6e1d8 Merge pull request #1476 from acemod/mx2a 
Ported the ACE2 MX-2A thermal imaging device
 2015-06-03 14:54:03 +02:00
PabstMirror
3a2e32b800 #1444 - Javelin Locking 2015-06-03 02:32:53 -05:00
PabstMirror
701aa7e343 Add New Icons 2015-06-03 00:55:20 -05:00
SzwedzikPL
18940d0787 Interaction menu background options 2015-06-03 06:04:47 +02:00
PabstMirror
5dc94487c5 Module Settings for Captivity 
Setting for handcuffing own team, and allowing surrender.
 2015-06-02 20:50:27 -05:00
ulteq
1777719f20 Merge pull request #1485 from acemod/abFixes 
Ab fixes
 2015-06-02 23:13:05 +02:00
ulteq
f0849e70ff Slightly increased the alpha value of the bullet trace effect. 2015-06-02 23:11:44 +02:00
Nicolás Badano
8f15856084 Merge pull request #1415 from GitHawk/master 
runOnHover can now be CODE & SurgicalKits
 2015-06-02 18:07:36 -03:00
ulteq
16f6650486 Decreased the velocity threshold for the bullet trace effect 2015-06-02 22:38:44 +02:00
ulteq
c3e7129d13 Removed newline brackets 2015-06-02 22:38:12 +02:00
ulteq
52d304e9f9 Increased the protractor size 2015-06-02 22:37:27 +02:00
jonpas
3206e3b537 Fixed a syntax error, Fixed nametags module order as per last pull request 2015-06-02 22:36:06 +02:00
jonpas
5496333c26 Merge branch 'master' into macroSTR 
Conflicts:
	addons/nametags/ACE_Settings.hpp
	addons/nametags/CfgVehicles.hpp
	addons/nametags/stringtable.xml
 2015-06-02 22:22:51 +02:00
jonpas
541f1010a7 Merge branch 'master' into macroSTR 
Conflicts:
	addons/attach/functions/fnc_attach.sqf
	addons/captives/functions/fnc_moduleSurrender.sqf
	addons/common/CfgVehicles.hpp
	addons/explosives/CfgModule.hpp
	addons/hearing/CfgVehicles.hpp
	addons/interaction/CfgVehicles.hpp
	addons/map/CfgVehicles.hpp
	addons/microdagr/CfgVehicles.hpp
	addons/mk6mortar/CfgVehicles.hpp
	addons/nametags/CfgVehicles.hpp
	addons/nightvision/functions/fnc_changeNVGBrightness.sqf
	addons/respawn/CfgVehicles.hpp
	addons/switchunits/CfgVehicles.hpp
	addons/vehiclelock/CfgVehicles.hpp
	addons/winddeflection/stringtable.xml
 2015-06-02 22:14:32 +02:00
Nicolás Badano
0022548748 Merge pull request #1204 from usecforce/nametagsToggle 
Disablable NameTags Module option
 2015-06-02 17:03:47 -03:00
ulteq
5b2ad32c3f Added model.cfg 2015-06-02 20:22:37 +02:00
ulteq
81a0f5147e Stringtable cleanup 2015-06-02 20:18:30 +02:00
ulteq
f767f7eb2b Removed duplicate code 2015-06-02 20:15:31 +02:00
ulteq
663ae1db4a Fixed spelling 2015-06-02 20:07:35 +02:00
ulteq
c2be6ffef6 Added additional abort condition. 2015-06-02 20:06:56 +02:00
ulteq
4580168080 Fixed incorrect execution order 2015-06-02 20:01:48 +02:00
ulteq
2b6157bdb8 Fixed a typo 2015-06-02 20:01:00 +02:00
Glowbal
324aee1e57 Merge pull request #1471 from acemod/bodybagCleanup 
Body bag cleanup:
 2015-06-02 20:00:12 +02:00
ulteq
3f10eed73c All TMR code was removed. 2015-06-02 19:56:42 +02:00
ulteq
d733527f71 Ported the ACE2 sandbags 2015-06-02 19:30:50 +02:00
bux578
6ebf9067ef Merge pull request #1478 from acemod/switchunitscleanup 
cleanup switchunits
 2015-06-02 19:20:34 +02:00
PabstMirror
d727cb400a Modules - fix addEventHandler 2015-06-02 12:15:58 -05:00
bux578
0bd358c415 cleanup switchunits 2015-06-02 19:13:58 +02:00
Josuan Albin
7bc7e51ad7 flares modified 
- all UGL flares have a 60s lifespan now
- handheld signals and 20mm flares have smaller flare sizes
 2015-06-02 14:02:46 +02:00
ulteq
d0b8a97e79 Fixed requiredAddons[] 2015-06-02 13:40:10 +02:00
ulteq
f1dbe0fffc Ported the ACE2 MX-2A thermal imaging device 2015-06-02 12:58:47 +02:00
ulteq
048e5b6f6d Body bag cleanup: 
* Increased the treatment time to match the animation duration
* Fixed the body bag alignment with the dead unit
 2015-06-01 22:33:25 +02:00
Glowbal
cf0b2c2a52 Merge pull request #1469 from acemod/placeInBodyBagFix 
Fixes random body bag teleports
 2015-06-01 22:06:35 +02:00
SilentSpike
e3c09a7099 Added icon to unconscious module 2015-06-01 20:56:58 +01:00
SilentSpike
bfd1f8a102 Localise module names 2015-06-01 20:56:57 +01:00
SilentSpike
a30f6be713 Better module naming convention 2015-06-01 20:56:56 +01:00
SilentSpike
8fe1a65207 Cleaned up event handler 2015-06-01 20:56:54 +01:00
SilentSpike
bfce854be3 Localise module messages 2015-06-01 20:50:19 +01:00
SilentSpike
4c1641b64a Generalized contextual modules system 2015-06-01 20:44:54 +01:00
SilentSpike
7d71d85ffc Death to tabs 2015-06-01 20:44:53 +01:00
SilentSpike
e27ac53713 Implemented contextual modules 2015-06-01 20:44:51 +01:00
SilentSpike
eefe995a0c Transfer curator functionality from ace_captives 2015-06-01 20:44:50 +01:00
SilentSpike
b72512e3f1 Zeus modules require larger icons 2015-06-01 20:44:50 +01:00
SilentSpike
97a1ff9bd6 Include no longer needed 2015-06-01 20:44:48 +01:00
SilentSpike
cd6474c748 Adding module icons 2015-06-01 20:44:47 +01:00
SilentSpike
9619b7d167 Improved naming and removed pointless category 2015-06-01 20:43:21 +01:00
SilentSpike
44ca13fe3a Implemented capture module 2015-06-01 20:36:06 +01:00
SilentSpike
6251248a09 Fixed conditions 2015-06-01 20:36:05 +01:00
SilentSpike
49ef30ca5b Corrected macro 2015-06-01 20:36:05 +01:00
SilentSpike
aad56866ea Forgot my privates 2015-06-01 20:36:04 +01:00
SilentSpike
90033aa591 Updated function headers 2015-06-01 20:36:03 +01:00
SilentSpike
5f1725cf1f Missing setUnconscious parameter 2015-06-01 20:36:02 +01:00
SilentSpike
0dcfd9f941 Use zeus category 2015-06-01 20:36:02 +01:00
SilentSpike
a4512e4740 Implemented surrender module 
Improved knockout module
 2015-06-01 20:36:01 +01:00
SilentSpike
3702d0b671 Implemented knockout module 2015-06-01 20:36:00 +01:00
ulteq
14607f7aba Fixes random body bag teleports 2015-06-01 21:23:00 +02:00
ulteq
47acb0f470 Merge pull request #1458 from acemod/drag_carry_fix 
Fixes random teleport when dragging/carrying inside of buildings.
 2015-06-01 20:22:29 +02:00
PabstMirror
25a597e5fe Merge pull request #1460 from acemod/hitReactionsMounted 
HitReactions - Don't do when mounted, add setting
 2015-06-01 13:17:06 -05:00
PabstMirror
f57427ec96 switch waitAndExecute with 0 delay to execNextFrame 
Should Fix #1463
 2015-06-01 13:14:05 -05:00
ulteq
9d4c572261 Fixes build error: "config.cpp has externs but no RequiredAddons" 2015-06-01 20:12:07 +02:00
Nicolás Badano
9ed851a966 Merge pull request #1265 from gienkov/module-translations-2 
Stringtable Zeus and View Distance
 2015-06-01 14:44:04 -03:00
Glowbal
1c0c73be54 Merge pull request #1433 from acemod/fixSettingsFromModules 
Delay initialization of modules until settings are properly setup
 2015-06-01 19:18:11 +02:00
ulteq
8de5129313 Merge pull request #1464 from acemod/densityAltitude 
Implemented Density Altitude calculation
 2015-06-01 16:22:41 +02:00
ulteq
e626794866 Fixes array init 2015-06-01 16:21:30 +02:00
ulteq
0364975c12 Implemented Density Altitude calculation 2015-06-01 16:09:35 +02:00
KoffeinFlummi
fa73aec15b Merge https://github.com/Macusercom/ACE3 into german-merge 2015-06-01 14:27:49 +02:00
PabstMirror
473ab7d7c0 Fix mmg UBC 2015-05-31 23:48:20 -05:00
PabstMirror
e2217220eb HitReactions - Don't do when mounted, add setting 2015-05-31 16:16:14 -05:00
gienkov
a173b5b048 TABS 2015-05-31 22:46:32 +02:00
gienkov
212862a401 Merge remote-tracking branch 'origin' into pl-translation-1 
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/frag/stringtable.xml
 2015-05-31 22:45:09 +02:00
Macusercom
53e0b35c12 German 1 correction for Advanced Ballistics 2015-05-31 20:31:38 +02:00
ulteq
4802ffeebf Fixes random teleport when dragging/carrying inside of buildings. 2015-05-31 18:34:48 +02:00
ulteq
3a2fd9dc08 Merge pull request #1457 from acemod/weatherReadme 
New weather module readme/feature description.
 2015-05-31 17:39:52 +02:00
ulteq
a1f199bfdc New weather module readme/feature description. 2015-05-31 17:39:24 +02:00
ulteq
903fb89d77 Overcast > 0.7 no longer implies rain: 
* The higher the overcast value the higher the chance for rain
* But you can end up having no rain with an overcast value of 1.0
 2015-05-31 17:30:52 +02:00
ulteq
5c8e79c50a Updated all airFriction values according to: extras/airFrictionAnalysis.txt 2015-05-31 16:45:59 +02:00
Macusercom
0a47396d10 Corrections for German translation 2015-05-31 14:25:52 +02:00
Glowbal
0b8896239c Progress bar stops on death - fix for #1449 2015-05-31 09:23:36 +02:00
Macusercom
5d1f2eafaa Fix German Translation 2015-05-30 23:34:19 +02:00
Macusercom
038880cb01 Additional Translations for German + some corrections 2015-05-30 23:33:51 +02:00
PabstMirror
23d300df52 Merge pull request #1417 from acemod/localDefuseObjects 
Explosives - Local defuse objects
 2015-05-30 15:46:07 -05:00
Glowbal
3e3fdcf66e Merge pull request #1429 from acemod/cseNVGadjustment 
NightVision adjustment - use CSE's gamma
 2015-05-30 21:50:56 +02:00
jonpas
66ceaa1d31 Fixed IS_STRING error due to regex replacing it with LSTRING 2015-05-30 20:09:53 +02:00
ulteq
5746128a0f Further improved error handling when AB is enabled with incomplete configs: 
* Calculates correct solutions when parts of the ammo config are missing
* Calculates correct solutions when parts of the weapon config are missing
* Performance improvement when AB is enabled
 2015-05-30 20:06:55 +02:00
jonpas
d934c25b78 Merge branch 'master' into macroSTR 
Conflicts:
	addons/interact_menu/ACE_Settings.hpp
 2015-05-30 19:54:32 +02:00
AKALegman
3b01da6962 IED Class Inheritance Fixes 2015-05-30 16:57:50 +01:00
PabstMirror
d7d225cebc Send waiting debug msg only once 2015-05-30 01:28:15 -05:00
PabstMirror
b49b2fa3d1 Send to RPT and Clipboard 2015-05-30 01:21:47 -05:00
PabstMirror
84d940e69d Fix circular dependency - ModuleDescription 2015-05-30 00:31:07 -05:00
esteldunedain
9d29aa2107 - Change all modules on ACE using settings to type ACE_Module, so we can guarantee that they wait for settings before initing. 
- Make ace_common require ace_modules, so all ACE pbos are guaranteed to have it
 2015-05-30 01:37:41 -03:00
esteldunedain
333cb80171 Delay initialization of ACE_Modules until settings are properly setup 2015-05-30 01:18:23 -03:00
esteldunedain
afa6a2fad9 Remove the "ServerSettingsReceived" event, which is not longer needed. As per @pabstmirror solution, the GVAR(Settings) variable is monitored to determine when the server info has arrived. Fix #1273 2015-05-30 00:43:51 -03:00
PabstMirror
5efde25585 Fix ace_settings 2015-05-29 21:03:47 -05:00
Glowbal
552b2f390f Merge pull request #1256 from acemod/medicalExtension 
Medical Extension for handleDamage wounds
 2015-05-29 23:16:00 +02:00
PabstMirror
d457d9ffea NightVision adjustment - use CSE's gamma 2015-05-29 15:37:53 -05:00
Nicolás Badano
8fbd7e8575 Merge pull request #1426 from alganthe/barrel_swap_fix 
navid and SPMG barrel swapping added
 2015-05-29 17:11:01 -03:00
Josuan Albin
7603e71468 removed useless entries 2015-05-29 22:08:13 +02:00
Glowbal
00acbaf44d Added blur background client setting 2015-05-29 21:56:07 +02:00
ulteq
a57d8486ca Removed some unneeded code 2015-05-29 20:51:20 +02:00
ulteq
65b9e67991 Refined the abort condition for the range card calculation 2015-05-29 20:11:07 +02:00
PabstMirror
b0bfb7dd43 Fix Ladders - Add User Setting 2015-05-29 13:00:04 -05:00
ulteq
d0e1af6e47 Improved missing config error handling 2015-05-29 19:39:54 +02:00
Josuan Albin
26a9f7f38e navid and SPMG barrel swapping added 
- added navid class to barrel swapping config
- added SPMG class to barrel swapping config
 2015-05-29 15:31:48 +02:00
ulteq
6d1e8eebce Reworked the range card output when AB is disabled 2015-05-29 15:07:30 +02:00
ulteq
a5a96052b8 Made use of the newly implemented speed of sound calculation 2015-05-29 13:34:34 +02:00
ulteq
ade2cc1c56 Refined the reference barometric pressure calculation 2015-05-29 12:55:16 +02:00
ulteq
988a12327f Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rangecard 2015-05-29 12:44:11 +02:00
ulteq
1ec37aabed Merge pull request #1424 from acemod/barometricPressureFix 
Fixed incorrect barometric pressure calculation
 2015-05-29 12:40:17 +02:00
ulteq
abf0149b1d Added speed of sound calculation: 
* Influences the advanced ballistics transonic instability
* Influences the ATragMX range card output
 2015-05-29 11:36:37 +02:00
ulteq
69b9d0e122 More in-depth barometric pressure calculation: 
* Temperature is now taken into account
 2015-05-29 11:18:40 +02:00
ulteq
83f2e35907 Fixed incorrect unit conversion in the barometric pressure calculation 2015-05-29 10:30:30 +02:00
ulteq
01810b8723 - Altitude is only taken into account when AB is enabled 
- Separate solution caches for Vanilla and AB ballistics
 2015-05-29 09:49:07 +02:00
Garth "L-H" de Wet
e2970ab40e Merge pull request #1414 from acemod/Explosives_ZeusCompatible 
Made explosives Zeus and AI compatible specifically in regards to Dea…
 2015-05-29 07:48:50 +02:00
jonpas
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
Glowbal
d34c96038e Merge branch 'master' of github.com:acemod/ACE3 2015-05-28 20:56:35 +02:00
Glowbal
9135d956f0 Merge branch 'surgicalkit' 2015-05-28 20:54:52 +02:00
Glowbal
27106ce59f minor refactor 2015-05-28 20:54:13 +02:00
jonpas
baca5a25d5 Merge branch 'master' into checkpboSettings 
Conflicts:
	addons/common/XEH_postInit.sqf
 2015-05-28 20:52:35 +02:00
jonpas
86264a7b7d Reworked ACE_Settings/Module functions to support both dynamically, Added SettingsInitialized 2015-05-28 20:49:30 +02:00
ulteq
4ad82d9629 Switched to ctrlCreate to avoid aspect ratio problems with the listbox. 2015-05-28 20:13:22 +02:00
jonpas
d597149fc6 Merge branch 'master' into nametagsToggle 
Conflicts:
	addons/nametags/ACE_Settings.hpp
	addons/nametags/XEH_postInit.sqf
	addons/nametags/functions/fnc_onDraw3d.sqf
	addons/nametags/stringtable.xml
 2015-05-28 19:51:40 +02:00
ulteq
697710d40d Initial draft of the range card implementation. 2015-05-28 19:17:29 +02:00
IngoKauffmann
ab31891b8d runOnHover can now be CODE 
Expanded render, compileMenu, compileMenuSelfAction so runOnHover can be
CODE
 2015-05-28 18:16:05 +02:00
Garth L-H de Wet
529e200a4c Made explosives Zeus and AI compatible specifically in regards to Deadman's switches. 2015-05-28 17:56:45 +02:00
Macusercom
489751f5aa More German string fixed 
As recommended...
 2015-05-28 16:21:53 +02:00
Nicolás Badano
5f70001ac0 Merge pull request #1409 from acemod/gogglesCacheSurfaceDust 
Goggles - Cache Surface Dust
 2015-05-28 09:48:42 -03:00
Glowbal
5df9bb4a60 Merge pull request #1322 from acemod/SendSettingsDirectlyInsteadOfSplitting 
Send directly to extension instead of splitting it
 2015-05-28 11:54:11 +02:00
PabstMirror
2cf9519702 Send to extension directly 2015-05-28 04:33:13 -05:00
PabstMirror
bfa75b833d Merge branch 'master' into debugButton 2015-05-28 04:12:30 -05:00
PabstMirror
b29a75b7f6 Use new ace version html 2015-05-28 03:22:19 -05:00
PabstMirror
0c31adab61 Merge branch 'master' into mainMenuVersionHTML 2015-05-28 03:15:38 -05:00
PabstMirror
236ae767b5 Goggles - Cache Surface Dust 2015-05-28 00:18:45 -05:00
PabstMirror
3a4a02e524 #1407 - Make Saline 500ml match mass blood/plasma 2015-05-27 16:23:25 -05:00
jonpas
700c4cb962 Removed mistakenly added quotes in realisticnames comments 2015-05-27 22:57:50 +02:00
jonpas
b85ae8f194 Fixed missed external strings 2015-05-27 22:34:57 +02:00
jonpas
0b0f7274d7 Applied ESTRING and ECSTRING macros 2015-05-27 22:04:41 +02:00
jonpas
a99c02ff02 Added ESTRING and ECSTRING for external module references 2015-05-27 22:02:03 +02:00
jonpas
1c58ff823d Stringtable fixes medical 2015-05-27 21:58:35 +02:00
jonpas
6f6f2a55f0 Stringtable fixes except medical 2015-05-27 21:43:30 +02:00
jonpas
87db721d4f Stringtable fixes up to medical 2015-05-27 21:19:14 +02:00
PabstMirror
5f2bee09e4 Create Defuse Helpers on demand 2015-05-27 14:09:06 -05:00
Glowbal
7dd01ebb69 Merge pull request #1389 from acemod/possibleFixMedicalUnloadPatient 
Possible fix medical unload patient
 2015-05-27 19:34:23 +02:00
PabstMirror
08aeda11df Merge branch 'master' into userActionPrototype 2015-05-27 12:33:20 -05:00
PabstMirror
9ed15d9702 Merge pull request #1302 from acemod/nameTagFixes 
Nametags - Use EyePos of target / windows
 2015-05-27 12:19:17 -05:00
Macusercom
5cb0953094 Fixed German translations 
Fixed some typos and phrases
 2015-05-27 19:11:32 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
PabstMirror
30adc2d463 Patch Merge of PR #1156 - Optics for tripplehead 2015-05-27 11:28:06 -05:00
Nicolás Badano
c365008330 Merge pull request #1275 from acemod/fixUAVandInteractionInhert 
Fix UAV and Interaction Compile Inheritance
 2015-05-27 12:20:46 -03:00
jonpas
600fe61f72 Added STRING and CSTRING Macros 2015-05-27 17:10:34 +02:00
esteldunedain
39fec12528 Merge branch 'master' into reliableSettings 2015-05-27 12:09:06 -03:00
esteldunedain
bb99d5a860 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 
Conflicts:
	addons/advanced_ballistics/stringtable.xml
 2015-05-27 12:08:47 -03:00
Ivan Navarro Cabello
047a2ee736 added spansih translate 
added spansih translate for (advanced_ballistics, ballistics, captives,
common, explosives, frag, hearing, interaction, map, medical, microdagr,
missileguidance, missionmodules, mk6mortar, nametags, optionsmenu,
respawn, switchunits, vehiclelock, weather, winddeflection).

I used the Pull request of #1251 for complete my commit, because #1251
is outdated now.
 2015-05-27 15:27:04 +02:00
BaerMitUmlaut
f2e6a98eb4 Killed tabs 2015-05-27 13:51:22 +02:00
BaerMitUmlaut
6894a7433a Removed duplicate private var 2015-05-27 13:51:15 +02:00
PabstMirror
d2eb08594b Merge branch 'master' into fixUAVandInteractionInhert 
Conflicts:
	addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
 2015-05-27 00:36:43 -05:00
PabstMirror
adf29d75e3 Explosives - Local Defuse Helpers 2015-05-26 23:15:50 -05:00
BaerMitUmlaut
f7578a92c9 Reverted in favour of onProgress treatment 2015-05-27 00:52:16 +02:00
BaerMitUmlaut
30df0e8dc9 Switched to callbackPogress for treatment 2015-05-27 00:45:50 +02:00
BaerMitUmlaut
890b568225 Implemented dynamic treatment time 2015-05-27 00:45:22 +02:00
Glowbal
4945f22f3e Merge branch 'master' into medicalExtension 2015-05-26 22:42:26 +02:00
ulteq
5223455174 New nighttime picture. 2015-05-26 22:26:30 +02:00
Nicolás Badano
32325fc784 Merge pull request #1394 from acemod/sortWaitAndExecute 
Single PFEH for waitAndExecute - using sort
 2015-05-26 16:40:17 -03:00
Macusercom
7eeddfbd65 German translations 
Added a lot of German translations and fixed even more typos.
 2015-05-26 17:04:53 +02:00
ulteq
5e6e62280e Fixed a typo 2015-05-26 15:00:52 +02:00
ulteq
dc1bfa9c92 Nighttime GUI for the ATragMX. 2015-05-26 12:32:37 +02:00
ViperMaul
388d6c3519 Change to the proper isAwake function 
#1375
 2015-05-25 20:47:28 -07:00
PabstMirror
4e70bf6e83 Single PFEH for waitAndExecute - using sort 2015-05-25 22:46:56 -05:00
BaerMitUmlaut
41892fd6df Added surgicalKit treatment 2015-05-26 00:33:20 +02:00
PabstMirror
d410350a25 Make code less smelly 2015-05-25 14:01:59 -05:00
ViperMaul
6a1724343d remove debug 
#1375
 2015-05-25 11:38:28 -07:00
ViperMaul
789e92d8ef Ensuring a proper return value and removing unnecessary code. 
#1375
 2015-05-25 10:32:52 -07:00
ViperMaul
3bdb27386c removing obsolete drag code 
#1375
 2015-05-25 10:25:28 -07:00
ViperMaul
9a07a9bfd6 modify unloadPerson to use unloadPersonLocal 
#1375
 2015-05-25 09:43:29 -07:00
ViperMaul
7141d251c7 create unloadPersonLocal 
#1375
 2015-05-25 09:41:24 -07:00
ViperMaul
cafaef9612 revert missing actionDragUnit file 
#1375
 2015-05-25 09:39:12 -07:00
PabstMirror
c7d9074f3f Javelin - Only run if weapon and ammo supported 2015-05-25 05:38:45 -05:00
PabstMirror
0452270380 Add Javelin CfgAmmo 
Leave M_Titan_AT alone for A3 Vehicles / Mods that use it
 2015-05-25 05:34:07 -05:00
ulteq
cc7639ea22 Merge pull request #1386 from acemod/airFrictionUpdate 
airFriction update
 2015-05-25 12:00:31 +02:00
ulteq
2327a493c5 Updated the ATragMX gun profiles and optimized the airFrictions some more. 2015-05-25 10:28:20 +02:00
PabstMirror
7dec983397 #1383 - Fix map shake interfering with other anims 
Don't run ctrlMapAnimClear each frame, only when ending the animation
 2015-05-24 23:56:22 -05:00
Joko
e0722452b7 add Compatibilty to mods where the Animation are not "para_pilot" 2015-05-25 01:09:28 +02:00
ulteq
21f4fcada3 Updated all airFriction values to minimize the drop difference when AB is disabled. 2015-05-25 00:53:41 +02:00
ViperMaul
06932f0c03 Restore missing actionDragUnit function file 
#1375
 2015-05-24 15:14:11 -07:00
Joko
1f5f5a2dcf ACE_player -> _unit 2015-05-23 23:58:16 +02:00
Grzegorz
d96873b8a0 Fix line ending 2015-05-23 21:16:36 +02:00
gienkov
8ef41b7523 Translate missing frag and adv. ball. strings to PL 2015-05-23 21:16:34 +02:00
gienkov
00c5abecc2 Merge remote-tracking branch 'origin' into module-translations-2 
Conflicts:
	addons/viewdistance/ACE_Settings.hpp
	addons/viewdistance/functions/fnc_changeViewDistance.sqf
 2015-05-23 17:55:06 +02:00
ulteq
ee022e1dea Fixes broken scope config (#1312) 2015-05-23 17:06:46 +02:00
Glowbal
7170db5dc2 Merge pull request #1368 from acemod/medicalBloodBags 
Medical blood bags size matters
 2015-05-23 10:07:58 +02:00
PabstMirror
d82fcd1f96 Advanced - Bloodbag lookup by treatment not item 2015-05-23 01:26:13 -05:00
PabstMirror
d752dd50d0 Basic - Bloodbag size matters 2015-05-23 01:16:18 -05:00
bux578
04dd791374 Merge pull request #1367 from jonpas/stringtableABfix 
Fixed missing close tag in Advanced Ballistics stringtable
 2015-05-23 07:48:56 +02:00
PabstMirror
437db22ab8 #1364 - Prevent script error if bad muzzle 2015-05-22 23:38:16 -05:00
PabstMirror
e31a49283b Merge branch 'master' into nameTagFixes 
Conflicts:
	addons/nametags/functions/fnc_drawNameTagIcon.sqf
 2015-05-22 21:56:42 -05:00
jonpas
030b509ec5 Fixed missing close tag in Advanced Ballistics stringtable 2015-05-23 03:34:11 +02:00
PabstMirror
8fd0aef7d4 Medical - Fix Handle Damage 
{} were unmatched so nothing ran.
I think this is just leftover from a merge.
 2015-05-22 16:35:48 -05:00
Glowbal
48ed51b03c Merge pull request #1361 from acemod/FixUnconsciousCondition 
Medical - Fix Unconscious Condition
 2015-05-22 22:39:18 +02:00
PabstMirror
f785fcc0d4 Merge pull request #1362 from acemod/timeHasComeToday 
Fix Time Calc
 2015-05-22 14:32:56 -05:00
PabstMirror
f4bf6ea26d Fix Time Calc 2015-05-22 14:29:56 -05:00
PabstMirror
537bba1382 Medical - Fix Unconscious Condition 2015-05-22 13:56:45 -05:00
ulteq
308b0aa0f9 Fixed incorrect barrel length. 2015-05-22 20:41:36 +02:00
ulteq
9536423f2e Merge pull request #1353 from acemod/cleanup_ATragMX_AB 
Removed a deprecated function and fixed some typos.
 2015-05-22 18:42:20 +02:00
ulteq
e88c570ef2 Removed a deprecated function and fixed some typos. 2015-05-22 18:42:09 +02:00
jaynus
582ea318d4 Merge remote-tracking branch 'origin/superTime' 
Conflicts:
	addons/frag/functions/fnc_fired.sqf
	addons/frag/functions/fnc_trackFragRound.sqf
 2015-05-22 07:24:55 -07:00
PabstMirror
72020a43f1 Privates / Remove Debug 2015-05-21 17:53:15 -05:00
PabstMirror
4e92a51cf8 Create Defuse Helpers for spawned Explosives 2015-05-21 17:47:54 -05:00
jaynus
46751fd912 Merge pull request #1163 from acemod/fragSpallOptimization 
Frag spall optimization
 2015-05-21 15:08:07 -07:00
jaynus
3cb4094429 Merge branch 'fragSpallOptimization' of github.com:acemod/ACE3 into fragSpallOptimization 2015-05-21 15:07:12 -07:00
jaynus
c297257421 Disable frag by default. Add @pabstmirror fix closes #1339 closes #820 2015-05-21 15:06:55 -07:00
Felix Wiegand
fd2676c7b9 Merge pull request #1135 from acemod/fcsPrivates 
FCS - Privates
 2015-05-21 22:18:14 +02:00
Glowbal
8b69b3b1b1 Merge pull request #1332 from acemod/medicalBinocTreatment 
Fix Script Error when treating with bincos
 2015-05-21 20:20:41 +02:00
ulteq
24b2fea303 Persistent reference heading for the Kestrel 4500. 2015-05-21 19:28:59 +02:00
ulteq
1816208997 Proper Min/Max storing of negative tailwind values. 2015-05-21 19:18:15 +02:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
Joko
9a212f0687 Fix gettings anytime a new Parachute 2015-05-21 14:54:00 +02:00
Joko
f8003fd865 fix adding a New Parachute if one already given 2015-05-21 14:06:23 +02:00
Joko
ccd3fb8b4a Enhance some scripts 
add New Config Parameter has Reserve Parachute
 2015-05-21 14:03:52 +02:00
ulteq
db7c2a19e6 Tailwinds are displayed as negative values. 2015-05-21 11:14:37 +02:00
Joko
41c6ea8b4e Fix Reload Bug 2015-05-21 08:06:59 +02:00
PabstMirror
1aa9520adb Fix Script Error when treating with bincos 2015-05-20 23:24:44 -05:00
Nicolás Badano
72d955bc0c Merge pull request #1328 from alef/master 
Fixed: Removed § typo at the end of EH call
 2015-05-20 19:01:52 -03:00
Kavinsky
4b048553e2 wops... corrected wrong path 2015-05-20 23:44:50 +02:00
Kavinsky
8e9b35c757 Fixed Capitalized folders on include paths 2015-05-20 23:28:10 +02:00
Joko
8c69ff4573 reset Form SETVAR to setVariable 2015-05-20 22:13:18 +02:00
ulteq
7d3bb526dd Merge pull request #1263 from acemod/bulletTraceTweak 
Slightly increased the bullet trace effect size
 2015-05-20 22:12:37 +02:00
ulteq
149e3ae8b0 Slightly decreased the visibility of the bullet trace effect. 2015-05-20 22:12:02 +02:00
Alessandro Foresi
67319b6808 Fixed: Removed § at the end of EH call 2015-05-20 22:04:19 +02:00
jaynus
e6270f6e39 Fixed: Font config breaking checkPBO 2015-05-20 10:42:24 -07:00
KoffeinFlummi
f16f282abd Merge remote-tracking branch 'origin/release' into master-fix 
Conflicts:
	addons/medical/functions/fnc_handleDamage.sqf
	extensions/common/p3d/animation.cpp
	extensions/common/p3d/compressed.cpp
	extensions/common/p3d/compressed.hpp
	extensions/common/pbo/archive.cpp
	extensions/common/pbo/search.cpp
	extensions/common/pbo/search.hpp
	extensions/common/shared.hpp
	extensions/common/simplepipe_win32.cpp
	extensions/common/simplepipe_win32.hpp
	extensions/common/simulation/object.cpp
	extensions/common/simulation/object.hpp
	extensions/common/targetver.h
	extensions/common/vector.hpp
 2015-05-20 19:31:55 +02:00
PabstMirror
64a401ee8c #1241 closed - Add Editor placeable item 2015-05-20 17:17:10 +02:00
PabstMirror
0d00894d9f #1318 - isInMedicalVehicle - medicClass is number 2015-05-20 17:17:09 +02:00
Garth L-H de Wet
8edeb45d6d Changed the animation from medic to put when placing an explosive. Added a put animation when setting the trigger for an explosive. 2015-05-20 17:17:09 +02:00
esteldunedain
23117db401 - Default viewDistance to video settings - Add 500m and 100m as optional view distances 2015-05-20 17:17:08 +02:00
Grzegorz
96322fe689 PL translation for new advanced ballistics option 2015-05-20 17:17:08 +02:00
esteldunedain
22b83826f0 Bandaid for #1281, until we properly solve unreliable init handlers. 1- Menus for CAManBase are precomputed on preInit 2- Class action menus for all men are supposed to be equal to those of CAManBase Note: we loose the capability of defining actions for specific classes from config (which we don't do on ACE annyway) 2015-05-20 17:15:25 +02:00
Glowbal
694a24c970 Only change the color if bleeding (adv) 2015-05-20 17:15:25 +02:00
Glowbal
0a2679846c Changed: morphine works 15 minutes 2015-05-20 17:15:24 +02:00
Glowbal
e8d169248f Made atropine less effective 2015-05-20 17:15:23 +02:00
Glowbal
82260e5090 Changed: Made Morphine suppress more pain 2015-05-20 17:15:23 +02:00
Glowbal
2b1468db24 Added pain suppression instead of removal 2015-05-20 17:15:22 +02:00
Glowbal
429c85c9f1 fixed missing parameters for non local unit 2015-05-20 17:15:22 +02:00
Glowbal
913c938a9d Added force unconscious parameter #1205 2015-05-20 17:15:21 +02:00
Glowbal
6439bf4e3a Adjusted item mass #1226 2015-05-20 17:15:20 +02:00
Glowbal
808bb6d048 fixes #1195 units do not display injuries 
Is caused because the system thinks medical is disabled for basic units, while this obviously is not the case.
 2015-05-20 17:15:20 +02:00
Glowbal
104fcdc589 fixes #1155 2015-05-20 17:15:19 +02:00
jaynus
d57b93c1a4 woops. tabs. path. 2015-05-20 17:15:19 +02:00
jaynus
5b5ea907d2 Custom fonts for ACE. 2015-05-20 17:15:18 +02:00
Glowbal
d6cc1d4b76 Proposed fix for #1158 
Sent directly to extension instead of splitting it
 2015-05-20 10:26:32 +02:00
ulteq
10df66f218 Merge pull request #1312 from acemod/scopeIncrement 
Elevation and windage can now have different adjustment increments:
 2015-05-20 10:20:22 +02:00
ulteq
c81446400c Grammar 2015-05-20 10:14:10 +02:00
PabstMirror
ebeba23834 Nametag Size Option, selectionPosition for tag pos 2015-05-19 16:57:47 -05:00
PabstMirror
6dc81796b5 ambientBrightness effects tag distance 2015-05-19 16:18:10 -05:00
Joko
bc535c95ba Fixing Privates 2015-05-19 21:46:34 +02:00
ulteq
28c8aba9bd Added missing ! 2015-05-19 20:46:55 +02:00
ulteq
57c37ecb9a Reorder/Rewrite of some advanced ballistics module options: 
* alwaysSimulateForSnipers -> simulateForSnipers
* alwaysSimulateForGroupMembers -> simulateForGroupMembers
* onlyActiveForLocalPlayers -> simulateForEveryone
 2015-05-19 20:46:13 +02:00
ulteq
bd3b84901f Merge pull request #1309 from gienkov/patch-17 
PL translation for new advanced ballistics option
 2015-05-19 20:23:34 +02:00
ulteq
458daad5bb Elevation and windage can now have different adjustment increments: 
* ACE_ScopeAdjust_VerticalIncrement
* ACE_ScopeAdjust_HorizontalIncrement
 2015-05-19 20:13:31 +02:00
Nicolás Badano
0e7e4e112c Merge pull request #1311 from acemod/viewDistanceFix 
Fix for the viewDistance module
 2015-05-19 15:03:37 -03:00
esteldunedain
e022499068 - Default viewDistance to video settings 
- Add 500m and 100m as optional view distances
 2015-05-19 14:48:29 -03:00
Joko
4db9989480 Add Posible to use Mod Parachutes 2015-05-19 19:33:24 +02:00
Grzegorz
e3aabe2c42 PL translation for new advanced ballistics option 2015-05-19 18:52:17 +02:00
jaynus
c4393862aa Merge pull request #1293 from acemod/nametagFireteamColors 
Add assignedTeam color propagation to nametags from the leader
 2015-05-19 09:19:48 -07:00
jaynus
6eec702263 Added isNull check wrapper to nametag color propagation. 2015-05-19 09:19:03 -07:00
Joko
48f44813ea Update to ACE Standarts 
Fix Adding anytime B_Parachute
Fix Reserve Parachute Added if Normal Parachute Open
 2015-05-19 18:17:10 +02:00
Joko
7a012a5acb chuteIsCuted -> chuteIsCut 2015-05-19 14:20:56 +02:00
Joko
e40310189e Prevent Respawn bug 
Change to Macros
 2015-05-19 13:55:25 +02:00
Joko
75be6a1906 TAAAABBBBSSSSSS 2015-05-19 13:47:39 +02:00
Joko
f06f38a107 Add Cut Parachute 2015-05-19 13:45:28 +02:00
PabstMirror
7c8505592b Chunk Data to Extension, add some extra diag info 2015-05-19 01:57:41 -05:00
PabstMirror
4d877196e4 Missing Parenthesissies 2015-05-19 00:36:54 -05:00
Glowbal
572b46a473 fix for #1297 Being near Campfires messes up basic medical and causes large fps lag 
Should only do a max of 1 PFH at a time. If new damage is received before the PFH is completed, it will reset.
 2015-05-19 07:23:44 +02:00
PabstMirror
942066b04a Nametags - Use EyePos of target 2015-05-19 00:09:49 -05:00
PabstMirror
c4e5e9a7ac #1298 - Reset handcuffs on respawn 2015-05-18 22:02:50 -05:00
PabstMirror
b727fd79c4 Call Ext Directly 
CBA_fnc_split problems
 2015-05-18 19:29:39 -05:00
PabstMirror
bace23c331 Button to dump array info to clipboard 2015-05-18 18:44:52 -05:00
ViperMaul
0a743d847c Set version number to 3.0.1 2015-05-18 15:42:53 -07:00
Glowbal
5b65d4117d fixed wrong macro for addEventhandler 2015-05-18 23:02:46 +02:00
Glowbal
539ed2dc79 Fix debug message and prevent Instant death inside vehicles 2015-05-18 22:22:57 +02:00
PabstMirror
559f3cbd0f #1171 - Safe get variables if settings not defined 2015-05-18 21:34:57 +02:00
esteldunedain
fc5c529772 Fixed object actions not working 2015-05-18 21:34:39 +02:00
esteldunedain
0d0347d3fa Bandaid for #1281, until we properly solve unreliable init handlers. 
1- Menus for CAManBase are precomputed on preInit
2- Class action menus for all men are supposed to be equal to those of CAManBase
Note: we loose the capability of defining actions for specific classes from config (which we don't do on ACE annyway)
 2015-05-18 21:34:29 +02:00
PabstMirror
8b4cc835d8 #1181 - Reset BFT_markers array each time 2015-05-18 21:34:17 +02:00
Glowbal
771b62ed04 Fix medical vehicle return value 
Could fix #1142
 2015-05-18 21:33:35 +02:00
PabstMirror
c6991fde54 re-add brackets 2015-05-18 21:33:24 +02:00
Glowbal
2621c5a36c fixed incorrect private var name 2015-05-18 21:33:12 +02:00
Glowbal
c76e22463a consistent usage of brackets 2015-05-18 21:32:58 +02:00
PabstMirror
5a4ef610ec Use PFEH array instead of setVariable 2015-05-18 21:32:47 +02:00
PabstMirror
2c3a5b0603 Start vital tracking after treatment 2015-05-18 21:32:22 +02:00
PabstMirror
f511de0a49 Calculate vitals interval on first run 2015-05-18 21:32:05 +02:00
Glowbal
853c654b4d fixes #1195 units do not display injuries 
Is caused because the system thinks medical is disabled for basic units, while this obviously is not the case.
 2015-05-18 21:00:32 +02:00
Glowbal
fc99d07f7c fixes #1155 2015-05-18 21:00:18 +02:00
jaynus
c17df2acb8 Change to execNextFrame. 2015-05-18 21:00:06 +02:00
jaynus
1c69f4faa4 Fixed: Litter spawning at huge radius, floating litter over water. Fixes #1112 2015-05-18 20:59:56 +02:00
jaynus
98df03ca27 Changed: checkFiles extension check prints version returned by extension 
Changed: Build changed to SSE2 instead of defaulting to AVX.
 2015-05-18 20:59:00 +02:00
VKing
1cab51156a Made better with Pabstology (tm) 2015-05-18 20:58:16 +02:00
VKing
5c7e59fd29 Hacked order to fix order of comanche zoom levels 2015-05-18 20:58:03 +02:00
jaynus
d8b4b53b80 Added: Monitor 5sec interval to propegate assignedTeams from leader, allowing team colors to be assigned by the team leader and show in the group. Uses vanilla team assignment. Closes #1279 2015-05-18 08:31:29 -07:00
ulteq
3c5eac96ea Merge pull request #1261 from acemod/ModuleSettings_AB_WD 
Added a new module option for advanced ballistics:
 2015-05-18 13:39:21 +02:00
ulteq
8eaf754fdd Further increased the visibility of the bullet trace effect. 2015-05-18 10:56:34 +02:00
PabstMirror
1e7e5c7aa5 Don't show passenger actions for UAV crew 2015-05-17 17:52:56 -05:00
PabstMirror
53d6d4578b Explosives - Fix UBC 
Updating base class PipeBombBase->IEDUrbanBig_Remote_Ammo, by
z\addons\ace\explosives\config.cpp/CfgAmmo/IEDLandBig_Remote_Ammo/
Updating base class PipeBombBase->IEDUrbanSmall_Remote_Ammo, by
z\addons\ace\explosives\config.cpp/CfgAmmo/IEDLandSmall_Remote_Ammo/
 2015-05-17 17:21:31 -05:00
gienkov
0993c0f0b0 Fix tabs and errors 2015-05-17 23:28:00 +02:00
ulteq
94453f60f2 Merge pull request #1255 from BullHorn7/vehiclelock 
Documentation: Vehiclelock, Weather
 2015-05-17 23:19:20 +02:00
Josuan Albin
836cd9d833 Documentation pass 3 
- Fixed typos in laser/readme
- Documentation guidelines updated
- ACE3 mentions updated in
- - ai
- Updated doc
- - fcs
- - hearing
-  -hitreaction
- - interaction
- - interact_menu
- - inventory
- - javelin
- - laser
- - laserpointer
- - laser_selfdesignate
- - logistics_uavbattery
- - logistics_wirecutter
- - magazinerepack
- - main
- - map
- - maptools
- - markers
 2015-05-17 21:01:17 +02:00
PabstMirror
3daec7d98d Fix UAV and Interaction Compile Inheritance 2015-05-17 13:51:59 -05:00
ODK-Bn
13740d9f32 translated the missing strings into Russian 2015-05-17 13:25:08 +02:00
ulteq
4513b02c10 Experiment with the bullet trace effect size 2015-05-17 12:57:55 +02:00
ulteq
96b92ac172 Added a new module option for advanced ballistics: 
* alwaysSimulateForGroupMembers
 2015-05-17 11:45:55 +02:00
ulteq
9e8283ebab Merge pull request #1260 from acemod/toggleDevices 
ATragMX/Kestrel 4500 dialogs can be toggled on/off with keybinds.
 2015-05-17 11:23:56 +02:00
ulteq
ea32aa0265 ATragMX/Kestrel 4500 dialogs can be toggled on/off with keybinds. 2015-05-17 11:23:31 +02:00
PabstMirror
e78c2fd676 Extension framework changes 2015-05-17 04:05:43 -05:00
Glowbal
d9da4211f7 Merge branch 'master' into medicalExtension 2015-05-17 09:51:41 +02:00
Glowbal
2b91d398f0 added extension to config 2015-05-17 09:51:34 +02:00
PabstMirror
78dec5debc Merge branch 'master' into userActionPrototype 
Conflicts:
	addons/interact_menu/XEH_preInit.sqf
 2015-05-16 22:49:09 -05:00
PabstMirror
1ccf6fb70d #1181 - Reset BFT_markers array each time 2015-05-16 21:54:11 -05:00
gienkov
4bebedf73e Stringtable Zeus and View Distance 
* Stringtabled ACE Zeus module
* Stringtabled ACE View Distance
* Lowered default view distance to 1500 because default value (10000)
makes enormous FPS drop at start for low end machines
 2015-05-17 00:53:55 +02:00
Glowbal
556b9ad7d8 removed debug prints 2015-05-17 00:47:42 +02:00
Glowbal
4d8f24d2ae Removed old sqf version. 2015-05-17 00:44:45 +02:00
Glowbal
1d7bfa239f Temp added old sqf version for easy performance comparison 2015-05-17 00:08:34 +02:00
ulteq
e0f9d3f6e1 Merge pull request #1253 from acemod/kestrelExpansion 
Kestrel Feature Expansion
 2015-05-16 23:46:36 +02:00
ulteq
a008c45875 Fixed heading can be negative 2015-05-16 23:34:50 +02:00
ulteq
cdd07a33c9 Fixed some typos 2015-05-16 23:30:16 +02:00
Glowbal
e3dd1eaf47 Using extension for handleDamage wounds instead of sqf 2015-05-16 23:21:03 +02:00
Glowbal
23a1bc86ca Loading config data to extension 2015-05-16 23:20:38 +02:00
BullHorn
c05e7fb046 Documentation: Vehiclelock - 1st iteration 
Add feature\Vehiclelock.md and add relevant info for players
Edit addons\Vehiclelock\readme.md for typos and errors
Edit missionmaker\modules.md for additional info
 2015-05-16 23:42:54 +03:00
ulteq
1b9b8543d3 Merge pull request #1252 from acemod/typoFixATragMX 
Fixed a minor bug in bullet diameter GUI output
 2015-05-16 21:44:58 +02:00
ulteq
01b30c6677 Fixed a minor bug in bullet diameter GUI output 2015-05-16 21:44:43 +02:00
ulteq
f9b7e3c6f7 Fixed clashing MACRO names 2015-05-16 21:10:34 +02:00
ulteq
9116fed415 New main menu: 'date' | New sub menu: 'magnetic heading' 2015-05-16 20:26:52 +02:00
jonpas
ce8d6b683c Prettified Explosive's CfgAmmo and CfgMagazines 2015-05-16 17:49:31 +02:00
jonpas
c95ecca6a8 Added IED Pressure Plates, closes #1191 2015-05-16 17:44:35 +02:00
Glowbal
f02314e996 Merge pull request #1217 from acemod/medicalFixes2 
Medical Vitals Fixes
 2015-05-16 15:35:42 +02:00
VKing
5f328ce616 Added ace_ui - enchanced chat visibility on the map screen 2015-05-16 15:28:59 +02:00
ulteq
03b478aeee Reworked dew point, heat index and wind chill calculations 2015-05-16 12:39:52 +02:00
ulteq
ea68e91ef9 Refactored and expanded the kestrel data collection 2015-05-16 11:13:54 +02:00
ulteq
b65ac1f305 Fixed some bugs in the Kestrel 4500 output generation 2015-05-16 11:13:50 +02:00
ulteq
0377526a7c Finished heat index and wet bulb functions 2015-05-16 11:12:29 +02:00
PabstMirror
bb63882d20 #1238 - open door error 2015-05-15 22:52:54 -05:00
PabstMirror
1dd34199d6 ASDG- Fail gracefully if attachments not compatible 2015-05-15 22:23:46 -05:00
jonpas
c0c4414ec0 Name tags Draw3D variable names consistency 2015-05-16 01:35:48 +02:00
jonpas
1a468cb4ff Split common ACE_Settings.hpp from config.cpp, shortened sampleSetting 2015-05-16 01:06:29 +02:00
jonpas
cccc741a16 #1123 - Added CheckPBOs to ACE_Settings 2015-05-16 00:54:01 +02:00
ulteq
8b878552cb Fixed several typos in the heat index coefficients 2015-05-16 00:51:53 +02:00
jonpas
bffe58efd6 Name Tags cleanup 2015-05-16 00:22:23 +02:00
jonpas
7c96c12bd5 Made forced settings through module in original entry, Reworked Draw3D handling, Some strings cleanup 2015-05-16 00:07:38 +02:00
esteldunedain
0b1beed219 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into reliableSettings 
Conflicts:
	addons/common/XEH_postInit.sqf
 2015-05-15 18:18:13 -03:00
PabstMirror
dabd11b9c5 MedicalStringtable - Fill missing languages 2015-05-15 16:01:39 -05:00
PabstMirror
1e1c6a6930 Merge pull request #1230 from gienkov/patch-16 
Missing Medical module stringtable entries
 2015-05-15 15:59:57 -05:00
SilentSpike
38abe1dd02 Using inline code instead of holdover function 2015-05-15 21:09:55 +01:00
SilentSpike
9d0af2138c Removed old spawn 2015-05-15 21:03:19 +01:00
SilentSpike
84d06bac34 Another fix for moduleCurator 2015-05-15 20:54:17 +01:00
ulteq
56eecfda03 Fixed heat index coefficients syntax 2015-05-15 21:41:07 +02:00
ulteq
8120cef964 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-05-15 21:12:02 +02:00
ulteq
cee775e5ac Removed spaces in PARAMS macro 2015-05-15 21:11:53 +02:00
ulteq
ef225b366b Kestrel GUI expansion 2015-05-15 21:11:03 +02:00
ulteq
7f966de28c Added wet bulb calculation, fixed macros 2015-05-15 21:10:46 +02:00
esteldunedain
89fe91cce0 Fix tap shoulders keybind 2015-05-15 15:52:09 -03:00
esteldunedain
d189cffce6 Fix event names 2015-05-15 15:49:22 -03:00
PabstMirror
eed76d5bcf Fix mike tyson spelling 2015-05-15 13:47:44 -05:00
ulteq
2f7d7ece56 Added utility function to calculate the dew point 2015-05-15 19:58:24 +02:00
Nicolás Badano
45961314af Merge pull request #1209 from SilentSpike/zeusEdit 
Fix for curator module
 2015-05-15 14:51:16 -03:00
jaynus
e1c3e96eb1 Fixes: Nil scheduled space bug with hashes. This is still a bug everywhere else. 2015-05-15 10:45:07 -07:00
Grzegorz
1e552496d5 Missing strings 
They need to be here otherwise few options are blank inside medical modules.
 2015-05-15 19:23:49 +02:00
ulteq
e6ed1e5dbd Added utility functions to calculate heat index and wind chill 2015-05-15 19:00:11 +02:00
jonpas
02b9df1bc3 Fixed client setting Draw3D installation/removal handling 2015-05-15 18:13:10 +02:00
jonpas
1ccc7e1e0a CBA Macro for addEventHandler 2015-05-15 17:44:58 +02:00
jonpas
2edbacd15b Added SettingChanged EH and proper handling 2015-05-15 17:16:55 +02:00
jonpas
a7cd36bc3e Added Force setting 2015-05-15 16:52:27 +02:00
jonpas
62d7ea0b03 Fixed module entry not taking effect 2015-05-15 16:31:06 +02:00
SAM
bed35b1ac8 Fixed safemode module indentation 2015-05-15 15:41:41 +02:00
jonpas
58ad012433 Merge branch 'master' into nametagsToggle 
Conflicts:
	addons/nametags/ACE_Settings.hpp
 2015-05-15 15:37:18 +02:00
ulteq
b609b0fec1 Merge branch 'module-cleanup' of https://github.com/Winter259/ACE3 into Winter259-module-cleanup 2015-05-15 14:59:54 +02:00
SAM
736c4f94e1 Revered macro on fnc_throwGrenade 2015-05-15 14:47:37 +02:00
ulteq
7a95e2a7bd Weather module macro cleanup 2015-05-15 14:20:18 +02:00
SAM
8199a4ad34 Removed extra private 2015-05-15 10:30:15 +02:00
SAM
ca17e71200 Safemode macro cleanup 2015-05-15 10:06:11 +02:00
SAM
7c099c1009 Weaponselect module macro cleanup 2015-05-15 09:59:57 +02:00
PabstMirror
1d64e5917f re-add brackets 2015-05-15 02:32:19 -05:00
Glowbal
56aec85616 fixed incorrect private var name 2015-05-15 09:25:57 +02:00
Glowbal
4b245c0fc4 consistent usage of brackets 2015-05-15 09:25:00 +02:00
PabstMirror
39bc7d06be Use PFEH array instead of setVariable 2015-05-15 02:15:03 -05:00
PabstMirror
8dbca1d3de Start vital tracking after treatment 2015-05-14 22:18:53 -05:00
PabstMirror
8abd3c1fef Calculate vitals interval on first run 2015-05-14 22:16:44 -05:00
esteldunedain
ca94fd4c78 Remove the pfh 2015-05-14 20:58:45 -03:00
esteldunedain
6774739854 Fix #1201 2015-05-14 20:54:11 -03:00
PabstMirror
297cbaef08 #1212 - Add PREP for explosive's module function 2015-05-14 18:49:11 -05:00
esteldunedain
5e3b6f389a Reliable settings framework 2015-05-14 20:45:53 -03:00
PabstMirror
a07f6091f1 Merge pull request #1207 from acemod/commongPrivates2 
Common Privates 2
 2015-05-14 18:34:22 -05:00
PabstMirror
666db5e245 Fix Typo 2015-05-14 18:13:20 -05:00
SilentSpike
60ade8deaa Providing correct parameters 2015-05-15 00:09:03 +01:00
SilentSpike
c458deeae2 End of file newline 2015-05-15 00:02:12 +01:00
esteldunedain
032a2f3778 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into viewdistancetweaks 
Conflicts:
	addons/viewdistance/XEH_postInit.sqf
 2015-05-14 19:54:58 -03:00
SilentSpike
0ca8a373d1 BIS_fnc_ActivateAddons must run during mission init 2015-05-14 23:50:58 +01:00
PabstMirror
8cab041806 Missing Nametag Settings File from #1196 2015-05-14 17:24:37 -05:00
PabstMirror
d5db268fc0 Clean unused privates 2015-05-14 17:17:41 -05:00
PabstMirror
c27d84e382 Common Privates Redo 2015-05-14 17:12:40 -05:00
jonpas
22c5c03f6f Removed redundant defaultValue and checks 2015-05-15 00:04:20 +02:00
jonpas
6ba4289511 Merge branch 'master' into nametagsToggle 
Conflicts:
	addons/nametags/config.cpp
 2015-05-14 23:38:11 +02:00
jonpas
d7b617f49e Stringtables fixed, variable macro fixed 2015-05-14 23:33:35 +02:00
Nicolás Badano
d9b6636221 Merge pull request #1196 from Winter259/common-cleanup 
Cleanup of nearly all common functions
 2015-05-14 18:31:19 -03:00
jonpas
446ad378ca Fixed variable incosistency, string added for new module option 2015-05-14 23:27:41 +02:00
jonpas
8a2a53ddac Show player names module option added 2015-05-14 23:26:37 +02:00
jonpas
77e13ca5be Seperated ACE_Settings 2015-05-14 23:18:38 +02:00
PabstMirror
fd8d68c451 Merge branch 'master' into multipleDevices 
Conflicts:
	addons/common/stringtable.xml
 2015-05-14 15:38:13 -05:00
PabstMirror
2158f467f4 #1171 - Safe get variables if settings not defined 2015-05-14 15:29:09 -05:00
SAM
b2371b1278 Fixed missing nametags config 2015-05-14 22:21:55 +02:00
PabstMirror
03130ab3c9 #1187 - canInteractWith was failing vehicle actions 2015-05-14 15:00:03 -05:00
esteldunedain
e76db653e8 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-05-14 16:56:51 -03:00
esteldunedain
f17c7c12a6 Fixed object actions not working 2015-05-14 16:56:32 -03:00
esteldunedain
a9197a8e33 Make viewdistance disabable through settings and module 2015-05-14 16:36:12 -03:00
SAM
31adb5a9fc Second batch of settings files 2015-05-14 20:59:25 +02:00
SAM
021679208b First batch of settings files 
Separating ACE_Settings.hpp from config.cpp
 2015-05-14 20:46:35 +02:00
esteldunedain
195643d557 Handle player not existing 2015-05-14 15:24:35 -03:00
esteldunedain
2027a28959 Modify changeViewDistance so: 
- Displays objects distance percentage instead of coeficient
- Only display that if not off
 2015-05-14 15:16:02 -03:00
esteldunedain
7a6fb54654 Small tweaks to viewdistance 2015-05-14 15:15:07 -03:00
SAM
0b6f02f45e Second batch of cleaned up files. 2015-05-14 20:06:06 +02:00
SAM
9b55dd0b57 First batch of cleaned up files 2015-05-14 20:02:42 +02:00
PabstMirror
f0b7b34321 Cleanup 2015-05-14 13:00:56 -05:00
PabstMirror
ec38c8c951 Merge branch 'master' into interactionPrivates 
Conflicts:
	addons/interaction/functions/fnc_addPassengerActions.sqf
	addons/interaction/functions/fnc_getDoorAnimations.sqf
	addons/interaction/functions/fnc_moduleInteraction.sqf
	addons/interaction/functions/fnc_moveDown.sqf
	addons/interaction/functions/fnc_removeTag.sqf
	addons/interaction/functions/fnc_showMouseHint.sqf
	addons/interaction/functions/fnc_updateTooltipPosition.sqf
 2015-05-14 12:53:18 -05:00
esteldunedain
0b8992a503 Small tweaks to viewdistance 2015-05-14 14:45:31 -03:00
esteldunedain
32f7854bf6 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into viewdistance 2015-05-14 14:09:12 -03:00
esteldunedain
7191778402 Merge branch 'viewdistance' of https://github.com/Winter259/ACE3 into viewdistance 2015-05-14 14:08:43 -03:00
jaynus
d5a8f21480 Merge pull request #1087 from SilentSpike/zeustemp 
Added zeus changes module as per #1082
 2015-05-14 09:32:03 -07:00
SAM
8c7d752fcc Made final adjustments 
Centred prompts, fixed erroneous if statement, adjusted function
headers.
 2015-05-14 18:25:41 +02:00
SAM
3480168e05 Integrated new function into module 2015-05-14 17:44:35 +02:00
esteldunedain
54325b4591 Merge branch 'viewdistance' of https://github.com/Winter259/ACE3 into viewdistance 2015-05-14 12:43:47 -03:00
jaynus
92799719b6 Spall off by default. 2015-05-14 08:30:06 -07:00
SAM
853333ac49 Added new function, updated settings 2015-05-14 17:19:14 +02:00
SAM
7fe73c2c80 Added Object View Distance Coefficient setting 2015-05-14 17:11:52 +02:00
jaynus
035277aafc removed illegal character 2015-05-14 08:11:08 -07:00
SAM
d8cce9ece4 Removed redundant settings 2015-05-14 17:07:20 +02:00
jonpas
5a17b39a7e Merge remote-tracking branch 'origin/master' into interactionCodingGuidelines 
Conflicts:
	addons/interaction/CfgVehicles.hpp
 2015-05-14 16:57:49 +02:00