ulteq
|
6273775c1f
|
Merge pull request #1580 from acemod/aplRvmatFixes
Fixed two RVMAT files
|
2015-06-11 17:57:11 +02:00 |
|
ulteq
|
35e2047dca
|
Fixed two RVMAT files
|
2015-06-11 17:56:25 +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 |
|
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 |
|
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
|
58bb496ac2
|
Merge pull request #1564 from acemod/stringtableFixHuntIR
Fixed incorrect CSTRING
|
2015-06-10 18:12:04 +02:00 |
|
ulteq
|
f0f36ea9b2
|
Fixed incorrect CSTRING
|
2015-06-10 18:10:12 +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
|
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
|
ca633fef16
|
Merge pull request #1562 from acemod/fixHandleDamage_caching_returnValue
Fix handleDamage caching return value
|
2015-06-10 12:48:33 +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 |
|
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 |
|
ulteq
|
d454a2ccfc
|
Attempt to fix #1465 and #1354
|
2015-06-09 15:46:00 +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 |
|