This repository has been archived by the owner on Apr 14, 2020. It is now read-only.

Merger from FastTrack fork - Phase I (Core)#1006

Merged

zozilin merged 451 commits intoCombatExtendedRWMod:Developmentfrom AthenaSulisMinerva:upstream_merger_core

Feb 20, 2020

+20,604-16,206

This pull request is big! We're only showing the most recent 250 commits

Commits on Nov 8, 2019

Fix error in Supported Third-Party Mods list (2)
sumghai
authored

Commits on Nov 9, 2019

Merge pull request #126 from NoImageAvailable/master
sumghai
authored
Rebalance Advanced ammo/projectile stats
Robin Chang
committed
Rebalance High Caliber ammo/projectile stats
Robin Chang
committed
Rebalance Rifle ammo/projectile stats
Robin Chang
committed
Rebalance Shell ammo/projectile stats
Robin Chang
committed
Rebalance Shotgun ammo/projectile stats
Robin Chang
committed
Update to 1.0.1.6-FT-007
Robin Chang
committed
Rebalance Rifle ammo/projectile stats (final)
Robin Chang
committed

Commits on Nov 10, 2019

Commits on Nov 12, 2019

Commits on Nov 14, 2019

Merge pull request #141 from NoImageAvailable/master
AthenaSulisMinerva
authored

Commits on Nov 15, 2019

Rebalance Glitter Tech Orion Corp armor
sumghai
authored
Rebalance Glitter Tech Nanosuit armor
sumghai
authored
Add 50mm GS-50 Grenade ammo defs
Robin Chang
committed
Add Soviet Armory infantry weapons patch
Robin Chang
committed

Commits on Nov 16, 2019

Add CE recipe for Soviet Armory RPO-Z launcher
Robin Chang
committed
Add Soviet Armory turret weapons patch
Robin Chang
committed
Tweak Soviet Armory AGS-17 LoS setting
Robin Chang
committed
Fix incorrect Soviet Armory turret specialDisplayRadius
Robin Chang
committed
Rebalance DMGTP turret ranges and display radii
Robin Chang
committed
Rebalance More Vanilla Turrets ranges and display radii
Robin Chang
committed
Add missing minRange values for More Vanilla Turrets
Robin Chang
committed
Update Devastator mortar for More Vanilla Turrets
Robin Chang
committed
Add Alpha Animals patch
Robin Chang
committed
Merge branch 'master' of https://github.com/NoImageAvailable/CombatExtended
AthenaSulisMinerva
committed
Update Android Tiers patch with selected upstream changes
AthenaSulisMinerva
committed

Commits on Nov 18, 2019

Merge branch 'master' of https://github.com/NoImageAvailable/CombatExtended
AthenaSulisMinerva
committed
Clean up Android Tiers patch update
AthenaSulisMinerva
committed
Rebuild assembly for 1.8.2
AthenaSulisMinerva
committed
Update RN Clothing backpack and harness layers
Robin Chang
committed
Update RH Elite Crew harness layers
Robin Chang
committed
Update RH The Ghosts backpack layers
Robin Chang
committed
Update NewRatkinPlus backpack and sack layers
Robin Chang
committed
Merge pull request #159 from NoImageAvailable/master
sumghai
authored
Consolidate Xenohumans patch with upstream content
Robin Chang
committed

Commits on Nov 19, 2019

Update Weapons_Mechanoid.xml
NickZiggy
authored
Merge pull request #161 from NickZiggy/patch-1
sumghai
authored
Update RN Clothing parka/jacket StuffEffectMultiplierArmor
Robin Chang
committed
Remove StuffEffectMultiplierArmor patch from RN Clothing Ghillie
Robin Chang
committed
Update RH Factions parka/jacket StuffEffectMultiplierArmor
Robin Chang
committed
Update RH Furniture parka/jacket StuffEffectMultiplierArmor
Robin Chang
committed
Update RH Faction and Furniture armor/headgear stats
Robin Chang
committed
Add Crepuscular Beetle patch for Alpha Animals
Robin Chang
committed
Update RH Elite Crew grenade and C4 patches
Robin Chang
committed
Add RH Elite Crew skinner knife patch
Robin Chang
committed

Commits on Nov 20, 2019

Patch RN Clothing PASGT helmet costlist with Rimefeller option
Robin Chang
committed

Commits on Nov 21, 2019

Rebalance Rocket ammo/projectile stats (final)
Robin Chang
committed

Commits on Nov 22, 2019

Merge pull request #165 from NoImageAvailable/master
AthenaSulisMinerva
authored

Commits on Nov 23, 2019

Commits on Nov 24, 2019

Fix incorrect defName for 7.92x57mm Mauser rifle cartridge
Robin Chang
committed
Add 7.65x20mm Longue Pistol cartridge ammo definition
Robin Chang
committed
Add .455 Webley Pistol cartridge ammo definition
Robin Chang
committed

Commits on Nov 25, 2019

Commits on Nov 26, 2019

Add [Pratt] WW2 Weapons ranged, melee and turret weapons patches
Robin Chang
committed
Fix incorrect 9x19mm Parabellum Tranq pistol cartridge crafting product
Robin Chang
committed

Commits on Nov 27, 2019

Add [Pratt] WW2 Weapons grenade patches
Robin Chang
committed

Commits on Nov 28, 2019

Fix success=Always for [Pratt] WW2 Weapons grenade patches
Robin Chang
committed
Add [Ods] Kaiser Reich's Imperial Army Apparel patches
Robin Chang
committed

Commits on Nov 29, 2019

Add [Ods] Third Reich Uniforms patches
Robin Chang
committed

Commits on Nov 30, 2019

Update gas mask from FashionRIMsta
Robin Chang
committed
Update gas mask from Red Horse Umbra Company
Robin Chang
committed
Update gas masks from RN Clothing
Robin Chang
committed
Remove unneeded tags from RN Weapons Orbital EMP
Robin Chang
committed
Rebalance Advanced ammo/projectile stats (final)
Robin Chang
committed
Rebalance Alien Weapons ammo/projectile stats (final)
Robin Chang
committed

Commits on Dec 3, 2019

Update T-45b Power Armor armor/headgear stats
Robin Chang
committed
Rebalance and fix missing Ni'Hal weapon melee tool stats
Robin Chang
committed

Commits on Dec 4, 2019

Update melee stats and tools for RH The Ghosts German Shepard
Robin Chang
committed

Commits on Dec 7, 2019

Add 130mm Type 63 Rocket ammo definition
Robin Chang
committed
Add 120mm Cannon Shell ammo definition
Robin Chang
committed
Add 155mm Howitzer Shell ammo definition
Robin Chang
committed
Add 57x483mm Bofors Autocannon ammo definition
Robin Chang
committed
Add 28cm Spgr. Cannon Shell ammo definition
Robin Chang
committed
Add 20x128mm Oerlikon Autocannon ammo definition
Robin Chang
committed
Add 30x173mm NATO Autocannon ammo definition
Robin Chang
committed
Fix missing 130mm Type 63 Rocket ammo ThingCatDef label
Robin Chang
committed

Commits on Dec 8, 2019

Tweak Heavy Weapons research project description
Robin Chang
committed
Increase 20x102mm NATO Autocannon ammo stack size
Robin Chang
committed
Add missing effects and tweak mortar/shell/rocket gravity modifier
Robin Chang
committed
Add Turret Collection patches
Robin Chang
committed

Commits on Dec 10, 2019

Merge pull request #198 from NoImageAvailable/master
AthenaSulisMinerva
authored
Rebalance 28cm Spgr. Cannon Shell ammo stats
Robin Chang
committed
Add new graphics for 120mm Cannon Shell ammo
Robin Chang
committed
Add new graphics for 130mm Type 63 Rocket ammo
Robin Chang
committed
Reorganize rocket ammo and project graphics location
Robin Chang
committed

Commits on Dec 11, 2019

Create indirect-fire version of M74 rocket ammo for TC Incendiary Launcher
Robin Chang
committed
Update [Pratt] WW2 Weapons patches with new ranged weapons
Robin Chang
committed

Commits on Dec 12, 2019

Tweak [Pratt] WW2 Weapons Chauchat LMG FireModes
Robin Chang
committed
Update [Pratt] WW2 Weapons patches with new hand grenades
Robin Chang
committed
Rebalance Shotgun ammo/projectile stats (final)
Robin Chang
committed

Commits on Dec 13, 2019

Add unique artwork for 50mm GS-50 Grenade ammo
Robin Chang
committed
Add new compatible mods
sumghai
authored
Update to 1.0.1.8-FT-012
sumghai
authored

Commits on Dec 14, 2019

Move CP British Military Kit patch folder
Robin Chang
committed
Rename CP British Military Kit patch files
Robin Chang
committed

Commits on Dec 15, 2019

Merge pull request #202 from NoImageAvailable/master
AthenaSulisMinerva
authored
Fix Forsakens Nightling stats and melee tools
AthenaSulisMinerva
authored
Reduce damage for tranq ammo
Robin Chang
committed
Add [CP] Metal Gear Solid patches
Robin Chang
committed

Commits on Dec 17, 2019

Add [CP] Spec Ops: The Line patches
Robin Chang
committed
Update 5x35mmCharged.xml
NickZiggy
authored

Commits on Dec 18, 2019

Update 5x35mmCharged.xml
NickZiggy
authored
Merge pull request #210 from NickZiggy/patch-1
sumghai
authored

Commits on Dec 22, 2019

Fix stats for assorted ammo
Robin Chang
committed
Add 76.2x385mmR Cannon Shell ammo definition
Robin Chang
committed
Reduce drug item bulk
Robin Chang
committed
Add WWII Soviet Faction patches
Robin Chang
committed

Commits on Dec 23, 2019

Fix Elite Guardener apparel PatchOp in NewRatkinPlus patches
AthenaSulisMinerva
committed
Reduce MVT Devastator mortar cooldown time
Robin Chang
committed
Simplify stack size graphics for 120mm Cannon Shell ammo
Robin Chang
committed

Commits on Dec 24, 2019

Update NewRatkinPlus patches with new armor stats
AthenaSulisMinerva
committed

Commits on Dec 26, 2019

Commits on Dec 29, 2019

Rebalance RN Weapons melee tools and ranged stats
Robin Chang
committed

Commits on Dec 31, 2019

Commits on Jan 1, 2020

Commits on Jan 2, 2020

Rebalance RH Elite Crew guns and melee tools stats
Robin Chang
committed
Rebalance and consolidate RH Elite Crew apparel patches
Robin Chang
committed
Add RGD-5 grenade, bomber pawn for RH Elite Crew patches
Robin Chang
committed

Commits on Jan 4, 2020

Rebalance RN Clothing patches and fix cross-mod compatibility
Robin Chang
committed
Update RH Furniture patch with new FBI content
Robin Chang
committed
Update RH Last Man Mercs to Last Man Contingent
Robin Chang
committed

Commits on Jan 5, 2020

Fix incorrect ammo for CP/RH/RN Uzis
Robin Chang
committed
Update RH Last Man Contingent patches with ammo for scenario
Robin Chang
committed

Commits on Jan 6, 2020

Commits on Jan 7, 2020

Commits on Jan 8, 2020

Commits on Jan 11, 2020

Add optional ammoConsumedPerShotCount parameter to Verb_ShootCE
Robin Chang
committed

Commits on Jan 12, 2020

Merge pull request #241 from NoImageAvailable/master
AthenaSulisMinerva
authored

Commits on Jan 13, 2020

Add Doom Kit - Classic unique ammo
Robin Chang
committed
Add DOOM Kit - Classic patches
Robin Chang
committed
Merge pull request #247 from NoImageAvailable/master
AthenaSulisMinerva
authored

Commits on Jan 16, 2020

Merge pull request #252 from NoImageAvailable/master
AthenaSulisMinerva
authored
Tweak Doom Classic UAC Energy Cell thingCategory
Robin Chang
committed
Buff Praetor suit carrying capacity for DOOM Kit - Classic patches
Robin Chang
committed

Commits on Jan 24, 2020

Rebalance generic Plasma ammo mass and bulk
Robin Chang
committed
Rebalance Doom Kit - Classic unique ammo stats
Robin Chang
committed
Remove crafting cost changes from DOOM Kit - Classic patches
Robin Chang
committed
Add Doom 1.0 unique ammo
Robin Chang
committed
Add DOOM 1.0 patches
Robin Chang
committed

Commits on Jan 26, 2020

Commits on Jan 27, 2020

Create issue templates
AthenaSulisMinerva
authored

Commits on Jan 28, 2020

Test reverting assembly version number
Robin Chang
committed

Commits on Jan 29, 2020

Test re-increment assembly version number
Robin Chang
committed
Revert "Test re-increment assembly version number"
Robin Chang
committed
Merge pull request #273 from AthenaSulisMinerva/vefs-ce-debug
sumghai
authored
Update to 1.0.1.8-FT-014
sumghai
authored

Commits on Feb 3, 2020

Commits on Feb 5, 2020

Patches: Fix Mechanoids Extraordinaire
cal066
committed

Commits on Feb 6, 2020

Commits on Feb 7, 2020

Merge pull request #286 from cal066/starwasfactions
AthenaSulisMinerva
authored

Commits on Feb 16, 2020

Move mod-unqiue ammo textures to ThirdParty subfolder
Robin Chang
committed
Move sub-30mm Shells to High Caliber
Robin Chang
committed
Move Missile ammo defs back to Rocket folder (housekeeping)
Robin Chang
committed
Rebalance crafting stats for Tranq ammo
Robin Chang
committed
Rebalance various ammo stats
Robin Chang
committed

Commits on Feb 18, 2020

Change Bofors ammo category to Shells
Robin Chang
committed
Temp fix for placeholder textures used by mod-unique ammo
Robin Chang
committed
Revert debug log prefix to "Combat Extended"
Robin Chang
committed
Remove mod-unique ammo
Robin Chang
committed
Revert to CE 1.9 patches
Robin Chang
committed
Remove issue templates
Robin Chang
committed
Revert to CE About and mod metadata files
Robin Chang
committed
Revert to CE original preview image
Robin Chang
committed
Misc sync with CE dev branch
Robin Chang
committed

Commits on Feb 19, 2020

Misc sync with CE dev branch 2
Robin Chang
committed
Misc sync with CE dev branch 3
Robin Chang
committed
Misc sync with CE dev branch 4
Robin Chang
committed
Misc sync with CE dev branch 5
Robin Chang
committed
Add drug item bulk adjustments; revert to original CE README
Robin Chang
committed
Update leftover FT mention
zozilin
authored

Commits on Feb 20, 2020

Move Tranq Nonlethal ammo category to general
Robin Chang
committed
Temporarily remove Tranq Nonlethal ammo from library
Robin Chang
committed
Fix incorrect texture paths for various rockets and missiles
Robin Chang
committed
Add missing ThingCategoryDef for missile and medieval ammo
Robin Chang
committed