Commit Graph

3495 Commits

Author SHA1 Message Date
ulteq
b3f4bf306d Moved the global weather controls into preInit 2015-04-24 10:46:33 +02:00
ulteq
66e4c742b4 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-24 10:25:47 +02:00
ulteq
062aeae6e6 Fixed several bugs in the rain simulation:
*Added missing rain initialization based on overcast value
*Added proper fade out when the overcast changes from >=0.7 to <0.7
*Removed duplicate code
2015-04-24 10:25:31 +02:00
ulteq
50546646fa Added missing rain_period_count reset to 0 2015-04-24 10:05:13 +02:00
ulteq
5a90ef6207 Added global variables (syncRain, syncWind, syncMisc) which give some control over the weather module:
*Removed duplicate debug output
2015-04-24 10:03:48 +02:00
ulteq
709fdcdd08 Merge pull request #821 from Brisse89/master
Added realistic tracer burn times for several ammo types
2015-04-24 08:28:43 +02:00
Glowbal
0146439925 increasing the text box height #834
Temporary solution until we get something properly done.

Ideally we would calculate the height of the box through the amount of characters. For that we would need a font with a consistent width across each character, or figure out the width for each character ourselves.
2015-04-24 07:46:01 +02:00
esteldunedain
e3a06999c3 Reduce MainActions distance for CAManBase from 5m to 4m 2015-04-24 00:57:49 -03:00
esteldunedain
c8563ce484 Add LOS check for actions points. Close #785 2015-04-24 00:57:22 -03:00
Nicolás Badano
78b1f0024e Merge pull request #830 from gienkov/patch-7
PL translation fix
2015-04-23 22:52:56 -03:00
Grzegorz
e8a48fa81c PL translation fix
Apparently mini-spike AT still wants to shoot down planes and choppers :)
2015-04-24 01:54:36 +02: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
Brisse89
91dfd9802a Update CfgAmmo.hpp 2015-04-23 13:58:42 +02:00
Brisse89
8d4fff6359 Update CfgAmmo.hpp 2015-04-23 13:56:46 +02:00
Brisse89
5bfa97f490 Update CfgAmmo.hpp 2015-04-23 13:55:26 +02:00
Brisse89
f0a1900ad4 Update CfgAmmo.hpp 2015-04-23 13:53:42 +02:00
Brisse89
ae8a512e8f Update CfgAmmo.hpp 2015-04-23 13:47:25 +02:00
Brisse89
0001609791 Update CfgAmmo.hpp
Added realistic tracer burn times for several ammo types: 
B_556x45_Ball (parent for several tracer rounds)
ACE_545x39_Ball_7T3M
B_762x51_Ball (parent for several tracer rounds)
ACE_762x54_Ball_7T2
ACE_762x39_Ball_57N231P

Also changed color on russian tracer rounds from yellow to green, which is what they are in the real world.
2015-04-23 13:44:55 +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