Closed CasualNoLifer closed 2 years ago
It looks like your updatesounds
branch is based on commits from main
and not main-development
, which causes too many conflicts in order for the PR to be merged.
It looks like your
updatesounds
branch is based on commits frommain
and notmain-development
, which causes too many conflicts in order for the PR to be merged.
What do I do to fix it then?
You create a new branch based on main-development
and commit your files there
(Reuploaded to correct branch)
Sounds used in the 0.7.0 development test have been updated and/or fixed. There are also many new sounds (there are now 31). All file sizes have been optimized down -- most of them are now 21 kb or lower with about 4 exceptions. Many of these sounds will not work with the current weapon data. Weapon data fixes will roll out sometime soon. Here is a complete list of improvements and changes:
Removed ak_suppressed
Removed ak3_fire
Removed ar15_suppressed
Removed medium_fire
Removed smg_fire
Removed smg_suppressed
Updated ak1_fire
Updated ak2_fire
Updated deagle_fire
Updated heavy_fire
Updated ots03_fire
Updated pistol_fire
Updated vector_fire
Updated vector_suppressed
Fixed aos_fire
Fixed ar15_fire
Fixed awm_fire
Fixed intsup
Fixed mammoth_fire
Fixed mp7a2_fire
Fixed p250_fire
Fixed ssg08_fire
Added aug_fire
Added banshee_fire
Added fn2000_fire
Added m1014_fire
Added m1911_enchanted (For upcoming weapon addition)
Added m1911_fire (For upcoming weapon addition)
Added m1911_suppressed (For upcoming weapon addition)
Added mac10_fire
Added magnum_fire (For upcoming weapon addition)
Added pp19_fire
Added ravensclaw_fire
Added light_suppression
Added medium_suppression
Added heavy_suppression
Added rifle_suppressed
All new additions need to be registered and all removed sounds need to be removed.