forked from igorkis-scrts/A3-Antistasi-Plus
-
Notifications
You must be signed in to change notification settings - Fork 38
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
no vaping in WW2 #239
Merged
Merged
no vaping in WW2 #239
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
SilenceIsFatto
approved these changes
Jul 8, 2024
SilenceIsFatto
added
the
ready-for-merge
Use for the AUC bot to allow it to merge everything at once when needed.
label
Jul 9, 2024
stutpip123
added a commit
that referenced
this pull request
Aug 11, 2024
commit e8585ab8583ef67d54d80727a762bd853363797d Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Fri Aug 9 21:17:28 2024 +0100 Update script_version.hpp commit 6fa98cd056265457069074dd02c9d1a6e80d435a Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Fri Aug 9 21:16:07 2024 +0100 Fix missing ] in SPE/IFA templates commit 58866335084495a33f7116a34c658391584bba55 Merge: f8f88804b b9e706b7e Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Fri Aug 9 21:04:21 2024 +0100 Merge pull request #275 from SilenceIsFatto/MapFixs Discord Rich Presence Fixes commit f8f88804bbf7e29cda6d0de144acd0d1591880de Merge: 7ef9723b1 e23a8167d Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Fri Aug 9 21:04:18 2024 +0100 Merge pull request #274 from vsbyt/GM-FIA-uniforms-update GM_Reb template uniforms update commit 7ef9723b17081d3d7a4e48a4540124f5b76442e2 Merge: eef9a7fe2 39ae7e7b7 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Fri Aug 9 21:04:16 2024 +0100 Merge pull request #272 from SilenceIsFatto/SPE-Update Spearhead 1.1.0 Update commit eef9a7fe27cc1c3c3b722386089dde9cbb03199b Merge: 43667fba0 706173ccd Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Fri Aug 9 21:04:13 2024 +0100 Merge pull request #271 from SilenceIsFatto/WW2-Tanks-ArmouredCars WW2 Tanks + WW2 Armoured Cars Support commit 43667fba08069e8962e4b320d19daca5888639f2 Merge: 20e86be61 9bb52cc33 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Fri Aug 9 21:04:11 2024 +0100 Merge pull request #263 from wersal454/CSLA-templates CSLA templates commit b9e706b7ec5e15d84e719d9dcaccb0b1c5faa8fd Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com> Date: Fri Aug 9 20:39:17 2024 +0300 fixxed an oppsie commit d8f76be31bce89a9582ff0ea72cecc680d141ceb Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com> Date: Fri Aug 9 20:37:10 2024 +0300 Update fn_misc_getWorldName.sqf commit 528a40ce200c3549a86af31d96eb8e0c0ab13b64 Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com> Date: Fri Aug 9 20:26:32 2024 +0300 Discord Rich Presence Fixes fixed issues with discord rich presence and added missing information commit 39ae7e7b7d8b789bd8f7c0621993acd3d1ab213b Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Fri Aug 9 14:13:17 2024 +0100 SPEX Boat Support commit 9eee48d2f0e55d5887caaa68b9ea2ede6a83de52 Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Fri Aug 9 11:02:08 2024 +0100 SPE German and French Voices commit e23a8167d400e192a5933a22133a1444fbe19ed6 Author: vasbyt <mattjackson128@gmail.com> Date: Fri Aug 9 13:12:27 2024 +1000 Update GM_Reb with new uniforms Replace 2035 uniforms, backpacks, facewear with GM classes commit a629f0762196ad30ce627b03248279c72ad6f634 Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Thu Aug 8 17:55:59 2024 +0100 Update mission.sqm commit 68929e12f7f859a0667c1234f4bc1c0b80509092 Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Wed Aug 7 21:24:57 2024 +0100 Add M24 Chaffee optional to SPE Templates https://steamcommunity.com/sharedfiles/filedetails/?id=3301951691 Added to SPE USA and SPE_IFA USA commit 151ea836f683a309520f0dcdc59e3f9ff0937996 Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Wed Aug 7 18:14:36 2024 +0100 Mortain Map Port commit 8792ed70518d668aa22a29fca60e880213a4f67f Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Wed Aug 7 13:09:47 2024 +0100 Update SPE Vehicle Dealer commit 9bb52cc33cd1ceac1d1328a602a734c5c6202579 Merge: 8075ef5d2 20e86be61 Author: wersal454 <wroma@bk.ru> Date: Wed Aug 7 14:34:35 2024 +0300 Merge branch 'unstable' into CSLA-templates commit bf6b8719858ca53afeb1645b68a6869ea9f0d6f3 Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Wed Aug 7 11:40:20 2024 +0100 Update Arms Store commit 231a7813a0311bdf5d3d2f35538145cda1ad1b8a Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Wed Aug 7 11:07:36 2024 +0100 Node Seats commit 6f76ede91d21a9412d6980341342ed8dfdd80772 Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Wed Aug 7 11:02:36 2024 +0100 Truck and Jeep Nodes commit aef1b0ac40bc30bf858a635482e8975a82315d47 Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Tue Aug 6 23:00:41 2024 +0100 C-47 Mega Pack still need a transport plane so this will have to do. regardless a huge improvement not to need all of IFA3 and CUP Terrains Core commit fbcf63cb24a1d4a8ce2567d65c0b588423171b1f Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Tue Aug 6 22:46:55 2024 +0100 fix mistakes commit f67c1aa469c6e884ad5900690c4f3967a9e0ad8b Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Tue Aug 6 22:09:28 2024 +0100 Spearhead Standalone Templates commit 7fcfddadfb831b0533e1501fe1a4fdb3cbf230ef Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Tue Aug 6 18:20:31 2024 +0100 SPE v1.1.0, SPE_IFA Templates Add new vehicles and weapons to SPE_IFA templates commit 706173ccdd9d6400740846ee03bc9dcff2726d4a Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Sun Aug 4 15:24:02 2024 +0100 Re-add King Tiger now with the IS-2 and Pershing possible, the King Tiger should be less OP (RIP UK faction, no heavy for you) commit ae28b05187593aa60052918f7b3f4ca579e41304 Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Sun Aug 4 15:18:05 2024 +0100 Allies Templates combined UK + USA templates, UK Militia and SF, USA Military and Elite commit a9df882690dea1d0054de4986d94954b0ea8ee3e Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Sun Aug 4 14:54:33 2024 +0100 WW2 Tanks + Armoured Cars SOV added vehicles to IFA Soviet templates. NFtS has no need, already has these vehicles commit 377fd1a8bf0cb9408f2a66d8a940e71b37cd1c8f Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Sun Aug 4 14:40:04 2024 +0100 WW2 Tanks + Armoured Cars WEH added vehicles to IFA and FoW Wehrmacht templates, CSA38 templates already have similar model of the vehicles so no point duplicating commit 7eeb0f91d1af610d39963a3c3bc7f1211ce39152 Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Sun Aug 4 14:25:21 2024 +0100 WW2 Tanks + Armoured Cars UK Daimler, T17E1 and Valentine to appropriate UK WW2 templates commit 303380219fb98175698b8e92fe7ba0432e0eb7b3 Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Sun Aug 4 14:11:04 2024 +0100 M26 Pershing to USA WW2 Templates not included in arid due to M26 only being used in Europe near end of war and camo not fitting commit 20e86be6136c65f842f56a3d2edaf33ce116446f Merge: 837080e20 6434527a5 Author: Silence <78276788+SilenceIsFatto@users.noreply.github.com> Date: Thu Aug 1 21:21:00 2024 +0100 Merge branch 'stable' into unstable commit 837080e20d08c25dace7cfb680da1fea83a65e04 Author: Silence <78276788+SilenceIsFatto@users.noreply.github.com> Date: Thu Aug 1 21:18:33 2024 +0100 Fix wrong return from getOrDefault in fn_createAIAirplane.sqf (#269) * Fix wrong return from getOrDefault * More default return fixes commit 4498a3fc140d3dd574a7fbab671b722c06ec5c2b Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Thu Aug 1 21:17:19 2024 +0100 Replace USA vehicles in CUP BAF templates (#268) * Replace USA vehicles * whoops, got them backwards lol commit 131fea3e3cb9e004157aa6bee7d55b78af6e8613 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Wed Jul 31 20:07:31 2024 +0100 Missing comma fix commit 6434527a5984e8f71d287c8f61de9d0c5f089943 Author: Silence <78276788+SilenceIsFatto@users.noreply.github.com> Date: Wed Jul 31 15:52:14 2024 +0100 v11.0.0 (#266) * forgot about this ones * fixesfixesfixes * fixes for fixes + working searchlight * CWR Initial work * AI "Get In" Command's Fixed when unconscious * Removing old code * port community updates (prs in description) Community PRs: #3226 #3215 #3197 #3196 #3195 #3188 #3152 #3136 #3114 #3110 * Link weapons and vehicles to addons * Update csvparser * Add vehicles from modsets * Update vehicles_tmt.hpp * add proper conditions + unsung * Add unsung to trader * Add max zone + bad classname protection * CWR US Army * CWRIII US Army WD + DES, Logi, Plane Loadouts * USSR Start * Update black market UI and text + Vehicle conditions are now done via macro and the python scripts have been cleaned up * Add old trader method detection * Update README.md * Update Stringtable.xml * cleaning/refining files and structure * Update xlsx2csv, add .ps1 scripts * Update xlsx2csv.py * Update documentation * Update link * fix IFA and stock locality * swap A3U_blackMarketStock to use publicVariable * last attempt to fix the black market * Update parser to properly handle existing comments * Update vehicle price functions * Update fn_support_lootHeli.sqf * Fix zone preview exploit via map screen * Fix error - initZones.sqf * Only give info if zone is normally revealed * Fix potential money exploit * USSR * Update CWR_AI_USSR_Temperate.sqf * Add missing dealers, fix SOGPF planes in OPTRE * Reb and Riv * fixes * more fixes * USSR plane loadouts * CWRIII BAF * Arms Dealer Weapon Stock * Reb Tweaks * Update config.hpp * Update cwr.hpp * USMC * USMC Planes + Fixes * Update CWR_AI_USMC_Temperate.sqf * TDF Arid * tdf flag * TRF Rival * Update CWR_AI_BAF_Temperate.sqf * Update CWR_Riv_TReb.sqf * Update templates.hpp * Initial Port * Cont * Port should be ready to playtest now * Initial Setup map port stuff + milBuildings for unsung MG and AA * Port and MilBuildings * roadblocks * Update mission.sqm * WW2 MilBuildings + Staszow redo * update staszow * Tobruk update * Spearhead Milbuildings * Update description.ext * Update script_version.hpp * Update linked page * CWR trader rework * Add RU translations for black market * Yulakia and Phuoc Tuy whiteboard images * Update fn_initVarCommon.sqf * Yulakia Fixes * switch modern HMG to older model * Phuoc Tuy Improvements more outposts, seaports, another staticMG milbuilding for said areas * fix CWR FIA Mosin Ammo * add milbase to yulakia * Disable Towns + Add More Zones * USSR Flag * Fix CWRIII weapon stock * Update cfgTraderAddons.hpp * Remove non-existent weapon entries * Continuing #204 * yulakia outpost 29 move flag * Phuoc Tuy Invader Bases * Dropdown menu for selection * Gulfcoast Islands Map Port to AU of Gulfcoast Islands map * Update mission.sqm Added more seaAttackSpawn, seaPatrol, seaSpawn & control markers across the map. Added a SAM markers to Gasparilla Airbase (airport_1) and Rotonda East (airport_6) Disabled simulation on multiple entities/buildings. * Map Update ADDED: - A military base (milbase_5) - One additional outpost (outpost_22) (mightve added another dont remember) - Additional 4-6 resource nodes - Added buildings to: outpost_19, milbase_2, milbase_3 MODIFIED: - Moved locations of two factories (factory_4, factory_5) - Fixed a couple of marker names - Cleaned up sea markers (reduced/moved) * Fix spartan radio backpack * Add forbiddenItems checks * Update cfgForbiddenItems.hpp * Handle nil cost * Allow forbidden items to be sold correctly * 3AS Update v0.00.48 * 3AS Update v0.00.48 Arms Dealer * Remove testing forbiddenItem * Rename saves from AntistasiPlus to AntistasiUltimate * Update mission.sqm Updated building locations in Rassa Airport Military Base to account to default placed helipads Removed Hide Terrain Object from Rassa Speedway Outpost as well as helipad to make way for default Deleted Grenadier and Autorifleman lobby roles and in turn slimmed down player slots from 41 to 27. * Send chat message when downed * Playtest Patch 1 Patch 1 for playtest issue comment * Log when vehicle type is unlocked in dealer * Replace community HQ with Plus type HQ * Save/load revealed zones * Remove log message * Invader return framework * vanilla LL mortar fix * Remove template blackMarketStock * WW2 Objective Trucks * save/load unlocked vehicle types * notify when vehicles are unlocked * Adjustments + fixes * Update trader unlock conditions * Update Stringtable.xml fix ru localization * OPTRE and SW gunships + attack UAVs added to spawn pool * no vaping in WW2 * western sahara update 1.1.3 * western sahara update 1.1.3 * Update WS_Riv_ION.sqf * western sahara update 1.1.3 * western sahara update 1.1.3 * western sahara update 1.1.3 * Update Vanilla_Reb_FIA.sqf * Update mission.sqm Replace Corrections Facility resource node for a outpost node, and added a Seaport south of it. Hid protruding alignment lights at Rassa Airport. Hid trees obstructing Onion Airbase's eastern landing strip making landing a little easier. * Enable hacking parameter * Something to hack * Staszow Update Again * Update RU translations * Delete A3A/addons/launchMissile.sqf * blah * Update blackMarketDialog.hpp * Update fn_blackMarketDialog.sqf * bebe * Fix Floating Buildings * FIXED * Display self-revive cooldown in unconscious state * Add black market weapons isNil checks * Use the _unit variable for consistency Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com> * FIX for empty space * Fix self-revive cooldown doesn't disappear when respawn * Using A3A_fnc_customHint instead hintSilent * Removed unnecessary code * Prevent customHint sound spamming * Update A3A/addons/core/Params.hpp Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com> * make markersImmune a publicVariable * update version * Update Stringtable.xml * Fix duplicate vehicle from conflict resolution * Fix the broken marker(marker no more)) + fix for empty category * East and West militia factions * Fix type array expected string in resourcecheck * Update EM guns * Update Vanilla.hpp * Update GM.hpp * Updated militia flags * Create GM * Update GM.hpp * kill mutant mission * Smasher mission updates, infestation mission * Attack heli for smasher + zombie infestation fix * Extra safety checks * part 1 ? * Smasher fnc restructuring, zombie conquest mission * DME, ODST, UNSC, Covenant alternative * SOG noinsignia variants * finished SOG config Somevehicles missing, cause there is no way of making their variants(or I didn't found one) * Extra checks for unlocked vehicles * Update fn_resourcecheck.sqf * Ability to donate less than 250 * Attack on return * OPFOR insurrectionist faction * A little update to SOG and SPE * Add default sell price for rival vehicles * spe cargo and nodes * Fix misplaced commas * Update A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_Remnants.sqf Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com> * Update A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_Remnants.sqf Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com> * Update A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com> * Update conditions (+ vehicles) (#264) * Update infestation and conquest zombie mission (#265) * Update infestation and conquest mission * GC update * Update fn_spawnZombieWaves.sqf --------- Co-authored-by: wersal454 <wroma@bk.ru> Co-authored-by: stutpip123 <77023662+stutpip123@users.noreply.github.com> Co-authored-by: sniperclub01 <30736048+sniperclub01@users.noreply.github.com> Co-authored-by: traditional <katzepvp@gmail.com> Co-authored-by: traditional <38315957+lanoitidart@users.noreply.github.com> Co-authored-by: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Co-authored-by: staysane0 <jiviandrew@gmail.com> Co-authored-by: dayrain <blackwaterbread@gmail.com> commit 8075ef5d2d40f543b6cea6f059db382b2e70ecdc Merge: ecff4b353 c84d2487a Author: wersal454 <wroma@bk.ru> Date: Wed Jul 31 17:16:26 2024 +0300 Merge branch 'unstable' into CSLA-templates commit c84d2487afa88bca380a1c199f94902f1a52b19d Author: Silence <78276788+SilenceIsFatto@users.noreply.github.com> Date: Wed Jul 31 15:05:10 2024 +0100 Update infestation and conquest zombie mission (#265) * Update infestation and conquest mission * GC update * Update fn_spawnZombieWaves.sqf commit f5c35e18dc1dfd7d8b7789b996e288b82df710ef Author: Silence <78276788+SilenceIsFatto@users.noreply.github.com> Date: Wed Jul 31 14:41:29 2024 +0100 Update conditions (+ vehicles) (#264) commit b756a90f6e10d82fe680fa2645eb00462d040a8a Merge: 2357577a1 d4e0eccb2 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Wed Jul 31 14:38:01 2024 +0100 Merge pull request #260 from SilenceIsFatto/OPTRE-Factions New OPTRE factions commit 2357577a12087ab00f5bbe75e4ee4876016b25e2 Merge: 070131027 de62c61e1 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Wed Jul 31 14:37:59 2024 +0100 Merge pull request #256 from wersal454/no-insignia-configs No insignia configs + SOG & SPE nodes and stores updated + GM store update commit 0701310277658bae6820b1247d2cd4d6cdc48cf8 Merge: df7ee645d b536f1485 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Wed Jul 31 14:37:56 2024 +0100 Merge pull request #252 from wersal454/patch-22 updated GM cargo nodes commit df7ee645db7045e6abbf73f1512912a69ce86c9b Merge: dbdead7f1 50991f0e4 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Wed Jul 31 14:37:53 2024 +0100 Merge pull request #202 from wersal454/backlog-features GUNSHIP/UAV/CRUISEMISSILE supports commit ecff4b353e8953a1a1b513d614a0017b000e9de4 Merge: 4a43f32b0 dbdead7f1 Author: wersal454 <wroma@bk.ru> Date: Wed Jul 31 14:57:00 2024 +0300 Merge branch 'unstable' into CSLA-templates commit 4a43f32b0d7f0428b50ca44c27c5b780df7c37c7 Author: wersal454 <wroma@bk.ru> Date: Wed Jul 31 14:56:49 2024 +0300 Update CSLA_Riv_Separatists.sqf commit de62c61e11cec6867ea53b6bc0b1be8eda8ccaf4 Author: wersal454 <wroma@bk.ru> Date: Tue Jul 30 17:20:07 2024 +0300 Update A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com> commit a2840f637ee8909539e00cc1967e8c11c0674102 Author: wersal454 <wroma@bk.ru> Date: Tue Jul 30 17:19:59 2024 +0300 Update A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_Remnants.sqf Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com> commit b6e8e69cbfb60bc22b110414075af0c88a5a8c93 Author: wersal454 <wroma@bk.ru> Date: Tue Jul 30 17:19:42 2024 +0300 Update A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_Remnants.sqf Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com> commit 50991f0e46bd90b9c820d3e2d3f540e0ccf98053 Merge: 41aee3e25 dbdead7f1 Author: wersal454 <wroma@bk.ru> Date: Tue Jul 30 17:02:33 2024 +0300 Merge branch 'unstable' into backlog-features commit 028e382d9aa9c514725fa69773ab9d12b3deaee2 Merge: 0f8a6f2c4 dbdead7f1 Author: wersal454 <wroma@bk.ru> Date: Tue Jul 30 17:01:38 2024 +0300 Merge branch 'unstable' into no-insignia-configs commit dbdead7f1205ae4c20173543199a36080ed5cad9 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Mon Jul 29 15:17:35 2024 +0100 Fix misplaced commas commit 8731233257989bc55ddc179bf09c46a3698dd6ca Author: wersal454 <wroma@bk.ru> Date: Mon Jul 29 01:50:57 2024 +0300 working version commit 41aee3e2566e50be0130681408c8eea9c3a2a6c2 Merge: 1330a1096 bd33fbb4a Author: wersal454 <wroma@bk.ru> Date: Mon Jul 29 01:17:36 2024 +0300 Merge branch 'unstable' into backlog-features commit bd33fbb4a28e03fef84c7f9451491637794a1fdd Merge: 87a522190 6e283a1db Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Sun Jul 28 23:05:57 2024 +0100 Merge pull request #262 from SilenceIsFatto/rivals-default-sell-price Add default sell price for rival vehicles commit 87a5221907ca0c1c285b5c32e11d342870e7d55a Merge: b6a540b34 ff813ab68 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Sun Jul 28 23:05:55 2024 +0100 Merge pull request #261 from SilenceIsFatto/donateMoney-rework Ability to donate less than 250 (with less than 250) commit b6a540b34c8a0f73281a39ee092002baec12e7ab Merge: 1c22d6db6 57b49154b Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Sun Jul 28 23:05:53 2024 +0100 Merge pull request #255 from SilenceIsFatto/zombie-missions Zombie themed missions commit 1c22d6db6a1739a0bd934f53b162c43c08935b5c Merge: f37288c4f eef6f27d9 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Sun Jul 28 23:05:50 2024 +0100 Merge pull request #253 from SilenceIsFatto/CUP-Militia CUP Militia/Loyalist Factions commit f37288c4fa59f86478846fa71e4917549e8b518c Merge: f5099dc89 a60d21cb4 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Sun Jul 28 23:05:48 2024 +0100 Merge pull request #236 from SilenceIsFatto/invader-emergence Invader return framework commit 8ac51a8ed3af82c4ee0b876e785ab0111f31fe5b Author: wersal454 <wroma@bk.ru> Date: Sun Jul 28 20:59:17 2024 +0300 Create CSLA commit 0f8a6f2c44aad90d2160f7068d202b41045a18ac Author: wersal454 <wroma@bk.ru> Date: Sun Jul 28 17:56:54 2024 +0300 spe cargo and nodes commit 6e283a1db4a67e13271101c4e09408bd12457da0 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sun Jul 28 15:27:21 2024 +0100 Add default sell price for rival vehicles commit 12291be4b753771bddce10646d73bfacb509ffc2 Author: wersal454 <wroma@bk.ru> Date: Sun Jul 28 16:40:16 2024 +0300 A little update to SOG and SPE commit b536f14852d2eca336fb53e4f4e68acbf22495aa Merge: 411f72644 f5099dc89 Author: wersal454 <wroma@bk.ru> Date: Sun Jul 28 15:07:24 2024 +0300 Merge branch 'unstable' into patch-22 commit d4e0eccb2b20d36ec81af9fa43b3c8c826ccde34 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sat Jul 27 23:38:06 2024 +0100 OPFOR insurrectionist faction commit a60d21cb437c5c2f930032b3d7c9203973be4129 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sat Jul 27 16:10:52 2024 +0100 Attack on return commit d59511bb08eaa3cd0756210eb5e03b2274301bb5 Merge: 2925548ac f5099dc89 Author: Silence <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sat Jul 27 14:33:46 2024 +0100 Merge branch 'unstable' into invader-emergence commit ff813ab68bd48715fea9085ae0981f37591ce20b Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sat Jul 27 13:50:51 2024 +0100 Ability to donate less than 250 commit f5099dc892f529af72d0736fd1ebd6a82af4a7ce Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Fri Jul 26 13:53:34 2024 +0100 Update fn_resourcecheck.sqf commit 92a6777d9ae1353bda14cd10a331b1299c81d48b Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Fri Jul 26 13:51:18 2024 +0100 Extra checks for unlocked vehicles commit 52a999ecf4f4e03bf03fe2735a598f716b0bd25d Author: wersal454 <wroma@bk.ru> Date: Fri Jul 26 01:58:46 2024 +0300 finished SOG config Somevehicles missing, cause there is no way of making their variants(or I didn't found one) commit 42cba7cc592694e13abe04ba1f05d7d2c2dcb71b Author: wersal454 <wroma@bk.ru> Date: Thu Jul 25 01:44:31 2024 +0300 SOG noinsignia variants commit 67d68c13c8a88aa1787c7f8c95dfdee0ba5ae477 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Wed Jul 24 22:24:11 2024 +0100 DME, ODST, UNSC, Covenant alternative commit 57b49154b22109ebe4d48e881935022a297d3227 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Mon Jul 22 22:21:55 2024 +0100 Smasher fnc restructuring, zombie conquest mission commit c6508deac9b164b0ae873529bc5413f28c9c87c8 Author: wersal454 <wroma@bk.ru> Date: Mon Jul 22 04:37:44 2024 +0300 part 1 ? commit 1a0251b2ad145bf8f4c2c6f7b89814aed7b22212 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sun Jul 21 22:06:21 2024 +0100 Extra safety checks commit 456fb3196d360ca572ee16526f99b08704633fcf Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sun Jul 21 21:53:50 2024 +0100 Attack heli for smasher + zombie infestation fix commit fdfe7b2167a1db7afb36cd88ce004a76b7d14a93 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sun Jul 21 19:28:40 2024 +0100 Smasher mission updates, infestation mission commit 41ebb0b87a0e65a56480314d4e23d0b3697d14d5 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sun Jul 21 15:29:53 2024 +0100 kill mutant mission commit 411f726442676e4089f92ff61dcfa2571e004b54 Author: wersal454 <wroma@bk.ru> Date: Sat Jul 20 18:59:21 2024 +0300 Update GM.hpp commit 22c46de4dca52cd0f30bfe51165ffc49e4b2f720 Author: wersal454 <wroma@bk.ru> Date: Sat Jul 20 18:14:12 2024 +0300 Create GM commit eef6f27d984bf9b2b4f14df535a039b4fb4e0556 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sat Jul 20 16:11:57 2024 +0100 Updated militia flags commit 2fc5e7957e9047b140f8a16e5fe0dd0b134dfb37 Author: wersal454 <wroma@bk.ru> Date: Sat Jul 20 18:08:45 2024 +0300 Update GM.hpp commit cb7c32d836997a81ac33b91a4a5d4ab1ae49f0e1 Author: wersal454 <wroma@bk.ru> Date: Sat Jul 20 18:07:45 2024 +0300 Update Vanilla.hpp commit e00db9b94b65c6c89611bbacf57498099cc2d015 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Fri Jul 19 17:05:29 2024 +0100 Update EM guns commit be2c6db161f4c25f2f19564cf68852f8ef3e3dc8 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Fri Jul 19 13:45:12 2024 +0100 Fix type array expected string in resourcecheck commit 8e55abc1318abf966c52c8f0b1c6098345e5ec4d Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Thu Jul 18 23:05:37 2024 +0100 East and West militia factions commit 1330a10969fe1a6b12dfc57eedb0a5250c73bc52 Merge: 3ed8b0d37 361e021c8 Author: wersal454 <wroma@bk.ru> Date: Thu Jul 18 23:04:32 2024 +0300 Merge branch 'unstable' into backlog-features commit 3ed8b0d37ed641b247a3ae228ab9ab470abc833f Author: wersal454 <wroma@bk.ru> Date: Thu Jul 18 22:46:09 2024 +0300 Fix the broken marker(marker no more)) + fix for empty category commit 361e021c8a08bc2dc034d5a8bd73fea64e108da5 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Wed Jul 17 16:57:57 2024 +0100 Fix duplicate vehicle from conflict resolution commit e487f949fb258df817c193fcf3340341769dbb35 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Wed Jul 17 16:14:00 2024 +0100 Update Stringtable.xml commit 4a0991335e6e3cfbc6cba6cdf9f1030d81afbdbc Merge: 56554b218 c79be717d Author: Silence <78276788+SilenceIsFatto@users.noreply.github.com> Date: Wed Jul 17 15:55:59 2024 +0100 Merge pull request #249 from SilenceIsFatto/cityinfo-markersImmune-fix Unable to view zone info fix commit 56554b2187577c11b5336ac6878fb414f62c3ade Merge: b6ad61205 db88bc87b Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Wed Jul 17 15:54:50 2024 +0100 Merge pull request #246 from blackwaterbread/unstable Display self-revive cooldown in unconscious state commit b6ad61205a41263313d3cd5fbfb5cdaaa2b71644 Merge: c48f24bc1 9d9872bc1 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Wed Jul 17 15:54:48 2024 +0100 Merge pull request #232 from SilenceIsFatto/trader-unlocked-notifications Arms Dealer Unlock Notifications commit 9d9872bc1182b6587c3aefd983f7669d0ddeb973 Merge: b342b15c4 c48f24bc1 Author: Silence <78276788+SilenceIsFatto@users.noreply.github.com> Date: Wed Jul 17 15:53:00 2024 +0100 Merge branch 'unstable' into trader-unlocked-notifications commit c48f24bc19b8b10fd269ae03401c9d9cd9d46b74 Merge: 619e303a4 23195df74 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Wed Jul 17 15:50:29 2024 +0100 Merge pull request #201 from wersal454/Spectrum-device-functionality Spectrum device functionality commit 619e303a4b91948fce3cd4210a96f48c47747eb1 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sun Jul 14 15:39:32 2024 +0100 update version commit c79be717d4dbf32de4921c277d63178d2be46f38 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sun Jul 14 15:24:35 2024 +0100 make markersImmune a publicVariable commit 6a86f9746af84a4f12c549dea8ca6afa1ab8dd8f Merge: 5ccb5bfd5 211ed41aa Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Sun Jul 14 15:12:14 2024 +0100 Merge pull request #245 from wersal454/patch-21 Fix black market dropdown UI commit 5ccb5bfd5c0b8bc18ee56a9137f95b61652af3be Merge: 2f22c3268 9d0f543fb Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Sun Jul 14 15:12:11 2024 +0100 Merge pull request #243 from SilenceIsFatto/staszow-fix One Day Staszow Will Be Finished commit 2f22c32687364ae16a4e220751db3649ee718fbc Merge: e001960fb 6fc22a4cb Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Sun Jul 14 15:12:08 2024 +0100 Merge pull request #240 from wersal454/patch-20 Western Sahara update 1.1.3 commit e001960fb106c7acb1bf37b89381d7608f3a57c3 Merge: 1d29bae39 8a056e826 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Sun Jul 14 15:12:05 2024 +0100 Merge pull request #239 from wersal454/patch-19 no vaping in WW2 commit 1d29bae39eb04819821687f14560e29e338c4444 Merge: 30413dbac 94e51de6a Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Sun Jul 14 15:12:03 2024 +0100 Merge pull request #238 from staysane0/patch-1 Update Stringtable.xml commit 30413dbace3b6cd45af7f794daa452844cdf0485 Merge: 19aceaf39 2348baff6 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Sun Jul 14 15:12:01 2024 +0100 Merge pull request #235 from SilenceIsFatto/template-fixes Template cleanup, LL reb mortar fix commit 19aceaf398ff81ece5ed7d1df1b6075ca48cdd2a Merge: a05635288 a84419cb2 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Sun Jul 14 15:11:58 2024 +0100 Merge pull request #234 from SilenceIsFatto/revealed-zones-saving Save/load revealed zones commit a056352888f29c3218da91b0757387fd7baf53fc Merge: 6170d75a4 abd271fd7 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Sun Jul 14 15:11:56 2024 +0100 Merge pull request #233 from SilenceIsFatto/save-rename Rename saves from AntistasiPlus to AntistasiUltimate commit 6170d75a4f9d03c4d5322148dffa2dd1877a132f Merge: b631a4887 4b58823cc Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Sun Jul 14 15:11:53 2024 +0100 Merge pull request #231 from SilenceIsFatto/injured-notification Send chat message when downed commit b631a488760943bf0e668fbac49886a68a5db72d Merge: 31daa7abf ad66b229c Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Sun Jul 14 15:11:51 2024 +0100 Merge pull request #229 from SilenceIsFatto/clone-wars-update Clone Wars Update commit 31daa7abfbf163b6d315066792134fb20bda60a0 Merge: 0f51b9ee0 7633a77e3 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Sun Jul 14 15:11:49 2024 +0100 Merge pull request #220 from lanoitidart/unstable Gulfcoast Islands Port commit 23195df74f1d1382d504a6ad2bd5f39c2dc8e3b5 Merge: 7732fab95 0f51b9ee0 Author: wersal454 <wroma@bk.ru> Date: Sun Jul 14 16:23:07 2024 +0300 Merge branch 'unstable' into Spectrum-device-functionality commit 7732fab95d658e65b38212763c915ba0070af712 Author: wersal454 <wroma@bk.ru> Date: Sun Jul 14 16:22:59 2024 +0300 Update A3A/addons/core/Params.hpp Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com> commit db88bc87bea2ee9614b56aef5ceb47e3aa1f916b Author: dayrain <blackwaterbread@gmail.com> Date: Sun Jul 14 09:59:15 2024 +0900 Prevent customHint sound spamming commit 3979e69a028bb7814ae7ed04d0aefb98f52ae8b2 Author: dayrain <blackwaterbread@gmail.com> Date: Sat Jul 13 23:58:43 2024 +0900 Removed unnecessary code commit ee729555976feb95cc7f680536adb0c5c820357e Author: dayrain <blackwaterbread@gmail.com> Date: Sat Jul 13 23:56:04 2024 +0900 Using A3A_fnc_customHint instead hintSilent commit 7a9214491febc1c9a2fb48bdab509f9d71445092 Author: dayrain <blackwaterbread@gmail.com> Date: Sat Jul 13 23:34:07 2024 +0900 Fix self-revive cooldown doesn't disappear when respawn commit 211ed41aab78d50d1ae22df162bfe2fcbbf0d093 Author: wersal454 <wroma@bk.ru> Date: Sat Jul 13 17:05:38 2024 +0300 FIX for empty space commit f04e13d18a2826513fe6ee78c61b798ce038645c Author: dayrain <blackwaterbread@gmail.com> Date: Sat Jul 13 08:55:02 2024 +0900 Use the _unit variable for consistency Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com> commit 0f51b9ee0b29d12eea9397ee174ffbf1221a7bc3 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Fri Jul 12 23:35:50 2024 +0100 Add black market weapons isNil checks commit 4f0d222988394c7630892c3cd7850e3b20926116 Author: dayrain <blackwaterbread@gmail.com> Date: Fri Jul 12 02:05:36 2024 +0900 Display self-revive cooldown in unconscious state commit 3aa2939502367e3f1ecf312da691502776154d57 Author: wersal454 <wroma@bk.ru> Date: Fri Jul 12 00:50:40 2024 +0300 FIXED commit 9d0f543fb70a176bad3b9796d654d4666a53438a Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Thu Jul 11 20:46:58 2024 +0100 Fix Floating Buildings commit 31b454021c033473adaa6566a4ee3c4dbeb62dce Author: wersal454 <wroma@bk.ru> Date: Thu Jul 11 00:34:26 2024 +0300 bebe commit ce7d94d8786df14a517bd91f11ff6d3a9ae4f023 Author: wersal454 <wroma@bk.ru> Date: Thu Jul 11 00:28:08 2024 +0300 Update fn_blackMarketDialog.sqf commit 411a0d02685bd3e3cf5b1e024ee299de04c8e282 Author: wersal454 <wroma@bk.ru> Date: Thu Jul 11 00:27:07 2024 +0300 Update blackMarketDialog.hpp commit b9917275c74c0e8af8359d2007f88317e007b0a0 Author: wersal454 <wroma@bk.ru> Date: Tue Jul 9 23:03:30 2024 +0300 blah commit b4e77c2a06014fbfd88aa0d9fa0e79fb75d8c952 Author: wersal454 <wroma@bk.ru> Date: Tue Jul 9 23:00:18 2024 +0300 Delete A3A/addons/launchMissile.sqf commit b342b15c47fafe46283e862cdbde4a0f46468ee0 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Tue Jul 9 21:00:02 2024 +0100 Update RU translations commit aa18795f079d8135d6d472e14e5070c9cf984a15 Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Tue Jul 9 16:20:38 2024 +0100 Staszow Update Again commit 63099abb32e20e6b15c3e3d7d218f44c72af6afb Merge: 0d459f55a b8f9d3940 Author: wersal454 <wroma@bk.ru> Date: Tue Jul 9 00:18:28 2024 +0300 Merge branch 'Spectrum-device-functionality' of https://github.com/wersal454/A3-Antistasi into Spectrum-device-functionality commit 0d459f55a9e8082cd3045dd888d3c9be8a2a862f Author: wersal454 <wroma@bk.ru> Date: Tue Jul 9 00:18:26 2024 +0300 Something to hack commit b8f9d39404a4b29bcff1f4e194bee325cd97590e Merge: b21ad7fa9 143fb4732 Author: wersal454 <wroma@bk.ru> Date: Mon Jul 8 23:18:18 2024 +0300 Merge branch 'unstable' into Spectrum-device-functionality commit b21ad7fa95a2440492935a3989a2092cc00a5a32 Author: wersal454 <wroma@bk.ru> Date: Mon Jul 8 23:17:54 2024 +0300 Enable hacking parameter commit 7633a77e32decbf8165c66305e5d82f4a5f66432 Author: traditional <katzepvp@gmail.com> Date: Mon Jul 8 22:17:03 2024 +0200 Update mission.sqm Replace Corrections Facility resource node for a outpost node, and added a Seaport south of it. Hid protruding alignment lights at Rassa Airport. Hid trees obstructing Onion Airbase's eastern landing strip making landing a little easier. commit 6fc22a4cb14d4cef2e46ce050204dd1b477c9840 Author: wersal454 <wroma@bk.ru> Date: Mon Jul 8 23:12:31 2024 +0300 Update Vanilla_Reb_FIA.sqf commit 26528c43153cc069429c3dc1c6492a232c8a21db Merge: 84e2e52eb 33a53d369 Author: wersal454 <wroma@bk.ru> Date: Mon Jul 8 23:12:09 2024 +0300 Merge branch 'patch-20' of https://github.com/wersal454/A3-Antistasi into patch-20 commit 84e2e52ebb25d91391f116ea12fcb9f62b1d2b6f Author: wersal454 <wroma@bk.ru> Date: Mon Jul 8 22:59:48 2024 +0300 western sahara update 1.1.3 commit 33a53d369d7ef9fe43ec61ae61048da9e16e502c Author: wersal454 <wroma@bk.ru> Date: Mon Jul 8 22:40:19 2024 +0300 western sahara update 1.1.3 commit 3768195659df0ff706dc73709497c7d9865ee93a Author: wersal454 <wroma@bk.ru> Date: Mon Jul 8 22:37:21 2024 +0300 western sahara update 1.1.3 commit 5f80fe0c1a163e57c6df43fff993e177890908fc Author: wersal454 <wroma@bk.ru> Date: Mon Jul 8 22:32:28 2024 +0300 Update WS_Riv_ION.sqf commit 72d9ead42ed29700bff83431bc3cb417f372ce52 Author: wersal454 <wroma@bk.ru> Date: Mon Jul 8 22:23:59 2024 +0300 western sahara update 1.1.3 commit f8e8efb6053ad4456e65bd18fcb1995ed9f2d190 Author: wersal454 <wroma@bk.ru> Date: Mon Jul 8 22:22:21 2024 +0300 western sahara update 1.1.3 commit 8a056e826fc3fe7c590dd1dc69c80b9a6042c6ea Author: wersal454 <wroma@bk.ru> Date: Mon Jul 8 21:39:17 2024 +0300 no vaping in WW2 commit 4a48bbc3d1a6ae2f86f1a70e16870a15e4788d72 Author: wersal454 <wroma@bk.ru> Date: Mon Jul 8 21:31:52 2024 +0300 OPTRE and SW gunships + attack UAVs added to spawn pool commit 94e51de6ae439473679202ff15ea2421f57a1a95 Author: staysane0 <jiviandrew@gmail.com> Date: Mon Jul 8 19:45:33 2024 +0300 Update Stringtable.xml fix ru localization commit 2782fc3e0ad749c1cf037ba6dfedba9f15f26b08 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Mon Jul 8 16:31:17 2024 +0100 Update trader unlock conditions commit f5dd217c2234aa38aae0488c17a79ad18c64c210 Author: wersal454 <wroma@bk.ru> Date: Mon Jul 8 14:50:04 2024 +0300 Adjustments + fixes commit fe104a4a9e6da1685062c958db31c5434be4e985 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sun Jul 7 23:47:07 2024 +0100 notify when vehicles are unlocked commit a1dd0fa7aa3d98a2985ce1ad8110e0ad0b416fdf Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sun Jul 7 23:41:09 2024 +0100 save/load unlocked vehicle types commit 86043ec7cd6cc4954d6145a1772d53f8c6e8a8ec Merge: b88151d79 143fb4732 Author: wersal454 <wroma@bk.ru> Date: Sun Jul 7 22:25:06 2024 +0300 Merge branch 'unstable' into backlog-features commit 9ce3fa8c07108d2c691ad9633ba3c898cce3f15c Merge: 23116a3cf a84419cb2 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Sun Jul 7 19:19:11 2024 +0100 Merge revealed-zones-saving into trader-unlocked-notifications. [UPDATE] commit 2348baff62dcbc5dbdc45a27449f1c480f883299 Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Sun Jul 7 14:46:09 2024 +0100 WW2 Objective Trucks commit 13af3a51bcb32281fe6dc91baa8a7f6db5088591 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sun Jul 7 14:33:14 2024 +0100 Remove template blackMarketStock commit b604da0da6cbbbd2cf641c917baed5c7fd551e63 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sun Jul 7 14:09:32 2024 +0100 vanilla LL mortar fix commit 2925548ac077fcc1750adbc388ec2e93f815a959 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sun Jul 7 14:04:46 2024 +0100 Invader return framework commit a84419cb2f0f7e78d594189069a4d422dea77356 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sat Jul 6 19:21:33 2024 +0100 Remove log message commit 50225955094e565446096157d0733dcc3dd57e01 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sat Jul 6 19:17:31 2024 +0100 Save/load revealed zones commit 82ee42a58a4ae5d0533da0cbc841b67fbe0e4eb7 Author: stutpip123 <77023662+stutpip123@users.noreply.github.com> Date: Sat Jul 6 16:39:15 2024 +0100 Replace community HQ with Plus type HQ commit 23116a3cf5ed70b26e9e848ca56f54e5672a3b2a Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sat Jul 6 14:36:11 2024 +0100 Log when vehicle type is unlocked in dealer commit 9acd177f4028969427e775f38a6970ef78e983ae Author: traditional <katzepvp@gmail.com> Date: Fri Jul 5 20:28:25 2024 +0200 Playtest Patch 1 Patch 1 for playtest issue comment commit 4b58823cc62d90f9156791572c969e98691e5be4 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Fri Jul 5 16:07:15 2024 +0100 Send chat message when downed commit 232e2ae709a749f4f3ff264f05369e4f736634e9 Author: traditional <katzepvp@gmail.com> Date: Thu Jul 4 15:06:06 2024 +0200 Update mission.sqm Updated building locations in Rassa Airport Military Base to account to default placed helipads Removed Hide Terrain Object from Rassa Speedway Outpost as well as helipad to make way for default Deleted Grenadier and Autorifleman lobby roles and in turn slimmed down player slots from 41 to 27. commit abd271fd77a4082e721993d9558831eb5c18baf6 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Wed Jul 3 17:42:33 2024 +0100 Rename saves from AntistasiPlus to AntistasiUltimate commit 143fb47322d46db5d42ea2a43ba4881cf7aba95b Merge: a8d43e41e 3e1b2fca5 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Wed Jul 3 17:13:19 2024 +0100 Merge pull request #227 from SilenceIsFatto/vehicle-price-bugfix Handle nil cost in fn_vehiclePrice.sqf/fn_blackMarketVehiclePrice.sqf commit a8d43e41e81012fa08853d239d2416d25b50c684 Merge: 01eb90d54 73efab654 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Wed Jul 3 17:13:17 2024 +0100 Merge pull request #226 from SilenceIsFatto/forbiddenItems-sell-fix Add forbiddenItems sale checks commit 01eb90d54e5483f9e666bb6101530bb27f2bbcc6 Merge: 73079c052 8743c79a1 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Wed Jul 3 17:13:14 2024 +0100 Merge pull request #225 from SilenceIsFatto/optre-updates [BOT] Automated PR (unstable << optre-updates) commit 73079c0522f9bda8ea9f261bd4522d88692663a4 Merge: 283bd1eb6 7d72beb8f Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Wed Jul 3 17:13:12 2024 +0100 Merge pull request #219 from SilenceIsFatto/blackmarket-changes Black Market Store UI Rework commit 73efab654ade69e3f9642a76ea55f2a57c80c296 Author: Silence <78276788+SilenceIsFatto@users.noreply.github.com> Date: Tue Jul 2 19:31:25 2024 +0100 Remove testing forbiddenItem commit a546ad6f2cbb5ca6d22e1d622ad79ae45304e33b Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Mon Jul 1 18:11:36 2024 +0100 Allow forbidden items to be sold correctly commit 3e1b2fca50b6f5d3e3ff5301c84c84de2cb5143a Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Mon Jul 1 15:50:19 2024 +0100 Handle nil cost commit dd4011a685a77bc804f88aef7efa767ba2b52e6b Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sat Jun 29 13:48:24 2024 +0100 Update cfgForbiddenItems.hpp commit 8cdde53bf789e6232283f4f8097b6ec729aca0b9 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Fri Jun 28 17:16:20 2024 +0100 Add forbiddenItems checks commit 8743c79a1d8ac4f8d935812793ea2f9a2ee1ad32 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Fri Jun 28 15:03:29 2024 +0100 Fix spartan radio backpack commit 2a84221775867f85169d4042c05e9f3757294ee3 Merge: 09ffddab8 283bd1eb6 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Fri Jun 28 14:58:35 2024 +0100 Merge unstable into optre-updates. [UPDATE] commit 7d72beb8f68388d00f1d52dc37bc85a9b781d39b Merge: a65d76fce 283bd1eb6 Author: Antistasi Ultimate Community Bot <admin@antistasiultimate.com> Date: Thu Jun 27 23:04:43 2024 +0100 Merge branch 'unstable' into blackmarket-changes commit 9c2b99f9e2c82136e61faeeb2e6ad23d4947d698 Author: traditional <katzepvp@gmail.com> Date: Thu Jun 27 20:30:46 2024 +0200 Map Update ADDED: - A military base (milbase_5) - One additional outpost (outpost_22) (mightve added another dont remember) - Additional 4-6 resource nodes - Added buildings to: outpost_19, milbase_2, milbase_3 MODIFIED: - Moved locations of two factories (factory_4, factory_5) - Fixed a couple of marker names - Cleaned up sea markers (reduced/moved) commit 17fa59eec155f1f45c005452a87558bb273dba35 Author: traditional <katzepvp@gmail.com> Date: Wed Jun 26 08:47:15 2024 +0200 Update mission.sqm Added more seaAttackSpawn, seaPatrol, seaSpawn & control markers across the map. Added a SAM markers to Gasparilla Airbase (airport_1) and Rotonda East (airport_6) Disabled simulation on multiple entities/buildings. commit 56ad2ea860e2be53deb519285b8a5d72cb8cbeee Merge: 17440154b e52a8bf0b Author: traditional <katzepvp@gmail.com> Date: Tue Jun 25 17:53:25 2024 +0200 Merge branch 'unstable' of https://github.com/lanoitidart/A3-Antistasi-Ultimate into unstable commit e52a8bf0b23dc2b7243fa46e8a8d9e4333945036 Merge: c2f08a6e2 283bd1eb6 Author: traditional <38315957+lanoitidart@users.noreply.github.com> Date: Tue Jun 25 17:50:18 2024 +0200 Merge branch 'SilenceIsFatto:unstable' into unstable commit 17440154babf56d66e341ab93a0ae5402b87ba35 Author: traditional <katzepvp@gmail.com> Date: Tue Jun 25 17:49:55 2024 +0200 Gulfcoast Islands Map Port to AU of Gulfcoast Islands map commit a65d76fcef77436c03a08bbedbdadc349a59c5c4 Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Tue Jun 25 13:53:32 2024 +0100 Dropdown menu for selection commit c96e0e3626c479f836ba14ef443bb17dda5a9ead Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sun Jun 23 19:39:41 2024 +0100 Continuing #204 commit c2f08a6e276db883b6ea2869d4f9be0f349593c7 Merge: 9fa5a8ac6 a3f19ec5b Author: Silence <78276788+SilenceIsFatto@users.noreply.github.com> Date: Wed May 29 20:07:39 2024 +0100 Merge pull request #211 from SilenceIsFatto/unstable V10.8.5 commit e9e34c88d942c5c5aaef3b0850977076743cab09 Merge: 994ea9dc9 54c713e77 Author: wersal454 <wroma@bk.ru> Date: Tue May 14 17:34:51 2024 +0300 Merge branch 'unstable' into Spectrum-device-functionality commit b88151d795cbb6cdb02e21b8c83566d5f0f177ab Author: wersal454 <wroma@bk.ru> Date: Mon May 13 21:56:16 2024 +0300 fixes for fixes + working searchlight commit e714b28dfeea7056fa58c2e0b5d4ee82de049ac7 Merge: 21a0c7ff6 ff73f01ae Author: wersal454 <wroma@bk.ru> Date: Mon May 13 05:23:45 2024 +0300 Merge branch 'backlog-features' of https://github.com/wersal454/A3-Antistasi into backlog-features commit ff73f01ae7810382f4a6c91e39f823e33391ce24 Merge: 03a79eea4 2b969ad78 Author: wersal454 <wroma@bk.ru> Date: Mon May 13 05:23:27 2024 +0300 Merge branch 'unstable' into backlog-features commit 21a0c7ff60308fcfd1db7c1646acbd8e52e6be6c Author: wersal454 <wroma@bk.ru> Date: Mon May 13 05:23:14 2024 +0300 fixesfixesfixes commit 994ea9dc9c5492f5ec06b542b4dca3cb92e12fbc Merge: a95b2aea1 35fcad565 Author: wersal454 <wroma@bk.ru> Date: Sat May 11 01:16:33 2024 +0300 Merge branch 'unstable' into Spectrum-device-functionality commit 03a79eea4d9c952ab1c58b31780c34f037d73f97 Merge: 818a9126a 9d756fee5 Author: wersal454 <wroma@bk.ru> Date: Sat May 11 00:28:13 2024 +0300 Merge branch 'backlog-features' of https://github.com/wersal454/A3-Antistasi into backlog-features commit 818a9126a154a710d16c1e52199a61284afc57df Author: wersal454 <wroma@bk.ru> Date: Sat May 11 00:27:52 2024 +0300 forgot about this ones commit 9d756fee5656137843d67a905fbf3526dea27fe0 Merge: d6020e8b4 35fcad565 Author: wersal454 <wroma@bk.ru> Date: Sat May 11 00:22:34 2024 +0300 Merge branch 'unstable' into backlog-features commit d6020e8b440e20f09718ff7ad67641bcc182923d Author: wersal454 <wroma@bk.ru> Date: Sat May 11 00:03:47 2024 +0300 Working gunship support (and uav) commit a95b2aea1615e427d6163bcd95552782f68d7210 Merge: 98a60aaac ede7e147f Author: wersal454 <wroma@bk.ru> Date: Thu May 9 21:59:30 2024 +0300 Merge branch 'unstable' into Spectrum-device-functionality commit 98a60aaac9982b8dcf5af2751f3188b4840d1e0f Author: wersal454 <wroma@bk.ru> Date: Thu May 9 21:55:53 2024 +0300 working version commit 4634ece349a62621e616b4d31391d3c611ceb121 Author: wersal454 <wroma@bk.ru> Date: Mon May 6 15:20:47 2024 +0300 possible soluition commit eb714b605a3cf9d808b0a296e6fdc9dec6e777f6 Author: wersal454 <wroma@bk.ru> Date: Mon May 6 01:10:31 2024 +0300 Possible solution function commit 5d1d70838337204fe4900925fb4f8084aadcdc6b Author: wersal454 <wroma@bk.ru> Date: Sun May 5 23:32:43 2024 +0300 semi-working version commit 1b092dee6443ad6cc7fa04657fff3a859ea6f431 Author: wersal454 <wroma@bk.ru> Date: Fri May 3 16:47:19 2024 +0300 Update sa_ewar.sqf commit c0807de90760f7aba6df11ae9ba5c529d00dc73b Author: wersal454 <wroma@bk.ru> Date: Wed May 1 00:32:20 2024 +0300 somewhat working version commit 50afeceafdfd0d808a2b04ccbd6f9ad5356697e9 Author: wersal454 <wroma@bk.ru> Date: Tue Apr 30 06:14:51 2024 +0300 Update spectrum_device.sqf commit c9d1c0422cfb21a3edef5de24e78fa54102d5694 Merge: 9d8218e14 97d41f267 Author: wersal454 <wroma@bk.ru> Date: Tue Apr 30 05:30:28 2024 +0300 Merge pull request #19 from SilenceIsFatto/unstable Unstable commit 9d8218e14e430bff7abf17609db8b3d0a850599d Author: wersal454 <wroma@bk.ru> Date: Tue Apr 30 05:29:08 2024 +0300 Inital release commit 9fc705cf25532b535714b9c75ac1cf8640648779 Author: wersal454 <wroma@bk.ru> Date: Fri Apr 26 17:50:34 2024 +0300 fg commit c3b37160596253880938485bfca9768e9965862c Merge: 03c974cae f3e0048da Author: wersal454 <wroma@bk.ru> Date: Fri Apr 26 12:40:00 2024 +0300 Merge branch 'backlog-features' into pr/16 commit f3e0048da6080d62c07b3a62124bca4685fbbb15 Author: wersal454 <wroma@bk.ru> Date: Sat Feb 3 17:23:05 2024 +0300 Add files via upload commit 61fe57fa2e657f020ecf7061e382594ab3566ec1 Author: wersal454 <wroma@bk.ru> Date: Sat Feb 3 17:22:32 2024 +0300 Add files via upload commit da67da717f2ee1dc3ac3df793a5f74b4eefa05ca Author: wersal454 <wroma@bk.ru> Date: Sat Feb 3 17:20:42 2024 +0300 Add files via upload commit 7093cd425a0f734b3e20604f4a9732a906a2b443 Author: wersal454 <wroma@bk.ru> Date: Sat Feb 3 17:20:00 2024 +0300 Add files via upload commit 2456b90dccab3c7726a5117b98c4a799a4583126 Author: wersal454 <wroma@bk.ru> Date: Sat Feb 3 17:18:51 2024 +0300 Add files via upload commit 9bbbd6f8c6072320e025fea7c8ed32ee58a5ed39 Author: wersal454 <wroma@bk.ru> Date: Sat Feb 3 17:17:53 2024 +0300 Add files via upload commit e3598ee13374ff3dce3bd85c13d15e33d5998cf9 Author: wersal454 <wroma@bk.ru> Date: Sat Feb 3 17:15:52 2024 +0300 Add files via upload commit 4710e0aadab8ae86c62681b15d403656cabee014 Author: wersal454 <wroma@bk.ru> Date: Sat Feb 3 00:04:59 2024 +0300 Update fn_showInterceptedSupportCall.sqf commit a51ca058441b62188fc08b184be9088ec613b4d7 Author: wersal454 <wroma@bk.ru> Date: Sat Feb 3 00:04:16 2024 +0300 Update fn_showInterceptedSupportCall.sqf commit 0089693d067353b2d526a96011754494134b2604 Author: wersal454 <wroma@bk.ru> Date: Sat Feb 3 00:03:50 2024 +0300 Update fn_showInterceptedSetupCall.sqf commit 3c0eb076183f1ac955740e604cf51b965a90d49e Author: wersal454 <wroma@bk.ru> Date: Fri Feb 2 23:57:10 2024 +0300 Update fn_SUP_UAVRoutine.sqf commit d2698eb8fc038d554511930d3ab0344a1cb73026 Author: wersal454 <wroma@bk.ru> Date: Fri Feb 2 23:56:05 2024 +0300 Update fn_SUP_UAV.sqf commit 6220c4240f6d3979fd081993dd32db2bebaad48b Author: wersal454 <wroma@bk.ru> Date: Fri Feb 2 23:54:38 2024 +0300 Update fn_SUP_gunshipSpawn.sqf commit d058acac7cd99a39aa7f8f50aa0d240436f1917c Author: wersal454 <wroma@bk.ru> Date: Fri Feb 2 23:53:54 2024 +0300 Update fn_SUP_gunshipRoutineNATO.sqf commit d5c1762cf473c4ab6f064c786b9d84a60b54a4c5 Author: wersal454 <wroma@bk.ru> Date: Fri Feb 2 23:53:18 2024 +0300 Update fn_SUP_gunshipRoutineCSAT.sqf commit df50a5901838fda54142add2106eb4aeb265bfac Author: wersal454 <wroma@bk.ru> Date: Fri Feb 2 23:52:25 2024 +0300 Update fn_SUP_gunshipAvailable.sqf commit 852115a9f6eceb61fb5d6b9749636e5be06bd52d Author: wersal454 <wroma@bk.ru> Date: Fri Feb 2 23:51:50 2024 +0300 Update fn_SUP_gunship.sqf commit 45681e6272d3cd6a439068da715ab5d3951e7fc4 Author: wersal454 <wroma@bk.ru> Date: Fri Feb 2 23:47:59 2024 +0300 support backlog
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
bug
Something isn't working
ready-for-merge
Use for the AUC bot to allow it to merge everything at once when needed.
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.
What type of PR is this?
What have you changed and why?
Information:
Please specify which Issue this PR Resolves (If Applicable).
"This PR closes #XXXX!"
Please verify the following.
Is further testing or are further changes required?
How can the changes be tested?
Steps:
Notes: