Commit Graph

5402 Commits

Author SHA1 Message Date
PabstMirror
e2217220eb HitReactions - Don't do when mounted, add setting 2015-05-31 16:16:14 -05:00
gienkov
a173b5b048 TABS 2015-05-31 22:46:32 +02:00
gienkov
212862a401 Merge remote-tracking branch 'origin' into pl-translation-1
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/frag/stringtable.xml
2015-05-31 22:45:09 +02:00
Macusercom
53e0b35c12 German 1 correction for Advanced Ballistics 2015-05-31 20:31:38 +02:00
ulteq
4802ffeebf Fixes random teleport when dragging/carrying inside of buildings. 2015-05-31 18:34:48 +02:00
ulteq
3a2fd9dc08 Merge pull request #1457 from acemod/weatherReadme
New weather module readme/feature description.
2015-05-31 17:39:52 +02:00
ulteq
a1f199bfdc New weather module readme/feature description. 2015-05-31 17:39:24 +02:00
ulteq
6292db8e3b Merge pull request #1456 from acemod/rain_probability
Overcast > 0.7 no longer implies rain:
2015-05-31 17:31:10 +02:00
ulteq
903fb89d77 Overcast > 0.7 no longer implies rain:
* The higher the overcast value the higher the chance for rain
* But you can end up having no rain with an overcast value of 1.0
2015-05-31 17:30:52 +02:00
ulteq
a0dc435850 Merge pull request #1455 from acemod/airFrictionUpdate
Updated all airFriction values according to: airFrictionAnalysis.txt
2015-05-31 17:09:29 +02:00
ulteq
5c8e79c50a Updated all airFriction values according to: extras/airFrictionAnalysis.txt 2015-05-31 16:45:59 +02:00
Bracconiere
0feef0802a Corrected 2015-05-31 17:28:10 +03:00
ulteq
807a155c1f Merge pull request #1453 from acemod/abExtensionFixes2
Ab extension fixes2
2015-05-31 14:31:51 +02:00
Macusercom
0a47396d10 Corrections for German translation 2015-05-31 14:25:52 +02:00
Glowbal
43a2fed7c2 New dll build for ab 2015-05-31 14:22:00 +02:00
Glowbal
b8b980bd92 Changed speed of sound to double 2015-05-31 14:21:25 +02:00
PabstMirror
89dfd8be17 Merge pull request #1450 from acemod/fixProgressbarDeath
Progress bar stops on death
2015-05-31 02:25:36 -05:00
Glowbal
0b8896239c Progress bar stops on death - fix for #1449 2015-05-31 09:23:36 +02:00
Macusercom
a44546af83 Added my name to AUTHORS.txt 2015-05-30 23:38:08 +02:00
Macusercom
5d1f2eafaa Fix German Translation 2015-05-30 23:34:19 +02:00
Macusercom
038880cb01 Additional Translations for German + some corrections 2015-05-30 23:33:51 +02:00
PabstMirror
23d300df52 Merge pull request #1417 from acemod/localDefuseObjects
Explosives - Local defuse objects
2015-05-30 15:46:07 -05:00
ulteq
b1f0f318ae Merge pull request #1443 from acemod/cupConfig
CUP config
2015-05-30 21:54:12 +02:00
ulteq
cb12146f41 Tabs -> Spaces 2015-05-30 21:53:28 +02:00
ulteq
75518af90f Tabs -> Spaces 2015-05-30 21:52:57 +02:00
ulteq
e41c51966b Added cup scopes config entries 2015-05-30 21:51:24 +02:00
Glowbal
3e3fdcf66e Merge pull request #1429 from acemod/cseNVGadjustment
NightVision adjustment - use CSE's gamma
2015-05-30 21:50:56 +02:00
ulteq
9936af3e4c Added config entries for all cup weapon classes 2015-05-30 21:20:40 +02:00
ulteq
872501dad2 Removed newline brackets 2015-05-30 21:20:17 +02:00
ulteq
6f1c6ae8c1 Added missing ammo class 2015-05-30 20:33:32 +02:00
jonpas
66ceaa1d31 Fixed IS_STRING error due to regex replacing it with LSTRING 2015-05-30 20:09:53 +02:00
ulteq
08b779956d Merge pull request #1441 from acemod/rangeCardFixes
Improved error handling when AB is enabled with incomplete configs
2015-05-30 20:08:11 +02:00
ulteq
5746128a0f Further improved error handling when AB is enabled with incomplete configs:
* Calculates correct solutions when parts of the ammo config are missing
* Calculates correct solutions when parts of the weapon config are missing
* Performance improvement when AB is enabled
2015-05-30 20:06:55 +02:00
jonpas
d934c25b78 Merge branch 'master' into macroSTR
Conflicts:
	addons/interact_menu/ACE_Settings.hpp
2015-05-30 19:54:32 +02:00
PabstMirror
d7d225cebc Send waiting debug msg only once 2015-05-30 01:28:15 -05:00
PabstMirror
b49b2fa3d1 Send to RPT and Clipboard 2015-05-30 01:21:47 -05:00
PabstMirror
84d940e69d Fix circular dependency - ModuleDescription 2015-05-30 00:31:07 -05:00
esteldunedain
9d29aa2107 - Change all modules on ACE using settings to type ACE_Module, so we can guarantee that they wait for settings before initing.
- Make ace_common require ace_modules, so all ACE pbos are guaranteed to have it
2015-05-30 01:37:41 -03:00
esteldunedain
333cb80171 Delay initialization of ACE_Modules until settings are properly setup 2015-05-30 01:18:23 -03:00
Nicolás Badano
d46074ad27 Merge pull request #1432 from acemod/fixSettings
Fix ace_settings
2015-05-30 00:59:23 -03:00
esteldunedain
81bd167ecd Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into fixSettings
Conflicts:
	addons/common/XEH_preInit.sqf
2015-05-30 00:49:02 -03:00
esteldunedain
afa6a2fad9 Remove the "ServerSettingsReceived" event, which is not longer needed. As per @pabstmirror solution, the GVAR(Settings) variable is monitored to determine when the server info has arrived. Fix #1273 2015-05-30 00:43:51 -03:00
esteldunedain
b416e66509 Fix problem with #1214. Probably solve #1273 2015-05-30 00:31:52 -03:00
PabstMirror
5efde25585 Fix ace_settings 2015-05-29 21:03:47 -05:00
Glowbal
552b2f390f Merge pull request #1256 from acemod/medicalExtension
Medical Extension for handleDamage wounds
2015-05-29 23:16:00 +02:00
PabstMirror
d457d9ffea NightVision adjustment - use CSE's gamma 2015-05-29 15:37:53 -05:00
Nicolás Badano
8fbd7e8575 Merge pull request #1426 from alganthe/barrel_swap_fix
navid and SPMG barrel swapping added
2015-05-29 17:11:01 -03:00
Josuan Albin
7603e71468 removed useless entries 2015-05-29 22:08:13 +02:00
Nicolás Badano
8dc8d62bd3 Merge pull request #1428 from acemod/blurInteractionMenu
Blur background while interaction menu is open
2015-05-29 16:58:33 -03:00
Glowbal
00acbaf44d Added blur background client setting 2015-05-29 21:56:07 +02:00