Agm_Core port #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…stringtables and main variables like ACE_player
|
Thanks @PabstMirror, gj fixing this |
added 2 commits
January 12, 2015 14:16
nicolasbadano
added a commit
that referenced
this pull request
Apr 12, 2015
Merge pull request #1 from acemod/master
KoffeinFlummi
pushed a commit
that referenced
this pull request
Apr 14, 2015
bux
pushed a commit
that referenced
this pull request
Apr 16, 2015
KoffeinFlummi
pushed a commit
that referenced
this pull request
May 2, 2015
KoffeinFlummi
pushed a commit
that referenced
this pull request
Sep 23, 2015
Fork update from master
kymckay
pushed a commit
that referenced
this pull request
Oct 30, 2015
Fixed small UAV carrying allot of cargo.
thojkooi
pushed a commit
that referenced
this pull request
Nov 20, 2015
Refuel Fixes and Additions Thx @jonpas
thojkooi
pushed a commit
that referenced
this pull request
Feb 4, 2016
nicolasbadano
pushed a commit
that referenced
this pull request
Jun 20, 2016
Added custom dogtag model and images
thojkooi
pushed a commit
that referenced
this pull request
Sep 3, 2016
* Change for default ACE_12.7x99 - rhsusf_ammo_127x99_M33_Ball = B_127x99_Ball from addons/ballistics/CfgAmmo.hpp - rhsusf_ammo_127x99_mk211 = ACE_127x99_API from addons/ballistics/CfgAmmo.hpp * Default ACE3 12.7x99 and recheck bullets values - 7.62 M993 : fix Ballistic Coefficient and Mass according with ballistics/CfgAmmo.hpp - 7.62 M993 : add a muzzle velocity according with the Mk11 Mod0 barrel length (609.6mm) and the M14 EBR-R1 barrel length (558.8mm) (empiric, not perfect but better than nothing) - recheck all bullets values * Accurate M249s' barrel length * Little add and fix for Atragmx "GunList" (#1) - add 12.7x99 API - fix .408 "Mass" according with the ballistics/CfgAmmo.hpp - fix .300WM MK248 Mod0 "Mass" according with the ballistics/CfgAmmo.hpp - Typo Mod0, Mod1 for a better reading on the Atrag's panel - fix .308 M80 "Mass" according with the ballistics/CfgAmmo.hpp - add .308 Mk316
commy2
pushed a commit
that referenced
this pull request
Oct 9, 2018
* Generic cycle attack profile key for missile guidance (#4787) * Generic cycle attack profile key for missile guidance * Add hint for weapons without huds * Fix Korean strings * Cleanup * Frag Superanal Cleanup (#4803) * Minimal frag cleanup * Why did this even happen in the first place Conflicts: addons/frag/functions/fnc_frago.sqf * New Function to Show BIS Style Curator Messages (#4844) * Add showMessage fnc that shows BIS curator messages * Add documentation * Make function simpler * Modify to fir new syntax * Handle non-string args * Generic cycle attack profile key for missile guidance (#4787) * Generic cycle attack profile key for missile guidance * Add hint for weapons without huds * Fix Korean strings * Cleanup * Cache Nametags onDraw3D flags. (#4847) * Cache Nametag flags * Remove unused privates * Fix fading, cursorOnly mode, improve cache reset * Fix header * Fix Javelin for AI (#4857) * Optimize Laserpointer (#4859) * only process one unit every 0.1 seconds * exitWith to keep indentation low * use event to determine isIR and isTI * correctly remove units with turned on lights from their arrays * handle weaponAccessories command reporting nil Conflicts: addons/laserpointer/XEH_postInit.sqf * Fix RHS m113 compat (#4881) * Fix passenger actions - Ensure order of MainActions (#4883) * Fix getPos order (#4889) * Use createSimpleObject to create tags (#4892) * Update CBA required version (#4899) * prep v3.9.0 * Update required CBA version * Medical/Repair 3den Toolbox State Fix (Bug fix for #4902) (#4905) * Update medical/repair 3den away from missionNamespace * Simplify save * Hide earplug actions if setting disabled (#4913) * Hide earplug actions if setting disabled * Add lines that are new * Pass map gestures draw by reference (#4914) * Verify params in atragmx profile gunlist (#4917) * Fix setVariablePublic reseting to old values (#4938) * Fix setVariablePublic reseting to old values * Don't drop delay time * Reload medical configs into extension on save load (#4941) * Fix lost magazines when restoring gunbag mags (#4942) * Add RHS GREF compat for RKG-3 grenade (#4944) * Fix intergrated scopes (#4945) * Require CBA v3.2.1 (#4954) Conflicts: addons/main/script_mod.hpp * Fix gforce avg on switching to aircraft (#4955) * Fix gforce avg on switching to aircraft * Dont use for-loop for neutral g-forces array * Update maps' latitude (#4961) - add Dingor - add MSKE 2017 - add G.O.S Leskovets - add Trung Si - add I44: Omaha v2 - add I44: Neaville and Neaville (Winter) - add I44: Battle of the Bulge * Fix rangecard not showing wind/lead (#4964) * Give options menu list focus (#4965) * Cleanup use of ACE_HashLocation (#4975) * Add validation on group id for map gesture color mapping (#4976) * Fix vehicle lock lockpick condition, Fix lockpicking from inside (#4985) * Prep 3.9.1 release * Fix cookoff desynch, fix #4900 Randomness would be calculated on every machine, but only vehicle explosion and sound are done by the server. Smoke, light and fire sfx are done by each client. * also fix cooking off ammo boxes * Fix cookoff desynch, fix #4900 Randomness would be calculated on every machine, but only vehicle explosion and sound are done by the server. Smoke, light and fire sfx are done by each client. * also fix cooking off ammo boxes * Add rearm config for Nemmera (#4992) * Sandbags surfaces update (#4971) * Use private keyword, move surface blacklist to script_component.hpp * Check height above terrain * Add Tanoa surfaces, Check if in water * Use 'dust' config entry to determine surface, Add common canDig (checks dustyness) * Re-enable compile cache * Revert to surface blacklist with dust as fallback * Move surface blacklist to script_component because SQF validator complains * Fix unarmed sprint->prone + minor perf improvments (#4887) * AB : AtragMx wiki updated (#4982) * Update atragmx.md * Update atragmx.md * Update atragmx.md * Update atragmx.md * Update atragmx.md * Update atragmx.md * Update atragmx.md * Update atragmx.md * Update atragmx.md * Update atragmx.md * Update atragmx.md * Update atragmx.md * Update atragmx.md * Update atragmx.md * Update atragmx.md * Update atragmx.md * Update atragmx.md * Update atragmx.md * Update atragmx.md * Update atragmx.md * Add files via upload * Update atragmx.md * Update atragmx.md * Update atragmx.md * Update publish.py for RHS Gref Compat (#4999) * Update atragmx.md * Delete atragmx1.jpg * Add files via upload * Translation: Missing 3 strings in Polish (#5008) * update user url * Jpn translate to v391 (#5011) * jpn translate slideshow Add the Japanese translation for slideshow for v3.9.1 * jpn translate for cookoff Add the Japanese translation for cookoff of the v3.9.1 * Update atragmx.md * Update atragmx.md * Update atragmx.md * Update atragmx.md * Update atragmx.md * Update atragmx.md * Prep 3.9.1 release * Update atragmx.md * Dupplicate Polish entry (#5018) https://i.gyazo.com/c7557980d7d4c36709be78ef1f2c2a8f.png * Update atragmx.md * Add custom CfgUIGrids for microDagr (#5014) * Update atragmx.md * Add files via upload * Update atragmx.md * fix links and `alt` texts * Duplicate French entry (#5032) Removes a duplicate French entry, didn't saw it :/ * Wiki range card updated (#5029) * Update rangecard.md * Update rangecard.md * Update rangecard.md * Add files via upload * Update rangecard.md * fix links and `alt` texts * Wiki Advanced Ballistics updated (#5030) * Update advanced-ballistics.md * Update advanced-ballistics.md * Update advanced-ballistics.md * Update advanced-ballistics.md * Update advanced-ballistics.md * Update advanced-ballistics.md * Update advanced-ballistics.md * Update advanced-ballistics.md * Update advanced-ballistics.md * Update advanced-ballistics.md * Add files via upload * Update advanced-ballistics.md * fix links and `alt` texts * Wiki Kestrel 4500 updated (#5027) * Update kestrel4500.md * Update kestrel4500.md * Update kestrel4500.md * Update kestrel4500.md * Update kestrel4500.md * Update kestrel4500.md * Update kestrel4500.md * fix links and `alt` texts * Wiki scope updated (#5028) * Update scopes.md * Update scopes.md * Update scopes.md * Add files via upload * Update scopes.md * fix links and `alt` texts * French loc improvement (#5017) * French loc improvement (French) text as it is clutters the interface interface, making it uneasy for medic to use the it smoothly. https://i.gyazo.com/8d7a5bb2f15dd1332cec36f2eef510c8.png Hopefully suggested changes fixes that. There were a few typos and, in my opinion, unaccurate or missing translation. Based on French Army Field Manual, actual paramedical personnel and past work on XMedSys. * Pull 5017 with spaces instead of tabs #5017 * Fixes a minor typo Selectioner -> Sélectionner * Duplicate entry (French) Removes a duplicate entry, didn't saw first time * Wiki scope updated_1 (#5037) * Update scopes.md * Update scopes.md * Update scopes.md * Add files via upload * Update scopes.md * fix links and `alt` texts * Delete scope_module.jpg * Add files via upload * Update scopes.md * French additions (Cargo) (#5040) Minor French text additions * French loc fixes (ballistics) (#5041) Minor French loc fixes * Update documentation for Vector21 Add explanation on how to switch range and azimuth units * Add blank line after heading * Update vector.md * Update atragmx.md * fix link atragmx.md * Fix dagr not showing bearing in mils (#5047) * Fix cargo loading to locked vehicle (#5049) * Update ACEX to 3.2.0.4 (#5062) * tweak ACE main menu info box * use https for main menu * use https for main men * fix highlighted info box color (#5075) * Filter headless clients from zeus teleportation (#5070) * Use setShotParents in Advanced Throwing (#5052) * Use setShotParents in Advanced Throwing - close #5034 * Execute setShotParents on server (server-only command) * Fix FCS Vehicle Init (#5063) * Tweak overheating (#4969) * Tweak overheating * Add define for constant magic num * Virtual units - skip goggles/hearing effects (#4988) * Disable goggles and hearing fx for virtual units * Cleanup some other CBA_fnc_addPlayerEventHandler * Fix tagging model cache (#5055) * Frag - Cleanup and Performance (#5010) * Frag - Cleanup and Performance * Add dots * (Medical) French text - minor changes (#5043) Minor changes due to users feedback * French localization complete (#5079) * French localization complete * STR_ACE_MapTools_drawStaightLines_description fix "l'on doit survoler le milieu du trait pour pouvoir le supprimer" * Space management alganthe : Espace en trop après référence. * Diapo alganthe : Slideshow -> diaporama Slide -> diapo * Cohesion fix alganthe : Vous avez traduit le nom du module juste au dessus (displayname). Il est vrai que les créateurs de missions doivent consulter une documentation principalement écrite en anglais, donc vous avez le choix de traduire la ligne ci-dessus ou la garder, les deux semblent valide à mes yeux. Reasoning : since French mission makers read reference material in English, it makes sense not to translate it and thus keep it simple for them. * Caisses de munitions caisse de mun -> caisses de munitions * STR_ACE_Scopes_Description Oops, forgot that one. * Fix RHS mp7 UBC (#5085) * Fix broken url on modules wiki page (#5088) * Fix Javelin for AI for RHS (#5096) * Remove CfgAiSkill config changes (#5091) * Remove CfgAiSkill config changes * Add note to wiki about removal * Add volume toggle docs (#5077) * Add volume toggle docs * Change version and remove ref to another mod * Changes as per review * Fix numbers * Fix refuel nozzle dropping to ground (#5119) * Fix jerry can refuel interaction overlapping (#5107) * Add keybind to toggle interaction menu (#5095) * Add Paradrop Time Coefficient Setting (#5116) * Add coef * Show cargo paradrop time in menu * Unary command, not a function call * If drop time is 0 don't show a progress bar * Add the setting to cargo's editor module * Swap values * Remove extra comma * Move unload message to paradrop event This way the message will show up on all paradrops, not just immidiate ones. * Disable search on spectator unit tree Finally found out how to do this. Having search enabled on the unit tree might seem useful, but it doesn't interact well with keyboard shortcuts used for other purposes like camera control as it causes the tree to jump around unexpectedly. * Simplify spectator compass code * Optimize spectator unit list function Making good use of the new `select` CODE syntax. * Add 3den info to spectator template - A `displayName` shown in the 3DEN multiplayer attributes display - A `respawnTypes` array to define which respawn types the template is compatible with (currently only includes `2,3` - need to investigate compatibility with other types further). * Fix #5081 The default values of the arrays manipulated by these functions overwrite any changes applied before settings have finished initalising. This won't be an issue after #4456 is merged in future. * Improve Japanese translation (#5133) * Add the Japanese translation for cargo Add the Japanese translation for cargo, fix to html tag and few improvement * fix the Japanese transltion Fix the Japanese translation for attach. it was used wrong html tag. * changed The Japanese translation Changed the Japanese translation of azimuth angle * fix The Japanese translation Fix the Japanese translation for chemlights. it was used wrong html tag. * fix The Japanese translation Fix the Japanese translation for laserpointer. it was used wrong html tag. * Fix the Japanese translation Fix the Japanese translation for medical_blood. it was used wrong translation. * Fix the Japanese translation Fix the Japanese translation for rearm. it was used wrong translation. * add The Japanese translation add The Japanese translation to new words * Improve The Japanese translation Improve, fix and change The Japanese translation * minor fix to Japanese translation minor fix to Japanese translation. see b1b07c5 * Fix Spotting Scope Interaction Point (#5132) * Disable ACE_FCS on RHS Russian Attack Helis (#5145) * Switch 2 perm PFEH to everyFrame (#5140) * Explosives - Add code handler for detonation (#5115) * Explosives - Add code handler for detonation * Add info to wiki * Fix cellphone in demo code, move example to wiki * Zeus Suppression Module (#4977) * add base structure * Add getModuleDestination * Add 2d map support, debug * Cleanup, handle weapon max range * Handle non-local units * Use new showMessage func * Run on groups when placed on leader * Support for Indirect Fire Vehicles * Cleanup * Use doArtilleryFire which was fixed in 1.68 * hitreactions - Close map on hit (#5099) * Wiki AtragMx minor changes (#5111) * fix markdown syntax * Update atragmx.md * AB: Lythium latitude (#5109) * Update fnc_getMapData.sqf * bump1 * bump2 * AB: update compat R3F v3.5 (#5097) * Update CfgWeapons.hpp * Update CfgAmmo.hpp * Update CfgAmmo.hpp * Update CfgWeapons.hpp * Update CfgWeapons.hpp * Update CfgWeapons.hpp * Update CfgWeapons.hpp * Update CfgWeapons.hpp * fix missing `{` * fix `dispersion` * fix space * AtragMx: BC G1 .338LM API526 (#5069) * Update fnc_initGunList.sqf * Update fnc_initGunList.sqf * C1 coefficient 0.58 * Jerry Can - only set global var on server (#5131) * Add Arma 3 Issues breaking ace_rearm (#5150) * MapGesutres - Fix dependency on maptools (#5154) * MapGesutres - Use getVariable to remove dependency * Use isModLoaded * Add missing base class to r3f compat (#5156) * Disable g-forces for UAV AI (#5094) * Increase max weapon index for large modsets (#5054) * Disable rearm,refuel on dead vehicles (#5158) * SQF Lint Cleanup Pass (#5157) * SQF Lint Cleanup Pass * Fix var in TRACE * Add basic python tool * Simplify * Hit space key 6 times * Fix error in dropNozzle * handle error message exceptions * Fix py * 1.70 CMs - Remove countermeasure mode switching (#5163) * 1.70 FCS - Remove ACE_FCS from most vics (#5152) * Handle 1.70 FCS * Cleanup CfgWeapons * Add warning for discreteDistance * 1.70 CMs - Remove countermeasure mode switching (#5163) * 1.70 FCS - Remove ACE_FCS from most vics (#5152) * Handle 1.70 FCS * Cleanup CfgWeapons * Add warning for discreteDistance * Realistic names for 1.70 pylon magazines (#5165) * Realistic names for 1.70 pylon magazines (#5165) * Fix gatling_30mm UBC for 1.70 (#5125) * Fix gatling_30mm UBC for 1.70 * Fix verEsion * Fix gatling_30mm UBC for 1.70 (#5125) * Fix gatling_30mm UBC for 1.70 * Fix verEsion * Prep 3.9.2 (version numbers) * Update required Arma 3 version to 1.70 * Prepare release 3.9.2 * Update helmet hearing protection for RHS-US (#5146) * Update helmet hearing protection for RHS-US * Hearing - Add standardized helmet protection macros * Tweak peltor vol * Disable aircraft flightmodel changes (#5167) * Disable aircraft flightmodel changes * Remove files * Fix merge, cbaEvents, macros, cleanup * Use correct TransportX type for ace items (#5168) * Use correct TransportX type for ace items * Fix messing with flare colors * Just warn for old compat pbos (#5177) * Just warn for old compat pbos * Use CBA_fnc_error big warning box * fix caps * Italian translation (Add & Fix) (#5193) Added Italian translation for: -advanced fatigue -advanced throwing -cook off -dogtags -gunbag -ui-scopes and much more... Fixed a lot of grammatical errors * Zeus updated (#5198) Fixes and adds in the zeus section * Add AtixNeon to AUTHORS.txt * Add realistic names to dynamic loadout classes (#5185) * RHS CH-47 - use animationSourcePhase (#5201) * Fix Zeus teleport players module (#5175) * Add dummy function to zeus UI modules This removes the message about the module having no function when in SP. * Fix zeus teleport module for non-local units BI made a change to the function this module was using. So now it has to be ran local to the player in question. * Adv Throw - Handle getShotParents being [] (#5210) * Correct compat classnames (#5204) * Linking belt refactoring (#5206) * Linking belt refatoring startLinking belt now uses canLinkBelt so if condition needs to be changed then you can do it on one position. * Fixed requested change Fixed requested change * AdvThrow - Handle bugged currentThrowable (#5216) * Fix AB water vapor pressure calc (#4956) * Fix AB water vapor pressure calc * Fix calc in weather * Cleanup usage of constant * Add RVExtensionVersion, Rebuild AB DLLs * CH53 Fastroping and other fixes (#4713) * CH53 Fastroping and Fixes Added fastrope points for CH53. The getOut EH is required to keep the doors open when a unit exits the vehicle and it uses the vehicle animation "doorHandler_R" or "doorHandler_L" as a placeholder to determine if the doors are open(1)/close(0). eg. In UH1Y (Unarmed), when the right door is opened using the useraction, "doorRB" and "doorHandler_R" will be set to 1. * Changed TAB to 4 spaces * Moved bracket to follow guidelines * Refuel for non-AllVehicle objects (#5151) * Enabled refuel for non-AllVehicles objects. Un-magic'd refuel progress timer. * Changed helper attach position to centre of object. Offset applied when rope attached. * Made fully compatible with non-thingX simulation types. Removed destruction effects of helper object. * Using arma model. Removed ACE_Actions from helper object. * Correct use of hideObjectGlobal * Remove actions, cargo, repair on helper * Switched helper to be setVar'd on the nozzle object * Linkingbelt refactoring (#5213) * Linking belt refatoring startLinking belt now uses canLinkBelt so if condition needs to be changed then you can do it on one position. * Fixed requested change Fixed requested change * simplified it even more canLinkBelt now returns a value over 0 if success and -1 if something is not right. * Fixed bug where if error we would not exit Fixed bug where if error we would not exit * changed name on canLinkBelt Changed name to better reflect the function of the function. * Author hype * fixed return value info fixed return value info * fix header * Fix ammo count hidden in UAVs (#5222) * Fix ammo count hidden in UAVs * Switch to ace_reload condition * Add arsenal zeus modules (#4576) * Add zeus arsenal modules * Add french strings to arsenal modules * Fix typo in french string * Make changes to fit review * locality check, use showMessage, set categroy * Cargo load menu overhaul (#4871) * Add submenu with vehicles to cargo load menu * replace private ARRAY with keyword * fix ace function macro using * filter vehicles without cargo * add Load condition, clean params, fix param reusing * replace nearEntities with nearestObjects, add macro * optimize, del magic, replace count with forEach * del unused functions * del useless _this parameter * Cleanup aircraft (#5197) * Refuel - Add setting for hose length (#5224) * Remove unit from laser pointer list if laser removed (#5190) * Handle escape menu with toggle iteractMenu (#5144) * Handle escape menu with toggle iteractMenu * Work on non-cursor menu * Close cursor menu if open when switching * Update fnc_handleEscapeMenu.sqf * French translation missing (#5217) * French translation for the two last entries * French translation for the last entrie * French Translation for the first entrie * correct the spelling error * Lower minimum speed limiter speed to 5 km/h (#5065) * Update fnc_speedLimiter.sqf * No minimum speed needed anymore Minimum speed limit of 10 km/h was needed in the past due to engine limitations. Multiple user tests have shown that the minimum speed is not needed anymore. The new minimum of 0 km/h allows for example setting walking speed for vehicles (<10 km/h). * Change minimum required speed for speed limiter to 3 km/h To avoid problems with negative speeds (driving backwards) and zero speed, the current change switches from 10 km/h minimum speed to 3 km/h minimum speed. This seems to be the optimal solution to allow all relevant speeds including walking speed. * Changed minimum required speed to 5 km/h Officially the minimum required speed is 10 km/h in the master. Lower minimum needed to set car speed to walking speed of accompanying soldiers. Problems have been reported with 3 kmh/ using cars like ATVs. Thus the new commit is set to 5 km/h minimum speed. Not tested with ATVs yet. * Minor fixes, cleanup, add lint ignore directives (#5176) - Fix bug in getNumberMagazinesIn (func not used) - Fix bug in seekerFindLaserSpot (func not used yet) - Everything else is just cleanup * Fix zeus interaction locality (#5214) - The `setUnitPos`, `setFormation`, `setSpeedMode` and `setBehaviour` commands require local arguments - The waypoint equivalents require server execution - Add conditions to only show interactions when the appropriate things are selected * Add cargo eden attributes (#4780) - Add a ace_cargo_space attribute to vehicles to alter how much cargo they can carry. - Add an ace_cargo_size attribute to objects to alter how much cargo space they consume. - Add two public functions `fnc_setSize.sqf` and `fnc_setSpace.sqf` to update the cargo size/space respectively of any given object. - Deprecate cargo makeLoadable module and public function. - Added some macros to get the space/size of a config, making code more readable in places. * Fix IVs not showing in patient display (#5230) Fix #5192 for 3.10 * Remove submuntion ammo changes to A-10 (#5231) * Remove changes to Aircraft cannons * keep ammo changes, i guess * Fix zeus RC units using player damage treshold (#5219) * Fix zeus RC units using player damage treshold Closes #5218 * add pabstmirrors suggestion use gvar * Implement new cook off SFX (#5179) * Implement new cook off SFX with variants * Add hybrid V to authors * Open glass and CUP doors (#5226) * Fixed glassdoor Fixed so glassdoor now works with ace slow open. * Made it more pretty with new file Made it more pretty with new file * Tidy up a bit * Removed white space * Replace tabs with spaces Replace tabs with spaces * Simplified and added comments * Changes + was stupid was commit Changes to go with code guidlines and extra check if door is empty * Tabs to spaces * Small fixes + Fixed so CUP houses now works Fixed so CUP houses now works * Remove todo * Fixed requested changes * Removed whitespaces * Vehicle quick mount (#4931) * Add quickmount files from ACEX * Rename to ACE3, Streamline, Use clientInit * Rename functions to ACE3, Fix crew getting * Fix enabled text * Fix texts * Remove spaces * Rework seat search * NLAW - Predicted Line Of Sight Guidance and Overfly Attack Mode (#4791) * NLAW Prototype * Make AI Compatible * Add Overfly Top Attack Mode * Limit Max Deflection * Base prediction on AI skill * Generic cycle attack profile key for missile guidance * Add hint for weapons without huds * Configure for attack cycle key * Finish OTA ammo effects * Cleanup * Arm at 20m * Disable Debug * No models for short lived sub-ammos * Fix Korean strings * Change AI randomization to use skillFinal * Add wiki doc for nlaw * Cleanup * Cleanup * Cleanup * Hellfire missiles (#4679) * Hellfire * Cleanup dev macros * Cleanup some debug * Add base interaction node for firemode actions * Handle bad data in attack profile variable * Skip ammo checks (returns bad data on added weaps) * Add mags sizes for apache * Add Hellfire Wiki Doc * Cleanup doc * Add pylon support * Add support for pilot controlled weapons * Add label to pylon mags * Cleanup vehicle configs, autoAdd laser des, fix ineractions for driver * [Docs] Update component dependencies Automatically committed through Travis CI. [ci skip] * [Docs] Update component dependencies Automatically committed through Travis CI. [ci skip] * [Docs] Update component dependencies Automatically committed through Travis CI. [ci skip] * Fix spectator icons and camera jitter (#5067) * Use `Visual` commands for icons and external camera position * Fix accidental numerical change (#5235) * Fix being unable to throw last mag (#5242) * Italian Translation Update (#5243) Added Italian translation for: -cargo -hellfire -nlaw -quickmount -refuel -zeus * Cleanup unused hellfire vic stringtable (#5245) * Fix weapon select grenade count wehn using advThrow (#5244) * Raise lower carry object (#5234) * Fix to move items up and down * Fixed private * Fixed public bug * Inserted Pabst solution * Remove extra space * Fixed request + added author * Fixed to correct comment * Tweeked comment again * Added more info about indentations, tabs and EditorConfig (#5249) * Added more info about indentations, tabs and EditorConfig * Fixed original misspelling "Every" * Added Pylon weapon as a valid weapon (#5250) * Disable dragging on big AA Turrets (#5251) * note required PboProject version (#5256) * note required PboProject version * Update setting-up-the-development-environment.md * Conform function headers to coding guidelines (#5255) * Fixed headers to work with silentspike python script * Fixed rest of the files * Fixed ace-team * Rearm - Pylon Support and Dynamically Add Supply Actions (#5183) * Dynamic Add * Support 1.70 Pylon Loadouts * Properly handle old compat pbos - Update RHS Compat * Re-add documentation * cleanup headers (note from other pr) * Cleanup * Fix var spelling * Fix minor debug that got left in (#5260) * Repair specialist rename, fixes #3186 (#5248) * Changed name * Fixed Enginner only german and removed big letters * Added docs + PR fixes #3186 * Removed other languages * Fixed request and added comment * Replace all usage of term "Specialist" * Add Ability to Change Repair Times of Vehicles (#5205) * Add ability to change repair time based on vehicle * Much better * Unary command not function * Allow changing of track or wheel object per vehicle * Lot more complicated than I thought * Fix some event names on wiki (#5254) * Fix some event names on wiki * Switch callable events to functions * Remove maximum distance of attach to vehicle action (#5262) * Remove maximum distance of attachi to vehicle action * Readd max distance, 10 meters to allow usage with big vehicles but also end placement system if too far * Update kestrel4500.md (#5228) * Add repair feature to wiki (#5247) * Add repair feature to wiki * Add blank lines, use adv engineer * Add repair framework page * Fix Large IED defuse distance (#5261) * Fix for large-ied bug because underwater thing have changed * Added size of IED in config and determine defuse range * Added typo * Added help text to wiki about defusing * Better English * Increased the defusal range on large bombs make it similar to small ieds * Add wiki doc * Use getUnitTrait for medics, engineers and EOD (#5246) * Increase required CBA version to 3.3.1 * Prepare version 3.10.0 * Update cargo docs with new public functions (#5266) * Update cargo docs with new public functions * Add myself to squad.xml * Italian translation updated and fixed (#5268) Added newest lines for: -Rearm -Repair * Update homepage version numbers #4692 [ci skip] * Fix isFeatureCameraActive for Spectator enhacements (#5269) * fix isFeatureCameraActive for spec ace_spectator_camera was removed in 77c2b99 . spectator module initializes three separate cameras instead, of which for example ace_spectator_freeCamera can be used to check if spec mode is active * use ace_spectator_isSet to check for spec mode * Prepare release 3.10.0 (build 2) * fix video link (#5276) * Jpn translate 73bd37 (#5277) * Update the Jpn translation for cargo Update the Japanese translation for cargo * Add the Jpn translation for hellfire Add the Japanese translation for hellfire * Add the Jpn translation for nlaw Add the Japanese translation for nlaw * Add the Jpn translation for rearm Add the Japanese translation for rearm * Update the Jpn translation for refuel Update the Japanese translation for refuel * Update the Jpn translation for repair Update the Japanese translation for repair * Update the Jpn translation for zeus Update the Japanese translation for zeus * gos ndjenahoud latitude (#5275) * Count untraced errors in make.py (#5265) * Count untraced errors (any errors besides failed PBO builds and missinf files) in make.py * Fix error count and prettify printing * Cleanup heli pod actions (#5271) Close #4783 - Make taru pods non loadable - Make taru pods non draggable - Increase interaction range for huron pods * Make array of cargo holders dynamic (#5274) * Jpn translate feee7f5 (#5280) * Add the Jpn translation for quickmount Add the Japanese translation for quickmount * Update the Jpn translation for repair Update the Japanese translation for repair * Fix isFeatureCameraActive (#5291) * Fix isFeatureCameraActive (#5291) * Prepare release 3.10.1 * Add malden to getMapData (#5297) * Add malden to getMapData * Merge with CWR2 malden * Add malden to getMapData (#5297) * Add malden to getMapData * Merge with CWR2 malden * Add Chinese Traditional & Simplified Localization (#5295) Add Chinese Traditional & Simplified Localization * compats - Fix config name for resupply vics (#5300) * Modify JoinGroup action to show group name (#5287) * Modify JoinGroup action to show group name * header * Header * Repair - Handle depends = "0" (#5283) * Repair - Handle depends = "0" * quote * Refuel - change nozzle position calc (#5279) * Handle ace_cargo_canLoad set to scalar (#5306) * Add XEH to ace_module (#5304) * Changed hellfire interaction check & added N variant (#5294) * Changed weapon check for interaction to generic ace_hellfire_enabled value * Added November hellfire variant * Cleanup * +1 * Japanese translation d02dacf (#5309) * add the Jpn translation for repair add the Japanese translation for repair * minor fix to Jpn translation for medical minor fix to Jpn translation for medical * Correct new Chinese stringtable identifiers (#5334) * Fix the issue that SFX variants are not global (#5335) * Fix the issue that SFX variants are not global what means that different players can get different pressure Cookoff sounds to prevent that i split up the sounds in 3 types and used a Weighted select to have the befor used values back * add todo for 1.74 * inherit in CfgSFX from 1 class * fix #5324 (#5325) * Minor update Wiki AtragMx (#5322) * update wiki atragmx * Add files via upload * Fix broken fonts for map gps display (#5337) EtelkaNarrowMediumPro broke with 1.72 hotfix * Handle locked doors (#5345) * Allow repairing from slingload pods (#5316) * Add cargo space to huron containers (#5315) * Rallypoints- Don't modify setVar if already set (#5347)
commy2
pushed a commit
that referenced
this pull request
Oct 9, 2018
BaerMitUmlaut
pushed a commit
that referenced
this pull request
Aug 5, 2019
barman75
pushed a commit
to barman75/ACE3
that referenced
this pull request
Feb 16, 2020
Ukrainian localization by Barman75 v0.1
dgibso29
referenced
this pull request
in dgibso29/ACE3
Jun 3, 2020
- Removed unnecessary whitespace on LN 46 - Call global var directly at LN 87 - Updated Wound Reopen Chance localized name & description
PabstMirror
pushed a commit
that referenced
this pull request
Jun 13, 2020
* Added Bandage Reopening Chance Modifier * Added Wound Reopen Chance Addon Setting * Fixed dumb error in localization setup * Credit! * Resolved issue with Addon Settings definition & removed testing values. * PR Feedback #1 - Removed unnecessary whitespace on LN 46 - Call global var directly at LN 87 - Updated Wound Reopen Chance localized name & description * PR Feedback #2 - Increased reopen coefficient upper limit from 2 to 5. * Changed author credit to reflect GitHub email.
jonpas
added a commit
to Theseus-Aegis/ACE3
that referenced
this pull request
Jul 1, 2020
Squashed commit of the following: commit 6313cb6 Merge: c315493 b16ca5c Author: jonpas <[email protected]> Date: Wed Jul 1 15:28:22 2020 +0200 Merge branch 'master' into Trench-improvements-from-Grad-Trenches commit c315493 Author: Salbei <[email protected]> Date: Sat Aug 31 14:33:36 2019 +0200 fixed wrong indentations commit cce03a2 Author: Salbei <[email protected]> Date: Sat Aug 31 14:15:11 2019 +0200 removed a wrong check commit d235d08 Author: Salbei <[email protected]> Date: Sat Aug 31 14:03:05 2019 +0200 changed the for-loop to make it less ugly commit 501f0ec Author: Salbei <[email protected]> Date: Fri Aug 23 22:42:35 2019 +0200 fix Spacing commit 7fcb859 Author: Salbei <[email protected]> Date: Fri Aug 23 18:53:57 2019 +0200 improved script & changed GVAR name commit e6de0f2 Author: Salbei <[email protected]> Date: Fri Aug 23 18:20:32 2019 +0200 added a space at commy2 wish commit da0c1c0 Author: Salbei <[email protected]> Date: Fri Aug 23 18:12:51 2019 +0200 fixed tabs commit 147d140 Author: Salbei <[email protected]> Date: Fri Aug 23 18:09:34 2019 +0200 fixed set mulit Gvar & added more maps commit 40e1b1b Author: Salbei <[email protected]> Date: Sat Aug 17 18:25:32 2019 +0200 fixed linter issue commit 55fa2af Author: Salbei <[email protected]> Date: Sat Aug 17 18:19:38 2019 +0200 fixed remaining issues commit 5dd95e8 Author: Salbei <[email protected]> Date: Thu Jun 6 00:48:07 2019 +0200 more wörk to do commit 12faf79 Author: Salbei <[email protected]> Date: Wed Jun 5 21:43:09 2019 +0200 minor adjustments commit c9a7eea Author: Salbei <[email protected]> Date: Wed Jun 5 00:06:07 2019 +0200 fixed placement commit ca424c2 Author: Salbei <[email protected]> Date: Tue Jun 4 17:22:32 2019 +0200 Auto stash before merge of "Trench-improvements-from-Grad-Trenches" and "AdlerSalbei/Trench-improvements-from-Grad-Trenches" commit 9628d43 Author: Salbei <[email protected]> Date: Mon Jun 3 12:25:54 2019 +0200 fixed spacing commit 1606749 Author: Salbei <[email protected]> Date: Mon Jun 3 12:05:09 2019 +0200 Some changes commit adef5d5 Merge: df304b5 e2f61a9 Author: Salbei <[email protected]> Date: Mon Jan 7 14:58:49 2019 +0100 Merge remote-tracking branch 'AdlerSalbei/Trench-improvements-from-Grad-Trenches' into Trench-improvements-from-Grad-Trenches commit df304b5 Merge: dfdd3e1 160cc4c Author: Salbei <[email protected]> Date: Mon Jan 7 14:58:26 2019 +0100 Merge branch 'AdlerSalbei-Trench-improvements-from-Grad-Trenches' into Trench-improvements-from-Grad-Trenches commit e2f61a9 Merge: 2a7ce51 c51e202 Author: Salbei <[email protected]> Date: Mon Jan 7 14:57:32 2019 +0100 Merge pull request acemod#2 from AdlerSalbei/AdlerSalbei-Trench-improvements-from-Grad-Trenches Added Intercept macro,changed to CBA events commit 2a7ce51 Merge: dfdd3e1 6690574 Author: Salbei <[email protected]> Date: Mon Jan 7 14:55:59 2019 +0100 Merge pull request acemod#1 from acemod/AdlerSalbei-Trench-improvements-from-Grad-Trenches bring it up to speed commit 160cc4c Author: AdlerSalbei <[email protected]> Date: Mon Jan 7 14:49:27 2019 +0100 Some fixes commit c51e202 Author: Salbei <[email protected]> Date: Mon Jan 7 11:23:30 2019 +0100 Added Intercept macro,changed to CBA events commit 6690574 Author: commy2 <[email protected]> Date: Thu Dec 27 14:03:42 2018 +0100 delete conditional PREP, remove spawn commit f217af4 Author: commy2 <[email protected]> Date: Thu Dec 27 13:32:28 2018 +0100 hide_trench animation commit 3130f81 Merge: cd09c2b dfdd3e1 Author: commy2 <[email protected]> Date: Thu Dec 27 11:22:07 2018 +0100 Merge branch 'Trench-improvements-from-Grad-Trenches' of https://github.com/AdlerSalbei/ACE3 into AdlerSalbei-Trench-improvements-from-Grad-Trenches commit dfdd3e1 Author: Salbei <[email protected]> Date: Sat Dec 22 20:02:48 2018 +0100 fixed some oversights commit cb09624 Author: Salbei <[email protected]> Date: Fri Dec 21 10:46:18 2018 +0100 fixed missing ( commit cd71131 Author: Salbei <[email protected]> Date: Fri Dec 21 10:44:34 2018 +0100 change to the handling of multiple diggers commit 003c301 Author: Salbei <[email protected]> Date: Wed Dec 19 23:08:45 2018 +0100 Prototyped new multi dig (needs more testing) commit 9b0591b Author: Salbei <[email protected]> Date: Mon Dec 17 11:23:04 2018 +0100 Improved placement & and fixed init issue commit ccdbfd7 Author: Salbei <[email protected]> Date: Mon Dec 17 00:17:33 2018 +0100 changed CfgWorldTextures commit 6f81734 Author: Salbei <[email protected]> Date: Fri Dec 14 08:04:28 2018 +0100 forgot the config.cpp commit 4db5272 Author: Salbei <[email protected]> Date: Fri Dec 14 07:59:34 2018 +0100 changed config name commit 7c79240 Author: Salbei <[email protected]> Date: Fri Dec 14 07:47:46 2018 +0100 bee bee commit 3c10fe4 Author: Salbei <[email protected]> Date: Thu Dec 13 15:16:43 2018 +0100 Fixed more suggestions commit 8fca5ad Author: Salbei <[email protected]> Date: Tue Dec 11 23:30:05 2018 +0100 More fixes commit 495f049 Author: Salbei <[email protected]> Date: Mon Dec 10 19:02:57 2018 +0100 submitted test values commit f33224a Author: Salbei <[email protected]> Date: Mon Dec 10 18:58:08 2018 +0100 Fixes commit 95bc511 Author: jonpas <[email protected]> Date: Mon Dec 10 18:13:11 2018 +0100 Apply suggestions from code review Co-Authored-By: AdlerSalbei <[email protected]> commit ab5b1cf Author: jonpas <[email protected]> Date: Mon Dec 10 18:01:13 2018 +0100 Update addons/trenches/functions/fnc_canPlaceCamouflage.sqf Co-Authored-By: AdlerSalbei <[email protected]> commit 5047df8 Author: jonpas <[email protected]> Date: Mon Dec 10 18:00:51 2018 +0100 Update addons/trenches/functions/fnc_canPlaceCamouflage.sqf Co-Authored-By: AdlerSalbei <[email protected]> commit cc1b2a7 Author: jonpas <[email protected]> Date: Mon Dec 10 18:00:28 2018 +0100 Update addons/trenches/functions/fnc_canPlaceCamouflage.sqf Co-Authored-By: AdlerSalbei <[email protected]> commit 5d1c6a9 Author: jonpas <[email protected]> Date: Mon Dec 10 17:59:56 2018 +0100 Update addons/trenches/functions/fnc_canPlaceCamouflage.sqf Co-Authored-By: AdlerSalbei <[email protected]> commit 1fad811 Author: jonpas <[email protected]> Date: Mon Dec 10 17:59:35 2018 +0100 Update addons/trenches/functions/fnc_canHelpDiggingTrench.sqf Co-Authored-By: AdlerSalbei <[email protected]> commit e05e216 Author: jonpas <[email protected]> Date: Mon Dec 10 17:59:14 2018 +0100 Update addons/trenches/functions/fnc_canHelpDiggingTrench.sqf Co-Authored-By: AdlerSalbei <[email protected]> commit 5dde8f6 Author: jonpas <[email protected]> Date: Mon Dec 10 17:58:54 2018 +0100 Update addons/trenches/functions/fnc_canHelpDiggingTrench.sqf Co-Authored-By: AdlerSalbei <[email protected]> commit 3ec4aa5 Author: jonpas <[email protected]> Date: Mon Dec 10 17:58:02 2018 +0100 Update addons/trenches/functions/fnc_applyCamouflageAttribute.sqf Co-Authored-By: AdlerSalbei <[email protected]> commit 550dcd1 Author: jonpas <[email protected]> Date: Mon Dec 10 17:57:37 2018 +0100 Update addons/trenches/functions/fnc_applyCamouflageAttribute.sqf Co-Authored-By: AdlerSalbei <[email protected]> commit e7426b4 Author: jonpas <[email protected]> Date: Mon Dec 10 17:56:21 2018 +0100 Update addons/trenches/functions/fnc_addDigger.sqf Co-Authored-By: AdlerSalbei <[email protected]> commit d1ee84f Author: jonpas <[email protected]> Date: Mon Dec 10 17:51:54 2018 +0100 Update addons/trenches/functions/fnc_addDigger.sqf Co-Authored-By: AdlerSalbei <[email protected]> commit e0b7a87 Author: commy2 <[email protected]> Date: Mon Dec 10 17:34:10 2018 +0100 return value no ; commit 2962b86 Author: commy2 <[email protected]> Date: Sat Dec 8 17:33:08 2018 +0100 formatting commit 13fc4da Author: Salbei <[email protected]> Date: Fri Dec 7 08:57:56 2018 +0100 Fixed all open issues commit a746708 Author: Salbei <[email protected]> Date: Mon Dec 3 08:12:11 2018 +0100 Small fix commit ec140f8 Author: Salbei <[email protected]> Date: Sun Dec 2 19:52:14 2018 +0100 Fixed misspellings commit 4200585 Author: Salbei <[email protected]> Date: Sun Dec 2 17:54:15 2018 +0100 Fixed Texturing commit 9b8d73f Author: Salbei <[email protected]> Date: Sun Dec 2 14:19:19 2018 +0100 Some more minor fixes commit 5a00cdc Author: Salbei <[email protected]> Date: Sun Dec 2 13:57:31 2018 +0100 Fixed a lot of Issues commit 08ff436 Author: Salbei <[email protected]> Date: Sat Dec 1 23:27:35 2018 +0100 Missed 1 commit 2506d03 Author: Salbei <[email protected]> Date: Sat Dec 1 23:24:17 2018 +0100 fixed \ issue commit ae71061 Author: Salbei <[email protected]> Date: Sat Dec 1 21:08:49 2018 +0100 Fixed Tabs commit 30b524d Author: Salbei <[email protected]> Date: Sat Dec 1 21:03:39 2018 +0100 Made the validator happy commit 69ea3d2 Author: Salbei <[email protected]> Date: Sat Dec 1 20:47:29 2018 +0100 Made it more ace compatible commit 17945ab Author: Salbei <[email protected]> Date: Fri Nov 30 22:20:14 2018 +0100 Some fixes commit ec9b458 Author: Salbei <[email protected]> Date: Fri Nov 30 15:24:02 2018 +0100 Merging newest Grad Trenches release
Elgin675
pushed a commit
to Elgin675/ACE3
that referenced
this pull request
Aug 23, 2020
Add compatibility with "realistic names" modules, and add french translation
dgibso29
referenced
this pull request
in dgibso29/ACE3
Sep 9, 2020
Corrected issue with checking array equality.
johnb432
pushed a commit
that referenced
this pull request
Dec 29, 2023
Allow UTC minutes offset for marker timestamp
lambdatiger
referenced
this pull request
in lambdatiger/ace_frag-overhaul
Jan 18, 2024
LinkIsGrim
added a commit
that referenced
this pull request
Sep 18, 2024
* Capitalized config entries * fixed example syntax * fixed call syntax * alphabetized PREP instead of categorizing it * Really obvious isNull instead of isEqualTo Co-authored-by: johnb432 <[email protected]> * Fixed array of double spaced format errors * renamed files to fit proper format * fixed more spacing issues * formatting * Fixed debug mode init, a few things pointed out by johnb432 that I was dumb not to do * formatting * Updated type checks in line with recommendation from johnb432 * fixed comment to properly state variable purpose * Comments fixed * slight performance increase using forEach loops Co-authored-by: johnb432 <[email protected]> * Small optimization to optimize config lookup quick testing shows a whole 600ns increase in Co-authored-by: johnb432 <[email protected]> * avoid mismatch sides when debugging frags with unconcious or captive shooters Co-authored-by: johnb432 <[email protected]> * removed return of sphere object, not required or useful. * fixed a loop that got caught in the merge crossfire * Optimized approach to classifying blacklist type Co-authored-by: johnb432 <[email protected]> * Implemented changes discussed here #9728 (comment) * Config lookup optimization mentioned by johnb432 here: #9728 (comment) * white space/formatting changes * removed old parameter changed in f28d5d2 * compacted text a bit * formatting whitespace * Grammatical erros * Changes as discussed here #9728 (comment) * Few quick optimizations of == to isEqualTo * Debug updated to be easier to control * Changed how spall hold off is calculated to avoid repeated unneeded computations * clarified a hold off variable * Better approach to ACE_FRAG_RM_EH macro * Git rid of superfulous stringtable entries Co-authored-by: johnb432 <[email protected]> * unneeded parens Co-authored-by: johnb432 <[email protected]> * Clarified arguments Co-authored-by: johnb432 <[email protected]> * getposATL to getPosATL Co-authored-by: johnb432 <[email protected]> * Update addons/frag/functions/fnc_dev_addRound.sqf Co-authored-by: johnb432 <[email protected]> * Function header changes Co-authored-by: johnb432 <[email protected]> * another great isNotEqualTo opportunity Co-authored-by: johnb432 <[email protected]> * formatting changes Co-authored-by: johnb432 <[email protected]> * unneeded parens Co-authored-by: johnb432 <[email protected]> * Declared _ammoInfo twice * optimized around checking if systems are active and moved debug arguments to an ifdef * Removed white space from removing an if statement in a previous commit * Removed superfulous parenthese Co-authored-by: johnb432 <[email protected]> * clarified function description and removed unneeded comments * Moved "isServer" check to initRound function * #9728 (comment) * changed params statement, function header, and propigated doFrag argument changes * capitization from cfg to Cfg in config lookups * changed default arguments, check isKindOf to "CAManBase" * Updated function headers * white space and define placement changes * removed 2 argument option and removed some defaults * removed spurious commas * removed unused debug GVAR * Switched debug clear traces from addAction to ACE self interact * variable names weren't verbose enough * Mactched format #9728 (comment) * Updated debug settings * Shot parent possible fix #1 * Removed extra text from CfgAmmoFragParameters * Makes sure spall power square root is positive and also we don't produce fragments when for some reason the round accelerates. * white space for clarity Co-authored-by: johnb432 <[email protected]> * Optimize dev_hitbox deleting Co-authored-by: johnb432 <[email protected]> * saving people from their own bad testing setup * Since the functions always exist, I guess these variables should too * Fixe bad search function * optimization, see #9728 (comment) * changed SPG-9 Fragments * removed unneeded toLower * Changed case output to match config * Increased relative chance to hit torso/pelvis when fragemnt should hit. * Removed double space * updated some round types * Added commented 2.18 commands and updated script component * added print incomplete only option to fnc_debugAmmo * removed all spaces from macros * removd unneeded define * a Brett (HEMTT) suggested change I miss * Apply suggestions from code review Small formatting changes and small errors Co-authored-by: johnb432 <[email protected]> * Removed doublespace Co-authored-by: johnb432 <[email protected]> * Update addons/frag/functions/fnc_dev_addRound.sqf If the round isn't in the hashmap anymore, we have to stop the PFH. Brought code up to same standard as used in FUNC(dev_trackObj). - johnb432 Co-authored-by: johnb432 <[email protected]> * Update addons/frag/functions/fnc_dev_drawTrace.sqf Co-authored-by: johnb432 <[email protected]> * variable name changes * magic number clean up and white space * white space, function headers and variable names * small Should spall optimization Co-authored-by: johnb432 <[email protected]> * Removed blacklist functions and settings * reformatted function headers, removed value type checking, and changed lazy eval. * fixed missing underscore in change from review * function header, lazy eval, and params list simplifications * function header and variable name readability * changed defaults to make them more clear they're just a default value * Updated wiki to be clearer in a few areas, and add some other information I've found working on this * added MP debug compatability * Possible shouldFrag legibility improvement * added changes to stringtable * Grammar sweep on the wiki, and added some clarifications to config values * optimized dev_trackHitbox and made variables more explicit * Cleaned up documentation and documentation * reorganized postInit CBA_settingInitialized EH * missing underscore in fnc_dev_trackObj Co-authored-by: johnb432 <[email protected]> * stopped adding unneeded extra points Co-authored-by: johnb432 <[email protected]> * cleaned un-updated stringtable entries * reworked some function headers and deleted whitespace in doFragTargeted * Removed outdated code * Formatting and header fixes * Ignore curators and spectators * Made clear traces global again, added interaction condition * Change stringtable entries * Removed unused stringtable entries & fixed hitbox description * Small coding standard changes (missing semicolons on non-return values, extra parenthesis) * Changed sphere size and added return based on usage in dev_trackHitBox * removed "_lo" random fragment entries as they are unused * doFragRandom was always being called and spawning at least 5 fragments even when the fragment budget of 50 was reached. Fixed variable name (AGL instead of ATL). * removed unnceassary "disableCollisionWith" * Clarified trace statements and corrected format and spelling * Do spall exits for time 90% of the time (round hits multiple walls) and should exit on "hitting ground since no spalling is generated * Fixed ordering in which frag hold off variables are set to not skip when unneeded * initRound ordering and fixed define names * Fixed function header * reformatted comments and some v2.18 remakrs comments * Removed unneeded ground offset * Expanded TRACE * Fix typo * Moved event to preInit * Updated default fallback frag distance to be less extreme and changed fixed a magic number * Randomized random frag directions * removed some magic numbers, and cached numbers from shouldSpall * removed magic numbers and cached values preemptively (normally spallInfoCache is called later, but we pull the right config parameters so we might as well store them) * Unify example formatting Co-authored-by: Grim <[email protected]> * cleaned up function examples * removed excess square brackets * Final function example reformat * Update addons/frag/script_component.hpp * Corrected docs * Use `getOrDefaultCall` * Removed unused classes, redefined using macros to minimize error and make review easier * updated debugging output and fixed velocity error * Reformatted for legibility and debug output * caught calc error while answer johnb's question * Almost finished with compats and I had some changes to align vanilla as well * Missed variable when updating * Added unneeded class details to make PBOproject happy * Forgot to update doFragRandom docs with previous changes * and the debug context * Readd blacklist * Fixed an issue with fragments being created above water for explosions below the surface * Exposed projectile event handlers for both blacklist use and other shenanigans. * Revert "Exposed projectile event handlers for both blacklist use and other shenanigans." This reverts commit eaff498. * added debug information and folded if statements * fixed error (if statement with no argument) * Only send blacklist updates to the server * Added default fragCount fallback value based on current ACE frag range calculation * Converted all positions for doFrag to AGL since we're converting to that now * removed feet hitpoints & tightened multishot submunitions. Feet hitpoitns aren't used since calculation for trajectory doesn't account for drag, fragments aimed at feet won't hit * Merge branch 'acemod:master' into master * Revert to 60a0dae, merge conflict wasn't resolved properly * Removed event handlers * Changed blacklist to acting on local projectiles to match initial performance * added fired EH and moved projectile tracking to be local to projectile * updated initialization and should frag to check for submunitions since we no longer rely on init EH * Fixed calls for shouldFrag and got rid of old initRound.sfq (maybe back after 2.18) * fixed small mistakes in names and function calls * fixed frame offset to avoid hitting dead targets * Fixed config path in shouldFrag * Didn't know that PBO project needed trailing {} on class inheritance structures * fixed more useless trailing {} * Initial rollback to old frag simulation and spalling simulation. Updated spall to function and helpter functions as well * missed comma * remove fragCount from config * made addBlackList remove projectile EHs * updated config path to be relevant to post-EH version * All spalling in current version is local * updated search pattern to one discussed in PR #9728 * updated defines to match implementation * removed commented out debug information from nouber * removed magic numbers and code with no effect * removed more magic numbers * unfucked a comma * fixed debug def names * updated documentation * changed debug colors * mass must be in grams in this version I guess * fixed errors in frag with downgrade * fixed timing and other spall issues * updated some defne names and usages * increased code legiblity and optimized some randomizations * clarified parts of the spall event chain * Optimized loop to find spall position using larger steps and fewer operations per loop * fixed small errors * removed unused variables & EHs and set defaults in the case debug mode draw isn't used * removed "class eventhandler" references * removed _fragCount reference in newly backported debug functions * fragmenting projectile velocity isn't used anywhere * removed unused variables, implemented fixes from full rewrite PR, and fixed math errors * added debug draw mode to DEBUG_ENABLED_FRAG define check * fix documentation to make units clear on metal and filler quanities * command capitalization * added target point debug spheres * fixed target sphere visability * Jank fix so that the unit firing can get hit with it's own fragments * accidentally committed script_component.hpp w/ debug enabled * Alternative way to address shot parent self-harm issue * missed comma, going to bed, sorry * add newline and fix blacklist * legability formatting * removed extra newlines and double spaces * Updated function documentation * Removed unused stringtable items * Debug sphere conditional was missing in frago * Added class blacklisting functionality * Converted addBlacklist function to be public * fixed glaring error * Reformatted to be more concise and added argument defaults. * Deleted one sentence too many * Fixed info macro usage * Forgot to consider someone might have explosion reflections on but not fragmentation * Fix some post merge errors * missed a few more merge errors * renamed classBlacklist function --------- Co-authored-by: johnb432 <[email protected]> Co-authored-by: Grim <[email protected]>
LinkIsGrim
added a commit
that referenced
this pull request
Sep 18, 2024
* Really obvious isNull instead of isEqualTo Co-authored-by: johnb432 <[email protected]> * Fixed array of double spaced format errors * renamed files to fit proper format * fixed more spacing issues * formatting * Fixed debug mode init, a few things pointed out by johnb432 that I was dumb not to do * formatting * Updated type checks in line with recommendation from johnb432 * fixed comment to properly state variable purpose * Comments fixed * slight performance increase using forEach loops Co-authored-by: johnb432 <[email protected]> * Small optimization to optimize config lookup quick testing shows a whole 600ns increase in Co-authored-by: johnb432 <[email protected]> * avoid mismatch sides when debugging frags with unconcious or captive shooters Co-authored-by: johnb432 <[email protected]> * removed return of sphere object, not required or useful. * fixed a loop that got caught in the merge crossfire * Optimized approach to classifying blacklist type Co-authored-by: johnb432 <[email protected]> * Implemented changes discussed here #9728 (comment) * Config lookup optimization mentioned by johnb432 here: #9728 (comment) * white space/formatting changes * removed old parameter changed in f28d5d2 * compacted text a bit * formatting whitespace * Grammatical erros * Changes as discussed here #9728 (comment) * Few quick optimizations of == to isEqualTo * Debug updated to be easier to control * Changed how spall hold off is calculated to avoid repeated unneeded computations * clarified a hold off variable * Better approach to ACE_FRAG_RM_EH macro * Git rid of superfulous stringtable entries Co-authored-by: johnb432 <[email protected]> * unneeded parens Co-authored-by: johnb432 <[email protected]> * Clarified arguments Co-authored-by: johnb432 <[email protected]> * getposATL to getPosATL Co-authored-by: johnb432 <[email protected]> * Update addons/frag/functions/fnc_dev_addRound.sqf Co-authored-by: johnb432 <[email protected]> * Function header changes Co-authored-by: johnb432 <[email protected]> * another great isNotEqualTo opportunity Co-authored-by: johnb432 <[email protected]> * formatting changes Co-authored-by: johnb432 <[email protected]> * unneeded parens Co-authored-by: johnb432 <[email protected]> * Declared _ammoInfo twice * optimized around checking if systems are active and moved debug arguments to an ifdef * Removed white space from removing an if statement in a previous commit * Removed superfulous parenthese Co-authored-by: johnb432 <[email protected]> * clarified function description and removed unneeded comments * Moved "isServer" check to initRound function * #9728 (comment) * changed params statement, function header, and propigated doFrag argument changes * capitization from cfg to Cfg in config lookups * changed default arguments, check isKindOf to "CAManBase" * Updated function headers * white space and define placement changes * removed 2 argument option and removed some defaults * removed spurious commas * removed unused debug GVAR * Switched debug clear traces from addAction to ACE self interact * variable names weren't verbose enough * Mactched format #9728 (comment) * Updated debug settings * Shot parent possible fix #1 * Removed extra text from CfgAmmoFragParameters * Makes sure spall power square root is positive and also we don't produce fragments when for some reason the round accelerates. * white space for clarity Co-authored-by: johnb432 <[email protected]> * Optimize dev_hitbox deleting Co-authored-by: johnb432 <[email protected]> * saving people from their own bad testing setup * Since the functions always exist, I guess these variables should too * Fixe bad search function * optimization, see #9728 (comment) * changed SPG-9 Fragments * removed unneeded toLower * Changed case output to match config * Increased relative chance to hit torso/pelvis when fragemnt should hit. * Removed double space * updated some round types * Added commented 2.18 commands and updated script component * added print incomplete only option to fnc_debugAmmo * removed all spaces from macros * removd unneeded define * a Brett (HEMTT) suggested change I miss * Apply suggestions from code review Small formatting changes and small errors Co-authored-by: johnb432 <[email protected]> * Removed doublespace Co-authored-by: johnb432 <[email protected]> * Update addons/frag/functions/fnc_dev_addRound.sqf If the round isn't in the hashmap anymore, we have to stop the PFH. Brought code up to same standard as used in FUNC(dev_trackObj). - johnb432 Co-authored-by: johnb432 <[email protected]> * Update addons/frag/functions/fnc_dev_drawTrace.sqf Co-authored-by: johnb432 <[email protected]> * variable name changes * magic number clean up and white space * white space, function headers and variable names * small Should spall optimization Co-authored-by: johnb432 <[email protected]> * Removed blacklist functions and settings * reformatted function headers, removed value type checking, and changed lazy eval. * fixed missing underscore in change from review * function header, lazy eval, and params list simplifications * function header and variable name readability * changed defaults to make them more clear they're just a default value * Updated wiki to be clearer in a few areas, and add some other information I've found working on this * added MP debug compatability * Possible shouldFrag legibility improvement * added changes to stringtable * Grammar sweep on the wiki, and added some clarifications to config values * optimized dev_trackHitbox and made variables more explicit * Cleaned up documentation and documentation * reorganized postInit CBA_settingInitialized EH * missing underscore in fnc_dev_trackObj Co-authored-by: johnb432 <[email protected]> * stopped adding unneeded extra points Co-authored-by: johnb432 <[email protected]> * cleaned un-updated stringtable entries * reworked some function headers and deleted whitespace in doFragTargeted * Removed outdated code * Formatting and header fixes * Ignore curators and spectators * Made clear traces global again, added interaction condition * Change stringtable entries * Removed unused stringtable entries & fixed hitbox description * Small coding standard changes (missing semicolons on non-return values, extra parenthesis) * Changed sphere size and added return based on usage in dev_trackHitBox * removed "_lo" random fragment entries as they are unused * doFragRandom was always being called and spawning at least 5 fragments even when the fragment budget of 50 was reached. Fixed variable name (AGL instead of ATL). * removed unnceassary "disableCollisionWith" * Clarified trace statements and corrected format and spelling * Do spall exits for time 90% of the time (round hits multiple walls) and should exit on "hitting ground since no spalling is generated * Fixed ordering in which frag hold off variables are set to not skip when unneeded * initRound ordering and fixed define names * Fixed function header * reformatted comments and some v2.18 remakrs comments * Removed unneeded ground offset * Expanded TRACE * Fix typo * Moved event to preInit * Updated default fallback frag distance to be less extreme and changed fixed a magic number * Randomized random frag directions * removed some magic numbers, and cached numbers from shouldSpall * removed magic numbers and cached values preemptively (normally spallInfoCache is called later, but we pull the right config parameters so we might as well store them) * Unify example formatting Co-authored-by: Grim <[email protected]> * cleaned up function examples * removed excess square brackets * Final function example reformat * Update addons/frag/script_component.hpp * Corrected docs * Use `getOrDefaultCall` * Removed unused classes, redefined using macros to minimize error and make review easier * updated debugging output and fixed velocity error * Reformatted for legibility and debug output * caught calc error while answer johnb's question * Almost finished with compats and I had some changes to align vanilla as well * Missed variable when updating * Added unneeded class details to make PBOproject happy * Forgot to update doFragRandom docs with previous changes * and the debug context * Readd blacklist * Fixed an issue with fragments being created above water for explosions below the surface * Exposed projectile event handlers for both blacklist use and other shenanigans. * Revert "Exposed projectile event handlers for both blacklist use and other shenanigans." This reverts commit eaff498. * added debug information and folded if statements * fixed error (if statement with no argument) * Only send blacklist updates to the server * Added default fragCount fallback value based on current ACE frag range calculation * Converted all positions for doFrag to AGL since we're converting to that now * removed feet hitpoints & tightened multishot submunitions. Feet hitpoitns aren't used since calculation for trajectory doesn't account for drag, fragments aimed at feet won't hit * Merge branch 'acemod:master' into master * Revert to 60a0dae, merge conflict wasn't resolved properly * Removed event handlers * Changed blacklist to acting on local projectiles to match initial performance * added fired EH and moved projectile tracking to be local to projectile * updated initialization and should frag to check for submunitions since we no longer rely on init EH * Fixed calls for shouldFrag and got rid of old initRound.sfq (maybe back after 2.18) * fixed small mistakes in names and function calls * fixed frame offset to avoid hitting dead targets * Fixed config path in shouldFrag * Didn't know that PBO project needed trailing {} on class inheritance structures * fixed more useless trailing {} * Initial rollback to old frag simulation and spalling simulation. Updated spall to function and helpter functions as well * missed comma * remove fragCount from config * made addBlackList remove projectile EHs * updated config path to be relevant to post-EH version * All spalling in current version is local * updated search pattern to one discussed in PR #9728 * updated defines to match implementation * removed commented out debug information from nouber * removed magic numbers and code with no effect * removed more magic numbers * unfucked a comma * fixed debug def names * updated documentation * changed debug colors * mass must be in grams in this version I guess * fixed errors in frag with downgrade * fixed timing and other spall issues * updated some defne names and usages * increased code legiblity and optimized some randomizations * clarified parts of the spall event chain * Optimized loop to find spall position using larger steps and fewer operations per loop * fixed small errors * removed unused variables & EHs and set defaults in the case debug mode draw isn't used * removed "class eventhandler" references * removed _fragCount reference in newly backported debug functions * fragmenting projectile velocity isn't used anywhere * removed unused variables, implemented fixes from full rewrite PR, and fixed math errors * added debug draw mode to DEBUG_ENABLED_FRAG define check * fix documentation to make units clear on metal and filler quanities * command capitalization * added target point debug spheres * fixed target sphere visability * Jank fix so that the unit firing can get hit with it's own fragments * accidentally committed script_component.hpp w/ debug enabled * Alternative way to address shot parent self-harm issue * missed comma, going to bed, sorry * add newline and fix blacklist * legability formatting * removed extra newlines and double spaces * Updated function documentation * Removed unused stringtable items * Debug sphere conditional was missing in frago * Added class blacklisting functionality * Converted addBlacklist function to be public * fixed glaring error * Reformatted to be more concise and added argument defaults. * Deleted one sentence too many * Fixed info macro usage * Forgot to consider someone might have explosion reflections on but not fragmentation * Fix some post merge errors * missed a few more merge errors * renamed classBlacklist function * removed semicolons from a function return * Removed occurenes of doubled up lines * Somehow still missed one --------- Co-authored-by: johnb432 <[email protected]> Co-authored-by: Grim <[email protected]>
johnb432
added a commit
that referenced
this pull request
Oct 25, 2024
* removed old parameter changed in f28d5d2 * compacted text a bit * formatting whitespace * Grammatical erros * Changes as discussed here #9728 (comment) * Few quick optimizations of == to isEqualTo * Debug updated to be easier to control * Changed how spall hold off is calculated to avoid repeated unneeded computations * clarified a hold off variable * Better approach to ACE_FRAG_RM_EH macro * Git rid of superfulous stringtable entries Co-authored-by: johnb432 <[email protected]> * unneeded parens Co-authored-by: johnb432 <[email protected]> * Clarified arguments Co-authored-by: johnb432 <[email protected]> * getposATL to getPosATL Co-authored-by: johnb432 <[email protected]> * Update addons/frag/functions/fnc_dev_addRound.sqf Co-authored-by: johnb432 <[email protected]> * Function header changes Co-authored-by: johnb432 <[email protected]> * another great isNotEqualTo opportunity Co-authored-by: johnb432 <[email protected]> * formatting changes Co-authored-by: johnb432 <[email protected]> * unneeded parens Co-authored-by: johnb432 <[email protected]> * Declared _ammoInfo twice * optimized around checking if systems are active and moved debug arguments to an ifdef * Removed white space from removing an if statement in a previous commit * Removed superfulous parenthese Co-authored-by: johnb432 <[email protected]> * clarified function description and removed unneeded comments * Moved "isServer" check to initRound function * #9728 (comment) * changed params statement, function header, and propigated doFrag argument changes * capitization from cfg to Cfg in config lookups * changed default arguments, check isKindOf to "CAManBase" * Updated function headers * white space and define placement changes * removed 2 argument option and removed some defaults * removed spurious commas * removed unused debug GVAR * Switched debug clear traces from addAction to ACE self interact * variable names weren't verbose enough * Mactched format #9728 (comment) * Updated debug settings * Shot parent possible fix #1 * Removed extra text from CfgAmmoFragParameters * Makes sure spall power square root is positive and also we don't produce fragments when for some reason the round accelerates. * white space for clarity Co-authored-by: johnb432 <[email protected]> * Optimize dev_hitbox deleting Co-authored-by: johnb432 <[email protected]> * saving people from their own bad testing setup * Since the functions always exist, I guess these variables should too * Fixe bad search function * optimization, see #9728 (comment) * changed SPG-9 Fragments * removed unneeded toLower * Changed case output to match config * Increased relative chance to hit torso/pelvis when fragemnt should hit. * Removed double space * updated some round types * Added commented 2.18 commands and updated script component * added print incomplete only option to fnc_debugAmmo * removed all spaces from macros * removd unneeded define * a Brett (HEMTT) suggested change I miss * Apply suggestions from code review Small formatting changes and small errors Co-authored-by: johnb432 <[email protected]> * Removed doublespace Co-authored-by: johnb432 <[email protected]> * Update addons/frag/functions/fnc_dev_addRound.sqf If the round isn't in the hashmap anymore, we have to stop the PFH. Brought code up to same standard as used in FUNC(dev_trackObj). - johnb432 Co-authored-by: johnb432 <[email protected]> * Update addons/frag/functions/fnc_dev_drawTrace.sqf Co-authored-by: johnb432 <[email protected]> * variable name changes * magic number clean up and white space * white space, function headers and variable names * small Should spall optimization Co-authored-by: johnb432 <[email protected]> * Removed blacklist functions and settings * reformatted function headers, removed value type checking, and changed lazy eval. * fixed missing underscore in change from review * function header, lazy eval, and params list simplifications * function header and variable name readability * changed defaults to make them more clear they're just a default value * Updated wiki to be clearer in a few areas, and add some other information I've found working on this * added MP debug compatability * Possible shouldFrag legibility improvement * added changes to stringtable * Grammar sweep on the wiki, and added some clarifications to config values * optimized dev_trackHitbox and made variables more explicit * Cleaned up documentation and documentation * reorganized postInit CBA_settingInitialized EH * missing underscore in fnc_dev_trackObj Co-authored-by: johnb432 <[email protected]> * stopped adding unneeded extra points Co-authored-by: johnb432 <[email protected]> * cleaned un-updated stringtable entries * reworked some function headers and deleted whitespace in doFragTargeted * Removed outdated code * Formatting and header fixes * Ignore curators and spectators * Made clear traces global again, added interaction condition * Change stringtable entries * Removed unused stringtable entries & fixed hitbox description * Small coding standard changes (missing semicolons on non-return values, extra parenthesis) * Changed sphere size and added return based on usage in dev_trackHitBox * removed "_lo" random fragment entries as they are unused * doFragRandom was always being called and spawning at least 5 fragments even when the fragment budget of 50 was reached. Fixed variable name (AGL instead of ATL). * removed unnceassary "disableCollisionWith" * Clarified trace statements and corrected format and spelling * Do spall exits for time 90% of the time (round hits multiple walls) and should exit on "hitting ground since no spalling is generated * Fixed ordering in which frag hold off variables are set to not skip when unneeded * initRound ordering and fixed define names * Fixed function header * reformatted comments and some v2.18 remakrs comments * Removed unneeded ground offset * Expanded TRACE * Fix typo * Moved event to preInit * Updated default fallback frag distance to be less extreme and changed fixed a magic number * Randomized random frag directions * removed some magic numbers, and cached numbers from shouldSpall * removed magic numbers and cached values preemptively (normally spallInfoCache is called later, but we pull the right config parameters so we might as well store them) * Unify example formatting Co-authored-by: Grim <[email protected]> * cleaned up function examples * removed excess square brackets * Final function example reformat * Update addons/frag/script_component.hpp * Corrected docs * Use `getOrDefaultCall` * Removed unused classes, redefined using macros to minimize error and make review easier * updated debugging output and fixed velocity error * Reformatted for legibility and debug output * caught calc error while answer johnb's question * Almost finished with compats and I had some changes to align vanilla as well * Missed variable when updating * Added unneeded class details to make PBOproject happy * Forgot to update doFragRandom docs with previous changes * and the debug context * Readd blacklist * Fixed an issue with fragments being created above water for explosions below the surface * Exposed projectile event handlers for both blacklist use and other shenanigans. * Revert "Exposed projectile event handlers for both blacklist use and other shenanigans." This reverts commit eaff498. * added debug information and folded if statements * fixed error (if statement with no argument) * Only send blacklist updates to the server * Added default fragCount fallback value based on current ACE frag range calculation * Converted all positions for doFrag to AGL since we're converting to that now * removed feet hitpoints & tightened multishot submunitions. Feet hitpoitns aren't used since calculation for trajectory doesn't account for drag, fragments aimed at feet won't hit * Merge branch 'acemod:master' into master * Revert to 60a0dae, merge conflict wasn't resolved properly * Removed event handlers * Changed blacklist to acting on local projectiles to match initial performance * added fired EH and moved projectile tracking to be local to projectile * updated initialization and should frag to check for submunitions since we no longer rely on init EH * Fixed calls for shouldFrag and got rid of old initRound.sfq (maybe back after 2.18) * fixed small mistakes in names and function calls * fixed frame offset to avoid hitting dead targets * Fixed config path in shouldFrag * Didn't know that PBO project needed trailing {} on class inheritance structures * fixed more useless trailing {} * Initial rollback to old frag simulation and spalling simulation. Updated spall to function and helpter functions as well * missed comma * remove fragCount from config * made addBlackList remove projectile EHs * updated config path to be relevant to post-EH version * All spalling in current version is local * updated search pattern to one discussed in PR #9728 * updated defines to match implementation * removed commented out debug information from nouber * removed magic numbers and code with no effect * removed more magic numbers * unfucked a comma * fixed debug def names * updated documentation * changed debug colors * mass must be in grams in this version I guess * fixed errors in frag with downgrade * fixed timing and other spall issues * updated some defne names and usages * increased code legiblity and optimized some randomizations * clarified parts of the spall event chain * Optimized loop to find spall position using larger steps and fewer operations per loop * fixed small errors * removed unused variables & EHs and set defaults in the case debug mode draw isn't used * removed "class eventhandler" references * removed _fragCount reference in newly backported debug functions * fragmenting projectile velocity isn't used anywhere * removed unused variables, implemented fixes from full rewrite PR, and fixed math errors * added debug draw mode to DEBUG_ENABLED_FRAG define check * fix documentation to make units clear on metal and filler quanities * command capitalization * added target point debug spheres * fixed target sphere visability * Jank fix so that the unit firing can get hit with it's own fragments * accidentally committed script_component.hpp w/ debug enabled * Alternative way to address shot parent self-harm issue * missed comma, going to bed, sorry * add newline and fix blacklist * legability formatting * removed extra newlines and double spaces * Updated function documentation * Removed unused stringtable items * Debug sphere conditional was missing in frago * Completed suggested changed by johnb432 * restored 40mm grenade fragmentation * Apply suggestions from code review Fixed a number of config errors Co-authored-by: PabstMirror <[email protected]> * Fixed firefist inheritance and order of 125mm shell * Wrong order on reflections variables, but it's not like anyone uses that * Added projectile locality * Added proper projectile locality checks * left some locality debug text * This isn't worthy of a warning as most of the time _objectHit is null is due to the projectile hitting the ground * Removed a newlines for code brackets in arrays * updated debug functions with some minor optimizations * Apply suggestions from code review Grammar and spelling corrections Co-authored-by: Jouni Järvinen <[email protected]> * didn't consider someone might use explosion reflections but not frag * addressed future arma v2.18 changes more aptly * Fixed authors line on fired function. Used to make sense different when it was an init function based on ammunition extended eventhandlers, missed the revert. * switch all hash fallbacks to getOrDefaultCall and turned default fragments array into a define * Transitioned frag system from fired to ace explode event system * decreased chance to hit / fragment inaccuracy. * fixing setShotParents only sometimes setting first argument, not instigator * cleanup * Slight optimization of "_vecVar" calculation * removed dev_addRound function * Command changes for Arma 2.18 * Fixed debug setting changes * missed exit condition * removed shot parents due to local creation of spall * simplified comment * Adjusted whitespace for readability * Reformatted comments per Johnb432's suggestions Co-authored-by: johnb432 <[email protected]> * one more indent fix --------- Co-authored-by: johnb432 <[email protected]> Co-authored-by: Grim <[email protected]> Co-authored-by: PabstMirror <[email protected]> Co-authored-by: Jouni Järvinen <[email protected]>
LinkIsGrim
added a commit
that referenced
this pull request
Nov 2, 2024
* removed old parameter changed in f28d5d2 * compacted text a bit * formatting whitespace * Grammatical erros * Changes as discussed here #9728 (comment) * Few quick optimizations of == to isEqualTo * Debug updated to be easier to control * Changed how spall hold off is calculated to avoid repeated unneeded computations * clarified a hold off variable * Better approach to ACE_FRAG_RM_EH macro * Git rid of superfulous stringtable entries Co-authored-by: johnb432 <[email protected]> * unneeded parens Co-authored-by: johnb432 <[email protected]> * Clarified arguments Co-authored-by: johnb432 <[email protected]> * getposATL to getPosATL Co-authored-by: johnb432 <[email protected]> * Update addons/frag/functions/fnc_dev_addRound.sqf Co-authored-by: johnb432 <[email protected]> * Function header changes Co-authored-by: johnb432 <[email protected]> * another great isNotEqualTo opportunity Co-authored-by: johnb432 <[email protected]> * formatting changes Co-authored-by: johnb432 <[email protected]> * unneeded parens Co-authored-by: johnb432 <[email protected]> * Declared _ammoInfo twice * optimized around checking if systems are active and moved debug arguments to an ifdef * Removed white space from removing an if statement in a previous commit * Removed superfulous parenthese Co-authored-by: johnb432 <[email protected]> * clarified function description and removed unneeded comments * Moved "isServer" check to initRound function * #9728 (comment) * changed params statement, function header, and propigated doFrag argument changes * capitization from cfg to Cfg in config lookups * changed default arguments, check isKindOf to "CAManBase" * Updated function headers * white space and define placement changes * removed 2 argument option and removed some defaults * removed spurious commas * removed unused debug GVAR * Switched debug clear traces from addAction to ACE self interact * variable names weren't verbose enough * Mactched format #9728 (comment) * Updated debug settings * Shot parent possible fix #1 * Removed extra text from CfgAmmoFragParameters * Makes sure spall power square root is positive and also we don't produce fragments when for some reason the round accelerates. * white space for clarity Co-authored-by: johnb432 <[email protected]> * Optimize dev_hitbox deleting Co-authored-by: johnb432 <[email protected]> * saving people from their own bad testing setup * Since the functions always exist, I guess these variables should too * Fixe bad search function * optimization, see #9728 (comment) * changed SPG-9 Fragments * removed unneeded toLower * Changed case output to match config * Increased relative chance to hit torso/pelvis when fragemnt should hit. * Removed double space * updated some round types * Added commented 2.18 commands and updated script component * added print incomplete only option to fnc_debugAmmo * removed all spaces from macros * removd unneeded define * a Brett (HEMTT) suggested change I miss * Apply suggestions from code review Small formatting changes and small errors Co-authored-by: johnb432 <[email protected]> * Removed doublespace Co-authored-by: johnb432 <[email protected]> * Update addons/frag/functions/fnc_dev_addRound.sqf If the round isn't in the hashmap anymore, we have to stop the PFH. Brought code up to same standard as used in FUNC(dev_trackObj). - johnb432 Co-authored-by: johnb432 <[email protected]> * Update addons/frag/functions/fnc_dev_drawTrace.sqf Co-authored-by: johnb432 <[email protected]> * variable name changes * magic number clean up and white space * white space, function headers and variable names * small Should spall optimization Co-authored-by: johnb432 <[email protected]> * Removed blacklist functions and settings * reformatted function headers, removed value type checking, and changed lazy eval. * fixed missing underscore in change from review * function header, lazy eval, and params list simplifications * function header and variable name readability * changed defaults to make them more clear they're just a default value * Updated wiki to be clearer in a few areas, and add some other information I've found working on this * added MP debug compatability * Possible shouldFrag legibility improvement * added changes to stringtable * Grammar sweep on the wiki, and added some clarifications to config values * optimized dev_trackHitbox and made variables more explicit * Cleaned up documentation and documentation * reorganized postInit CBA_settingInitialized EH * missing underscore in fnc_dev_trackObj Co-authored-by: johnb432 <[email protected]> * stopped adding unneeded extra points Co-authored-by: johnb432 <[email protected]> * cleaned un-updated stringtable entries * reworked some function headers and deleted whitespace in doFragTargeted * Removed outdated code * Formatting and header fixes * Ignore curators and spectators * Made clear traces global again, added interaction condition * Change stringtable entries * Removed unused stringtable entries & fixed hitbox description * Small coding standard changes (missing semicolons on non-return values, extra parenthesis) * Changed sphere size and added return based on usage in dev_trackHitBox * removed "_lo" random fragment entries as they are unused * doFragRandom was always being called and spawning at least 5 fragments even when the fragment budget of 50 was reached. Fixed variable name (AGL instead of ATL). * removed unnceassary "disableCollisionWith" * Clarified trace statements and corrected format and spelling * Do spall exits for time 90% of the time (round hits multiple walls) and should exit on "hitting ground since no spalling is generated * Fixed ordering in which frag hold off variables are set to not skip when unneeded * initRound ordering and fixed define names * Fixed function header * reformatted comments and some v2.18 remakrs comments * Removed unneeded ground offset * Expanded TRACE * Fix typo * Moved event to preInit * Updated default fallback frag distance to be less extreme and changed fixed a magic number * Randomized random frag directions * removed some magic numbers, and cached numbers from shouldSpall * removed magic numbers and cached values preemptively (normally spallInfoCache is called later, but we pull the right config parameters so we might as well store them) * Unify example formatting Co-authored-by: Grim <[email protected]> * cleaned up function examples * removed excess square brackets * Final function example reformat * Update addons/frag/script_component.hpp * Corrected docs * Use `getOrDefaultCall` * Removed unused classes, redefined using macros to minimize error and make review easier * updated debugging output and fixed velocity error * Reformatted for legibility and debug output * caught calc error while answer johnb's question * Almost finished with compats and I had some changes to align vanilla as well * Missed variable when updating * Added unneeded class details to make PBOproject happy * Forgot to update doFragRandom docs with previous changes * and the debug context * Readd blacklist * Fixed an issue with fragments being created above water for explosions below the surface * Exposed projectile event handlers for both blacklist use and other shenanigans. * Revert "Exposed projectile event handlers for both blacklist use and other shenanigans." This reverts commit eaff498. * added debug information and folded if statements * fixed error (if statement with no argument) * Only send blacklist updates to the server * Added default fragCount fallback value based on current ACE frag range calculation * Converted all positions for doFrag to AGL since we're converting to that now * removed feet hitpoints & tightened multishot submunitions. Feet hitpoitns aren't used since calculation for trajectory doesn't account for drag, fragments aimed at feet won't hit * Merge branch 'acemod:master' into master * Revert to 60a0dae, merge conflict wasn't resolved properly * Removed event handlers * Changed blacklist to acting on local projectiles to match initial performance * added fired EH and moved projectile tracking to be local to projectile * updated initialization and should frag to check for submunitions since we no longer rely on init EH * Fixed calls for shouldFrag and got rid of old initRound.sfq (maybe back after 2.18) * fixed small mistakes in names and function calls * fixed frame offset to avoid hitting dead targets * Fixed config path in shouldFrag * Didn't know that PBO project needed trailing {} on class inheritance structures * fixed more useless trailing {} * Initial rollback to old frag simulation and spalling simulation. Updated spall to function and helpter functions as well * missed comma * remove fragCount from config * made addBlackList remove projectile EHs * updated config path to be relevant to post-EH version * All spalling in current version is local * updated search pattern to one discussed in PR #9728 * updated defines to match implementation * removed commented out debug information from nouber * removed magic numbers and code with no effect * removed more magic numbers * unfucked a comma * fixed debug def names * updated documentation * changed debug colors * mass must be in grams in this version I guess * fixed errors in frag with downgrade * fixed timing and other spall issues * updated some defne names and usages * increased code legiblity and optimized some randomizations * clarified parts of the spall event chain * Optimized loop to find spall position using larger steps and fewer operations per loop * fixed small errors * removed unused variables & EHs and set defaults in the case debug mode draw isn't used * removed "class eventhandler" references * removed _fragCount reference in newly backported debug functions * fragmenting projectile velocity isn't used anywhere * removed unused variables, implemented fixes from full rewrite PR, and fixed math errors * added debug draw mode to DEBUG_ENABLED_FRAG define check * fix documentation to make units clear on metal and filler quanities * command capitalization * added target point debug spheres * fixed target sphere visability * Jank fix so that the unit firing can get hit with it's own fragments * accidentally committed script_component.hpp w/ debug enabled * Alternative way to address shot parent self-harm issue * missed comma, going to bed, sorry * add newline and fix blacklist * legability formatting * removed extra newlines and double spaces * Updated function documentation * Removed unused stringtable items * Debug sphere conditional was missing in frago * Completed suggested changed by johnb432 * restored 40mm grenade fragmentation * Apply suggestions from code review Fixed a number of config errors Co-authored-by: PabstMirror <[email protected]> * Fixed firefist inheritance and order of 125mm shell * Wrong order on reflections variables, but it's not like anyone uses that * Added projectile locality * Added proper projectile locality checks * left some locality debug text * This isn't worthy of a warning as most of the time _objectHit is null is due to the projectile hitting the ground * Removed a newlines for code brackets in arrays * updated debug functions with some minor optimizations * Apply suggestions from code review Grammar and spelling corrections Co-authored-by: Jouni Järvinen <[email protected]> * didn't consider someone might use explosion reflections but not frag * addressed future arma v2.18 changes more aptly * Fixed authors line on fired function. Used to make sense different when it was an init function based on ammunition extended eventhandlers, missed the revert. * switch all hash fallbacks to getOrDefaultCall and turned default fragments array into a define * Transitioned frag system from fired to ace explode event system * decreased chance to hit / fragment inaccuracy. * fixing setShotParents only sometimes setting first argument, not instigator * cleanup * Slight optimization of "_vecVar" calculation * removed dev_addRound function * Command changes for Arma 2.18 * Fixed debug setting changes * missed exit condition * removed shot parents due to local creation of spall * simplified comment * Adjusted whitespace for readability * Reformatted comments per Johnb432's suggestions Co-authored-by: johnb432 <[email protected]> * one more indent fix --------- Co-authored-by: johnb432 <[email protected]> Co-authored-by: Grim <[email protected]> Co-authored-by: PabstMirror <[email protected]> Co-authored-by: Jouni Järvinen <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Finished porting AGM_Core: