Skip to content
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.

Sign up for GitHub

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

Jump to bottom

5.6 Dev to Master PR #2932

Merged
merged 394 commits into from
Feb 1, 2024
Merged

5.6 Dev to Master PR #2932

merged 394 commits into from
Feb 1, 2024

Conversation

N7Huntsman
Copy link
Contributor

Dummy PR for changelog creation.

N7Huntsman and others added 30 commits November 16, 2023 01:45
@N7Huntsman
Whitespace housekeeping.
3bff38f
@N7Huntsman
Finish whitespace pass.
1c46ced
@N7Huntsman
For real this time.
033fedd
@N7Huntsman
Merge pull request #2889 from CombatExtended-Continued/NoStuff4Unfini…
a2b6942 
…shedArrow

No stuff4 unfinished arrow
@N7Huntsman
Fix incorrect texture path for Plasma projectile.
db15add
@N7Huntsman
Rotate melta projectile 90 deg.
f614ed4
@N7Huntsman
Grenades wip
04187f2
@CMDR-Bill-Doors
height fuse
afd2b15
@CMDR-Bill-Doors
effect xml, accept multiple compfrag
de8ea1b
@CMDR-Bill-Doors
Update ProjectileCE_BunkerBuster.cs
4f6709d
@N7Huntsman
Patch some apparel.
fdd50db
@isyuricunha
Brazilian Portuguese - Create AmmoContainerKeyed.xml
d8086b7
@isyuricunha
fix path Brazilian Portuguese - AmmoContainerKeyed.xml
5a74b42
@isyuricunha
Portuguese ArmorDurability.xml
18b690e
@isyuricunha
Portuguese BipodStatWorker.xml
8ff60da
@isyuricunha
up to date Portuguese Descriptions.xml
9728748
@isyuricunha
up to date Portuguese Keys.xml
f1c5390
@isyuricunha
format portuguese LongEventHandler.xml
ee8d02a
@isyuricunha
portuguese MechTakeAmmoKeyed.xml
e0a6af1
@isyuricunha
portuguese Messages.xml
6c03890
@isyuricunha
portuguese ModMenu.xml
300edde
@isyuricunha
portuguese Stats.xml
ffb1c3c
@N7Huntsman
Rename Galavic ammo file
5bd084e
@N7Huntsman
Add Tox Ammo and art
0895bd4
@N7Huntsman
Move 40k Ammo to Defs
f1c31cb
@N7Huntsman
Increase lasgun mag size
c795885
@CMDR-Bill-Doors
Update Harmony_StunHandler.cs
5736364
@SaltyKarl
Update RangedArchotech.xml
723a00d
@N7Huntsman
Fix all the grenades.
bc6855e
@N7Huntsman
Simplify scenario patch
bc316be
@N7Huntsman
Merge pull request #2855 from AKEKHQ/Development
82962cd 
Add Compatibility for Royal Arsenal
@github-actions GitHub Actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-7665801642.zip

@N7Huntsman
Merge pull request #2964 from SamaelGray/SamaelGray-EvenMoreIndentaio…
7668f7b 
…nStuff

Indentation housekeeping part 4...
@github-actions GitHub Actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-7665948379.zip

@github-actions GitHub Actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-7691746971.zip

@github-actions GitHub Actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-7691796878.zip

@N7Huntsman
Merge pull request #2963 from CombatExtended-Continued/MergePartialAr…
5454323 
…morExt

make last partialarmorext apply instead of first
@N7Huntsman
Merge pull request #2949 from CombatExtended-Continued/new-ballistics
0cddcc5 
Add discrete ballistics to use for some projectiles - Verbal approval from Thorbane.
@github-actions GitHub Actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-7692184480.zip

@github-actions GitHub Actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-7692195885.zip

@github-actions GitHub Actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-7704829895.zip

@github-actions GitHub Actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-7706892584.zip

@N7Huntsman N7Huntsman marked this pull request as ready for review February 1, 2024 09:31
@perkinslr perkinslr merged commit 370ed14 into master Feb 1, 2024
3 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@perkinslr perkinslr perkinslr approved these changes

Assignees
No one assigned
Labels
Download in Comments This PR has a zipfile download available.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.