Ivan Navarro Cabello
d15bae105d
Updated spanish translation
...
Updated spanish translation
2015-06-08 12:43:07 +02: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
PabstMirror
64d529ed3c
Merge pull request #1538 from acemod/unHolsterWeapon
...
#1208 - Holster key also unholsters
2015-06-07 14:25:06 -05: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
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
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
0f03bef5f1
Merge pull request #1524 from acemod/handleFiredCleanup
...
Removed some dead code
2015-06-06 23:31:07 -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
ulteq
a870d5d760
ACE2 HuntIR port
2015-06-06 14:13:34 +02: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
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
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
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
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
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
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
