Commit Graph

3499 Commits

Author SHA1 Message Date
PabstMirror
aa7de84783 Merge branch 'master' into mk6tweaks 2015-04-23 13:34:25 -05:00
PabstMirror
55732d4262 Text Shadow should have been black. 2015-04-23 13:33:38 -05:00
ulteq
f5e6da60a7 Added optional rh_m4_comp with advanced ballistics configs 2015-04-23 19:59:57 +02:00
ulteq
ddf62b6db4 Added missing privates 2015-04-23 16:08:02 +02:00
ulteq
b0eadf83c7 Fixed incorrect typicalSpeed 2015-04-23 14:04:01 +02:00
ulteq
b1521345c2 Added magazines for the new AP rounds:
*Fixed some stringtable inconsistencies
*Removed some obsolete stringtable entries
2015-04-23 13:35:57 +02:00
ulteq
dd72fced36 Added M955, M993, MK316 Mod 0, 127x99mm API ammo classes:
*Recalculated the vanilla calibers based on (6.5mm ~ 1.0)
2015-04-23 12:42:01 +02:00
ulteq
be595d9c9e Made the wind speed change less often during good weather 2015-04-23 11:54:24 +02:00
ulteq
e9bb1eea4c Minor muzzle velocity correction for the 6.5mm Creedmor 2015-04-23 11:27:43 +02:00
ulteq
e090c0fb72 Merge pull request #818 from Brisse89/patch-1
Update CfgAmmo.hpp
2015-04-23 11:25:10 +02:00
Brisse89
c975213579 Update CfgAmmo.hpp
Added missing data to 40mm grenades.
2015-04-23 11:11:38 +02:00
ulteq
860b4a446a Updated the 6.5mm Creedmor airFriction:
*Also added it to the ATRagMX gun list
2015-04-22 22:48:38 +02:00
ulteq
543ac7cd90 Merge pull request #797 from acemod/windWeatherOverhaul
Wind weather overhaul
2015-04-22 21:24:46 +02:00
ulteq
09ff217e93 Improved the init process 2015-04-22 21:16:01 +02:00
ulteq
74888b4fff Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into windWeatherOverhaul 2015-04-22 19:47:06 +02:00
ulteq
a9726d2b60 Simplified the wind direction change calculation 2015-04-22 19:46:27 +02:00
ulteq
caf2f12eb9 Improved the wind direction selection based on the probability array 2015-04-22 19:46:09 +02:00
jaynus
0c6786a138 use the vehicle of the player for variables, not the player. allows static optics. FIxes #808 2015-04-22 08:07:58 -07:00
jaynus
d63de3a09e restart PFH on optic reload. Fixes #812 2015-04-22 07:49:18 -07:00
ulteq
ac5d593271 Switched to an improved version of the old getWind function 2015-04-22 12:56:07 +02:00
ulteq
e7bc0c26bc Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into windWeatherOverhaul 2015-04-22 11:54:18 +02:00
ulteq
1d108f42a7 Added a magazine for the new 6.5 Creedmor cartridge
*Fixed the 65x47mm short name
2015-04-22 11:53:22 +02:00
ulteq
2ec95c2862 Brackets 2015-04-22 11:32:16 +02:00
ulteq
f8006eaac9 Expanded the ammo database:
*30-06 Springfield (.30 Cal M1 Ball 174 grain)
*6.5 Creedmore (Berger .264 cal 140 grain Hybrid)
*7mm Rem Mag (Berger .284 cal 180 grain Hybrid)
*.243 Win (Berger .243 cal 105 grain Hybrid)
2015-04-22 11:31:11 +02:00
ulteq
e479557f8a Some magazine Stringtable fixes 2015-04-22 10:48:45 +02:00
ulteq
e80906a241 Merge branch 'rlex-feature/realname_extend' 2015-04-22 10:11:24 +02:00
ulteq
b4ec13aa8c Merge branch 'feature/realname_extend' of https://github.com/rlex/ACE3 into rlex-feature/realname_extend
Conflicts:
	addons/realisticnames/stringtable.xml
2015-04-22 10:10:00 +02:00
Glowbal
fedbf84d5f Merge pull request #800 from acemod/fixDraggingAvailableWithoutMedical
Fixed dragging always available when medical module is removed
2015-04-22 07:43:23 +02:00
Nicolás Badano
e8d8e79a5b Merge pull request #807 from acemod/staticCheckAmmoCleaner
Show Loaded Ammo for static weapons
2015-04-21 21:48:21 -03:00
PabstMirror
8ec86a337f Show Loaded Ammo for static weapons 2015-04-21 19:35:04 -05:00
jaynus
b2c5e5e9f1 Remove AB verison check until versioning is complete. 2015-04-21 17:04:16 -07:00
jaynus
b384d62edd Fixes typos in medical strings causing missing strings. 2015-04-21 17:02:50 -07:00
jaynus
8aa79a579c Extensions rebuilt with new versioning. 2015-04-21 16:56:50 -07:00
jaynus
5e2ac81c59 Merge pull request #805 from acemod/extensionVersioning
Extension versioning
2015-04-21 16:53:18 -07:00
jaynus
e96ba88351 count type correction. 2015-04-21 16:50:01 -07:00
jaynus
93bcf7e9a1 Added versioning to build process and automated version/git integration. 2015-04-21 16:49:30 -07:00
Nicolás Badano
b6d7e12507 Merge pull request #779 from gienkov/master
PL translation fix
2015-04-21 19:25:53 -03:00
commy2
1facca2ba9 fix: missing authors on flares, remove inert duplicate of handgrenade from zeus 2015-04-22 00:24:54 +02:00
Grzegorz
485fd7078f Update stringtable.xml 2015-04-22 00:22:44 +02:00
Nicolás Badano
6e2463b2d5 Merge pull request #802 from acemod/revert-795-fixAuthor
Revert "remove author from items inheriting ACE_ItemCore"
2015-04-21 19:08:33 -03:00
Nicolás Badano
1bfb13abac Revert "remove author from items inheriting ACE_ItemCore" 2015-04-21 19:07:42 -03:00
commy2
cfda0e17c6 Merge pull request #788 from acemod/animfix
put weapon on back without having to stand up
2015-04-21 23:40:52 +02:00
ulteq
a886afb7d0 Added a model for the ACE_Box_Ammo 2015-04-21 23:26:38 +02:00
Nicolás Badano
3105cef364 Merge pull request #787 from acemod/interactionHighVisibility
User changeable text/shadow colors for interaction
2015-04-21 17:31:11 -03:00
Nicolás Badano
18bb40b72b Merge pull request #798 from acemod/fixMapAir
Illuminate map for gunner of helicopters. Fixes #558
2015-04-21 16:52:17 -03:00
jaynus
d8d658602f Apply to all aircraft gunner and pilot 2015-04-21 12:50:42 -07:00
Glowbal
0ab25a2866 fixed #659 2015-04-21 21:41:00 +02:00
ulteq
2fa39615f3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into windWeatherOverhaul 2015-04-21 21:06:30 +02:00
jaynus
b2f978da3c Added unstabalized optic mode to comanche for following the chopper. Is the first optic, all other zoom levels are stabalized. Fixes #556 2015-04-21 12:01:30 -07:00
jaynus
08203b26c7 Illuminate map for gunner of helicopters. Fixes #558 2015-04-21 11:58:07 -07:00