Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,418 Commits 73 Branches 88 Tags 752 MiB
59fe345f60
Commit Graph

337 Commits

Author SHA1 Message Date
jonpas
1331265e65 Move url into a macro 2016-06-01 13:49:10 +02:00
jonpas
6730d016c2 Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility 2016-06-01 13:27:02 +02:00
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
commy2
fd26e2e44e Merge pull request #3516 from acemod/cbamissiontime 
replace timePFH with CBA_missionTime
 2016-05-30 21:23:57 +02:00
commy2
7512c4e52e manual merge 2016-05-30 21:14:34 +02:00
jonpas
7a307393a4 Merge branch 'master' into useQuotedPathMacros 2016-05-30 21:14:17 +02:00
jonpas
5d36f84eb1 qGVAR overheating and reloadlaunchers 2016-05-25 20:13:36 +02:00
SilentSpike
207d6612da Remove duplicate ACE_newEvents entries 2016-05-24 15:06:17 +01:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
SilentSpike
108ff4f644 Replace ACE event system calls with CBA counterparts 
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
 2016-05-22 16:47:39 +01:00
jonpas
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
commy2
d93132dac8 more replacing 2016-05-18 11:57:40 +02:00
commy2
da70854568 manual merge 2016-05-18 11:48:27 +02:00
Ozan Eğitmen
b8abec0c61 Fix Capitalization of ACE Settings classes. (#3627) 2016-05-07 22:14:56 +02:00
PabstMirror
cf92ba9c46 Overheating - Add Master Enabled Setting (barrelPR) 2016-05-04 14:59:04 -05:00
PabstMirror
bc584b4c95 Merge remote-tracking branch 'refs/remotes/origin/master' into spareBarrelSimulation 2016-05-04 13:00:34 -05:00
PabstMirror
7cc2da2bb1 Fix self swap action 2016-04-29 23:38:01 -05:00
ProfessorCZ
7d0fcde9fa CZ Translate - Update 
04/30/2016
 2016-04-30 00:57:24 +02:00
James McCartney
153cd28f94 Change event name to weaponJammed 2016-04-11 23:09:45 +01:00
James McCartney
121c45eb84 Raise a local event when a weapon is jammed 2016-04-11 22:29:33 +01:00
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
Alessandro Foresi
e97c7c0f65 Translation: IT completed (with BOM) 2016-03-27 21:22:15 +02:00
Alessandro Foresi
e5a7578f92 Translation: IT completed (no BOM) 2016-03-27 21:20:15 +02:00
esteldunedain
ae8cbb4834 Add "check temperature" and "swap barrel" actions for AARs 2016-03-05 23:33:30 -03:00
esteldunedain
6cf9787fd1 Fix travis warning 2016-03-05 13:18:41 -03:00
esteldunedain
ebfd76107e The function name was changed in CBA 2016-03-05 13:15:56 -03:00
esteldunedain
62f598b2a6 Use the correct CBA function name, defining it in ACE as long as it doesn't exist already. 2016-03-05 13:11:20 -03:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
esteldunedain
d886289716 Display the new weapon temperature right after swapping barrels 2016-03-01 19:27:39 -03:00
esteldunedain
850a499c0e Localize spare barrel's displayName 2016-03-01 19:26:20 -03:00
esteldunedain
e6a2ca7102 Fix typos 2016-03-01 19:25:45 -03:00
esteldunedain
f130d6c253 Increase spare barrel mass to 60 (2.7 Kg) 2016-03-01 18:17:58 -03:00
esteldunedain
b8c8c21a02 Remove spare barrels from starting equipments 2016-03-01 18:17:23 -03:00
esteldunedain
a041555381 Add an animation and progressbar to the "Check spare barrels temperatures" action 2016-03-01 18:16:14 -03:00
esteldunedain
46a96dd5da Move spare barrel event handlers out of postInit 2016-03-01 18:14:36 -03:00
esteldunedain
bc4a338d32 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into spareBarrelSimulation 2016-03-01 17:15:14 -03:00
esteldunedain
bafe714ab5 Remove spare barrels from starting equipment, as they make some grenades not fit in the uniforms. 2016-03-01 10:05:06 -03:00
Jonathan Pereira
309f48ee0b Added remaining PT-BR translarions 2016-03-01 08:56:43 -03:00
BlackWindowS
c61e7b5104 Tweaked & added translations 
Translation of almost every STR to French
 2016-02-28 14:48:04 +01:00
esteldunedain
b8f955468c First version of "Check spare barrel temperatures" action 2016-02-27 01:46:27 -03:00
esteldunedain
e950552345 Track temperatures of spare barrels 2016-02-27 00:29:30 -03:00
jonpas
10abe5cd57 Merge branch 'master' into German-translations 2016-02-27 01:36:07 +01:00
System98
e587744b3e Fix text errors 
- Fix errors in "map_gestures, medical, overheating, slideshow and zeus"
addons
 2016-02-26 11:29:55 +01:00
System98
48d312cb8e Add german translations 
- add missing german translations
- small fixes to existing texts
- remove unused strings in "medical" addon
 2016-02-25 18:10:26 +01:00
gienkov
d4209b2b42 mk6 tagging and overheating translation, finish 2016-02-25 17:16:36 +01:00
Nicolás Badano
69a3c79756 Merge pull request #3418 from acemod/spanishTranslation3.5.0 
Remaining Spanish translations
 2016-02-25 12:28:30 -03:00
PabstMirror
3b03f84116 Disable debug 2016-02-25 09:12:24 -06:00
esteldunedain
64a62d65fc More spanish translations 2016-02-25 11:46:56 -03:00
Nicolás Badano
91e671085e Merge pull request #3371 from acemod/moreSevereJamming 
More severe jamming
 2016-02-25 09:56:08 -03:00
bux578
aa8d3a3fd0 Merge pull request #3221 from BaerMitUmlaut/unified-ellipsis 
Unified ellipsis
 2016-02-23 08:27:28 +01:00
BaerMitUmlaut
74ea79e2cc Unified ellipsis 2016-02-22 23:51:47 +01:00
PabstMirror
37eb353edf Cleanup Merge 2016-02-22 15:03:40 -06:00
PabstMirror
6dc0d7d4f5 Merge branch 'master' into moreSevereJamming 2016-02-22 14:57:40 -06:00
commy2
9712f9c1a4 manual merge 2016-02-22 16:24:10 +01:00
commy2
0f7bfc0f66 Merge pull request #3389 from acemod/precompileongamestart 
precompile on game start
 2016-02-22 16:00:19 +01:00
commy2
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
bux578
55a6ef1937 Merge pull request #3367 from licht-im-Norden87/patch-43 
Update German Stringtable
 2016-02-22 08:26:23 +01:00
Nicolás Badano
d7403976aa Merge pull request #3337 from acemod/overheatingSilencers 
Substantially increase overheating when using silencers or flash suppresors
 2016-02-20 22:06:19 -03:00
esteldunedain
e4e2f0d661 Add a 10% chance for the unjam action to fail (like in ACE2) 2016-02-20 21:09:52 -03:00
esteldunedain
dc7c4ff4fd Increase the jam chance of all weapons at high temperatures 2016-02-20 20:26:30 -03:00
esteldunedain
11f3189306 Add an unjam action to the interact menu when the weapon is jammed 2016-02-20 20:19:56 -03:00
esteldunedain
2dbf979ec6 By default, prevent reloading from automatically clearing a weapon jam (like in ACE2) 2016-02-20 20:05:59 -03:00
licht-im-Norden87
073a476ed1 Update German Stringtable 
Since my other PR was merged I have to open another one to add a few things a fix one or two mistakes. It should be done in <30 minutes. (Guess you guys want to realease 3.5.0 as soon as possible.)
 2016-02-20 22:57:45 +01:00
commy2
73d5b3c77b relace ace_common_fnc_canUseWeapon with CBA_fnc_canUseWeapon 2016-02-20 22:41:24 +01:00
esteldunedain
d00587f367 Minor fixes 2016-02-20 17:40:19 -03:00
ChairborneIT
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
esteldunedain
2d2e95fddc Merge branch 'master' into overheatingSilencers 2016-02-20 17:25:26 -03:00
esteldunedain
e22b1c0d25 Derp 2016-02-18 16:07:39 -03:00
bux
49f565f541 fix merging errors 2016-02-18 20:05:30 +01:00
esteldunedain
2dd835b56b Substantially increase overheating when using silencers or flash suppresors. Optimize overheating calculations for the player through caching. 2016-02-18 15:58:44 -03:00
bux578
93e655588b Merge pull request #3294 from gienkov/pltranslations 
pl translation
 2016-02-18 19:38:43 +01:00
licht-im-Norden87
9419e7daf3 overheating 2016-02-10 17:35:36 +01:00
gienkov
d5dd718b8d fix endlines 2016-02-09 12:01:13 +01:00
gienkov
fafd25dee7 pl translation 2016-02-09 11:50:35 +01:00
esteldunedain
5aa763f0c6 Apply the ufeh to ACE_Overheating 2016-02-06 17:59:54 -03:00
SzwedzikPL
270b557084 fix overheating stringtable 2016-02-05 04:55:05 +01:00
PabstMirror
397a12056a Merge branch 'master' into deterministicOverheatingX 2016-02-02 17:11:00 -06:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
esteldunedain
758611d230 Restrict temp update to current weapon, and only primary or handgun 2016-01-23 11:48:23 -03:00
esteldunedain
91b7c7de61 Change the varname of the weapon data cache to be consistent with other modules 2016-01-20 22:22:53 -03:00
esteldunedain
41f8628917 Change cache location type to ACE_HashLocation 2016-01-20 22:20:16 -03:00
esteldunedain
9d13cc6f60 Move the weapon caching code to a different function. Add compatibility for legacy overheating properties. Add some comments. 2016-01-20 15:19:46 -03:00
esteldunedain
851615a234 Inherit custom gesture classes. 2016-01-20 13:44:51 -03:00
esteldunedain
7860f375c2 Better func description 2016-01-20 13:07:51 -03:00
esteldunedain
89106f6953 Replace addPerFrameHandler for waitAndExecute 2016-01-20 13:05:47 -03:00
esteldunedain
80b9a8961a Improve reload animations 2016-01-20 12:48:39 -03:00
esteldunedain
bce572e1df Derp 2016-01-20 12:15:25 -03:00
esteldunedain
19ccf52425 MRBS to mrbs 2016-01-20 12:05:35 -03:00
esteldunedain
6b4b8b707c Prefix new configs for consistency 2016-01-20 11:42:05 -03:00
esteldunedain
2f7cac68a5 Small fixes 2016-01-20 10:59:58 -03:00
esteldunedain
c78f2f8479 Gotcha travis 2016-01-19 17:29:58 -03:00
esteldunedain
5b90fd8b81 Set default particle effect on for the local player, as per current and historic behaviour. 2016-01-19 17:25:14 -03:00
esteldunedain
9bcabd081b Reorder the fireEH function to allow particle effects for nearby remote players. Add a setting for that (default off). 2016-01-19 17:24:01 -03:00
esteldunedain
8b7ed38990 Add a PFH to cool down all player weapons at (infrequent) regular intervals 2016-01-19 17:04:51 -03:00
esteldunedain
0313e7b322 Divide the weapon state variable into two: a temp variable, and a time variable. Only broadcast the temp part and only approximately 2016-01-19 17:03:47 -03:00
PabstMirror
9d14ff8b03 Merge branch 'master' into deterministicOverheatingX 2016-01-06 23:25:24 -06:00
bux
0e8eb5fac4 Remove obsolete hotkey entries 2015-12-30 11:23:52 +01:00
PabstMirror
462e37e6d1 Update Heating / Cooling physics numbers 
Attempting to update numbers based on real physics.
Effects will increase heat generated per shot and decrease cooling
- ~1.333x increased heating
- ~1.45x less cooling
 2015-12-28 21:01:56 -06:00
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
KoffeinFlummi
a1e709047e Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge 
Conflicts:
	AUTHORS.txt
	addons/aircraft/stringtable.xml
	addons/attach/stringtable.xml
	addons/captives/stringtable.xml
	addons/common/stringtable.xml
	addons/disposable/stringtable.xml
	addons/dragging/stringtable.xml
	addons/explosives/stringtable.xml
	addons/fcs/stringtable.xml
	addons/frag/stringtable.xml
	addons/grenades/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/kestrel/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/logistics_uavbattery/stringtable.xml
	addons/logistics_wirecutter/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/maptools/stringtable.xml
	addons/markers/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/movement/stringtable.xml
	addons/nametags/stringtable.xml
	addons/nightvision/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/parachute/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/reload/stringtable.xml
	addons/reloadlaunchers/stringtable.xml
	addons/respawn/stringtable.xml
	addons/safemode/stringtable.xml
	addons/switchunits/stringtable.xml
	addons/vehiclelock/stringtable.xml
	addons/weaponselect/stringtable.xml
	addons/wep_javelin/stringtable.xml
	addons/winddeflection/stringtable.xml
 2015-04-29 12:52:55 +02:00
Bla1337
cfbf3bd053 Localization update 2015-04-29 11:20:21 +03:00