Commit Graph

139 Commits

Author SHA1 Message Date
PabstMirror
415402b5ad Cleanup and debug
Fix missing weapon configs

Fix Dispersion (Radians / Degrees)

Fix comment
2015-12-28 16:08:32 -06:00
PabstMirror
42b350a40c Cache Weapon Configs 2015-12-28 16:04:56 -06:00
PabstMirror
e587a6e6e3 Modernize code 2015-12-28 16:04:56 -06:00
esteldunedain
c1e8b3dba9 Fix temperature bar color 2015-12-28 16:04:55 -06:00
esteldunedain
f132955d9f Reenable refraction fx but make it optional for the moment. 2015-12-28 16:04:55 -06:00
esteldunedain
d001131314 Tweak and optimize the smoke effect to increase smoke and reduce performance impact 2015-12-28 16:04:54 -06:00
esteldunedain
3c74c4bada Fix temperature indicator to max out red at half the bar 2015-12-28 16:04:54 -06:00
ulteq
4122d68684 Adjusted temperature display (red above 600°C) 2015-12-28 16:04:54 -06:00
ulteq
a1ee99cc8a Remove debug code 2015-12-28 16:04:53 -06:00
ulteq
7858b65fde Fixed misspelled function name 2015-12-28 16:04:53 -06:00
ulteq
0a27c309cb Added missing variable definitions 2015-12-28 16:04:52 -06:00
commy2
f83206353d jamming 2015-12-28 16:04:52 -06:00
Nicolás Badano
4264789631 Refactored code so the weapon temperature is correctly updated when checking it 2015-12-28 16:04:52 -06:00
Nicolás Badano
ac67e45098 overheating: sync weapon temperature across the net, deterministic pseudo-random bullet dispersion 2015-12-28 16:04:51 -06:00
commy2
a9ebcf8543 fix setVariable and getVariable capitalization 2015-11-30 17:27:09 +01:00
commy2
ca9b909e75 fix CBA_fnc capitalization 2015-11-30 16:45:20 +01:00
VKing
069169cc72 Changed ACE_time back to time in comments where appropriate 2015-10-21 22:52:21 +02:00
PabstMirror
079d88ded7 Merge pull request #2509 from acemod/miscFixNilFunctions
Fix some nil functions
2015-09-21 20:36:09 -05:00
PabstMirror
79d4eb62be Allow fixing jam when in FFV slot 2015-09-20 16:55:33 -05:00
PabstMirror
5f0d73bab6 Cleanup more stuff 2015-09-18 14:24:20 -05:00
Glowbal
7e5ab07e32 Merge pull request #2387 from acemod/FixHCPPE
Fix that PPEffects Throw a error on HC
2015-09-15 21:04:37 +02:00
jokoho48
b7e02da1cc remove if (!hasInterface) from PFH
move ! in ()
2015-09-11 16:58:26 +02:00
Michael Braun
035b3432c5 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
Conflicts:
	addons/common/XEH_postInit.sqf
2015-09-01 08:45:59 +02:00
commy2
fc6f97e09e fix autoriflemen spawning with 0x frag grenade bug 2015-08-30 13:30:21 +02:00
Michael Braun
5047d4de1c Switched to ACE_LOG<LEVEL>_# variation 2015-08-26 17:39:44 +02:00
Michael Braun
097506076f Fixed format usage in macros requiring ARR_# for it to work 2015-08-26 16:48:55 +02:00
Michael Braun
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +02:00
PabstMirror
b3741f4036 Capitalization for macro CBA_fnc_addPerFrameHandler 2015-08-04 02:34:38 -05:00
jonpas
332afb2174 Allow certain self-interactions while sitting 2015-06-09 16:17:05 +02:00
jonpas
541f1010a7 Merge branch 'master' into macroSTR
Conflicts:
	addons/attach/functions/fnc_attach.sqf
	addons/captives/functions/fnc_moduleSurrender.sqf
	addons/common/CfgVehicles.hpp
	addons/explosives/CfgModule.hpp
	addons/hearing/CfgVehicles.hpp
	addons/interaction/CfgVehicles.hpp
	addons/map/CfgVehicles.hpp
	addons/microdagr/CfgVehicles.hpp
	addons/mk6mortar/CfgVehicles.hpp
	addons/nametags/CfgVehicles.hpp
	addons/nightvision/functions/fnc_changeNVGBrightness.sqf
	addons/respawn/CfgVehicles.hpp
	addons/switchunits/CfgVehicles.hpp
	addons/vehiclelock/CfgVehicles.hpp
	addons/winddeflection/stringtable.xml
2015-06-02 22:14:32 +02:00
PabstMirror
473ab7d7c0 Fix mmg UBC 2015-05-31 23:48:20 -05:00
jonpas
d934c25b78 Merge branch 'master' into macroSTR
Conflicts:
	addons/interact_menu/ACE_Settings.hpp
2015-05-30 19:54:32 +02:00
Josuan Albin
7603e71468 removed useless entries 2015-05-29 22:08:13 +02:00
Josuan Albin
26a9f7f38e navid and SPMG barrel swapping added
- added navid class to barrel swapping config
- added SPMG class to barrel swapping config
2015-05-29 15:31:48 +02:00
jonpas
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
jonpas
6f6f2a55f0 Stringtable fixes except medical 2015-05-27 21:43:30 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
Kavinsky
8e9b35c757 Fixed Capitalized folders on include paths 2015-05-20 23:28:10 +02:00
SAM
31adb5a9fc Second batch of settings files 2015-05-14 20:59:25 +02:00
KoffeinFlummi
a8c4068b56 Remove unnecessary comment 2015-05-07 18:51:18 +02:00
KoffeinFlummi
db07de31af Whoops; back to the roots. 2015-05-07 18:49:40 +02:00
KoffeinFlummi
27c8255987 Convert ACE_bulletMass to grams 2015-05-07 18:33:34 +02:00
Bla1337
a7d66b59cf transaltions 2015-05-03 14:01:35 +03:00
KoffeinFlummi
761e23001f Merge https://github.com/Dimaslg/ACE3 into spanish-merge
Conflicts:
	addons/medical/stringtable.xml
	addons/missileguidance/stringtable.xml
	addons/optionsmenu/stringtable.xml
2015-05-01 16:51:20 +02:00
Glowbal
131468f0d8 plurals 2015-04-30 22:39:33 +02:00
Glowbal
1ca0d66f30 Initial categories 2015-04-30 22:02:20 +02:00
ulteq
2c97b20781 Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master
Conflicts:
	addons/atragmx/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/medical/stringtable.xml
	addons/missileguidance/stringtable.xml
	addons/overheating/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/vehiclelock/stringtable.xml
2015-04-30 13:20:31 +02:00
Dimaslg
f8d5c423ae Merge conflicts resolved 2015-04-29 21:15:22 +02:00
NukeDev
d4dc5e6d85 Other Fixes 2 2015-04-29 17:22:20 +02:00