ulteq
|
ca633fef16
|
Merge pull request #1562 from acemod/fixHandleDamage_caching_returnValue
Fix handleDamage caching return value
|
2015-06-10 12:48:33 +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 |
|
Glowbal
|
b8d473cdf7
|
Merge pull request #1559 from acemod/fixMedicalLogLocalization
#1473 - Fix Medical Log Localization
|
2015-06-10 10:11:16 +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
|
06b2da432c
|
Merge pull request #1551 from jonpas/isNotInsideCPfix
Removed isNotInside from Sandbag, SpottingScope and Tripod placement
|
2015-06-09 16:22:25 +02:00 |
|
jonpas
|
3510d43a17
|
Removed isNotInside from Sandbag, SpottingScope and Tripod placement
|
2015-06-09 16:20:43 +02:00 |
|
PabstMirror
|
b61bd1fb75
|
1.46 New RscInfoType (fix UBC)
|
2015-06-08 13:26:18 -05: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 |
|
Nicolás Badano
|
62513a8846
|
Merge pull request #1545 from Legolasindar/master
Updated spanish translation
|
2015-06-08 13:59:24 -03:00 |
|
Ivan Navarro Cabello
|
d15bae105d
|
Updated spanish translation
Updated spanish translation
|
2015-06-08 12:43:07 +02:00 |
|
Legolasindar
|
fbc64a1935
|
Merge pull request #1 from acemod/master
update my master fork
|
2015-06-08 11:48:26 +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
|
da67b4e6fe
|
Merge pull request #1522 from acemod/allStringtableMacros
Macroize all stringtables
|
2015-06-07 14:24:46 -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
|
8a6842c739
|
Merge pull request #1535 from acemod/kestrelModelUpdate
New low-poly Kestrel model
|
2015-06-07 18:17:43 +02:00 |
|
ulteq
|
39ba85b213
|
New low-poly Kestrel model
|
2015-06-07 18:17:09 +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
|
c40a2a9a2f
|
Merge pull request #1527 from acemod/r3fCompat
Added R3F compat pbo
|
2015-06-07 10:18:02 +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 |
|
ulteq
|
afb2bb45fe
|
Added R3F compat pbo
|
2015-06-07 10:11:50 +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 |
|