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
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
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
