Merge branch 'bncf' into Monster-Update-6

2021-10-10 13:47:41 +11:00
parent 6f43c54d30 b94837673f
commit 74394c4759
307 changed files with 22737 additions and 7828 deletions
--- a/5
+++ b/5
@ -6,5 +6,10 @@ WoodSnap.wav - "Snapping, Wooden Fence, N.wav" by InspectorJ (www.jshaw.co.uk) o
 firealarm.ogg - "School Fire Alarm" by Cullen Card
 shot.ogg - "38 Caliber Gun Shot 5x" by Mike Koenig
 wind.wav - "Wind" by Mark DiAngelo
+rumble.ogg - "CinematicBoomNorm" by Herbert Boland
+sizzle.ogg - "Hot Sizzling" by Mike Koenig
+drumroll.ogg, drumrollend.ogg - "Drum Roll with Cymbals Crash" by Iwan Gabovitch
+firework.ogg - "Fuse" by soundslikewillem of freesound.org, "fireworks 3burst sizzle" by atomwrath of freesound.org
+splash.ogg - "Splash, Jumping, D" by InspectorJ of freesound.org
 punch.ogg - "Strong Punch" by Mike Koenig
 menacing.ogg - "Scaryscape 01" by Suonho (soundcloud.com/suonho) of Freesound.org
--- a/game/audio/OST/Fuck
+++ b/game/audio/OST/Fuck
--- a/game/audio/OST/Prized
+++ b/game/audio/OST/Prized
--- a/game/audio/OST/ending_14D.ogg
+++ b/game/audio/OST/ending_14D.ogg
--- a/game/audio/OST/good
+++ b/game/audio/OST/good
--- a/game/audio/OST/good
+++ b/game/audio/OST/good
--- a/game/audio/OST/good
+++ b/game/audio/OST/good
--- a/game/audio/OST/its_the_original_you_didnt_ask_for.ogg
+++ b/game/audio/OST/its_the_original_you_didnt_ask_for.ogg
--- a/game/audio/OST/sage
+++ b/game/audio/OST/sage
--- a/game/audio/effects/Ear-Ringing-Sound-Effect.ogg
+++ b/game/audio/effects/Ear-Ringing-Sound-Effect.ogg
--- a/game/audio/effects/anonGardenFall.ogg
+++ b/game/audio/effects/anonGardenFall.ogg
--- a/game/audio/effects/anonGardenFall.wav
+++ b/game/audio/effects/anonGardenFall.wav
--- a/game/audio/effects/anonTheaterFall.ogg
+++ b/game/audio/effects/anonTheaterFall.ogg
--- a/game/audio/effects/anonTheaterFall.wav
+++ b/game/audio/effects/anonTheaterFall.wav
--- a/game/audio/effects/apartmentLoop.ogg
+++ b/game/audio/effects/apartmentLoop.ogg
--- a/game/audio/effects/badMusic.ogg
+++ b/game/audio/effects/badMusic.ogg
--- a/game/audio/effects/camera.ogg
+++ b/game/audio/effects/camera.ogg
--- a/game/audio/effects/cameraMult.ogg
+++ b/game/audio/effects/cameraMult.ogg
--- a/game/audio/effects/camera_shutter_click.wav
+++ b/game/audio/effects/camera_shutter_click.wav
--- a/game/audio/effects/carAlarmLoop.ogg
+++ b/game/audio/effects/carAlarmLoop.ogg
--- a/game/audio/effects/carKick1.ogg
+++ b/game/audio/effects/carKick1.ogg
--- a/game/audio/effects/carKick2.ogg
+++ b/game/audio/effects/carKick2.ogg
--- a/game/audio/effects/carSuspension.ogg
+++ b/game/audio/effects/carSuspension.ogg
--- a/game/audio/effects/caveman_magic.ogg
+++ b/game/audio/effects/caveman_magic.ogg
--- a/game/audio/effects/dinomoesLoop.ogg
+++ b/game/audio/effects/dinomoesLoop.ogg
--- a/game/audio/effects/doorSlam.ogg
+++ b/game/audio/effects/doorSlam.ogg
--- a/game/audio/effects/drumroll.ogg
+++ b/game/audio/effects/drumroll.ogg
--- a/game/audio/effects/drumrollEnd.ogg
+++ b/game/audio/effects/drumrollEnd.ogg
--- a/game/audio/effects/fangPunch.ogg
+++ b/game/audio/effects/fangPunch.ogg
--- a/game/audio/effects/fangPunch.wav
+++ b/game/audio/effects/fangPunch.wav
--- a/game/audio/effects/firework.ogg
+++ b/game/audio/effects/firework.ogg
--- a/game/audio/effects/lockerAnonsDead.ogg
+++ b/game/audio/effects/lockerAnonsDead.ogg
--- a/game/audio/effects/lockerSmash.ogg
+++ b/game/audio/effects/lockerSmash.ogg
--- a/game/audio/effects/marketLoop.ogg
+++ b/game/audio/effects/marketLoop.ogg
--- a/game/audio/effects/rumble.ogg
+++ b/game/audio/effects/rumble.ogg
--- a/game/audio/effects/shotTinnitus.wav
+++ b/game/audio/effects/shotTinnitus.wav
--- a/game/audio/effects/shower.wav
+++ b/game/audio/effects/shower.wav
--- a/game/audio/effects/showerLoop.ogg
+++ b/game/audio/effects/showerLoop.ogg
--- a/game/audio/effects/showerMuffledEnd.ogg
+++ b/game/audio/effects/showerMuffledEnd.ogg
--- a/game/audio/effects/showerMuffledLoop.ogg
+++ b/game/audio/effects/showerMuffledLoop.ogg
--- a/game/audio/effects/showerStart.ogg
+++ b/game/audio/effects/showerStart.ogg
--- a/game/audio/effects/sizzle.ogg
+++ b/game/audio/effects/sizzle.ogg
--- a/game/audio/effects/slapstickThunder.ogg
+++ b/game/audio/effects/slapstickThunder.ogg
--- a/game/audio/effects/splash.ogg
+++ b/game/audio/effects/splash.ogg
--- a/game/audio/effects/strike.ogg
+++ b/game/audio/effects/strike.ogg
--- a/game/audio/effects/stringSnap.ogg
+++ b/game/audio/effects/stringSnap.ogg
--- a/game/audio/effects/uiBack.wav
+++ b/game/audio/effects/uiBack.wav
--- a/game/audio/effects/uiClick.wav
+++ b/game/audio/effects/uiClick.wav
--- a/game/audio/effects/uiFail.wav
+++ b/game/audio/effects/uiFail.wav
--- a/game/audio/effects/uiNotification.wav
+++ b/game/audio/effects/uiNotification.wav
--- a/game/audio/effects/uiOptionOff.wav
+++ b/game/audio/effects/uiOptionOff.wav
--- a/game/audio/effects/uiOptionOn.wav
+++ b/game/audio/effects/uiOptionOn.wav
--- a/game/audio/effects/vines.ogg
+++ b/game/audio/effects/vines.ogg
--- a/game/audio/effects/vines.wav
+++ b/game/audio/effects/vines.wav
--- a/game/audio/effects/windLightLoop.ogg
+++ b/game/audio/effects/windLightLoop.ogg
--- a/game/images/RAYmba/anonpet.png
+++ b/game/images/RAYmba/anonpet.png
--- a/game/images/RAYmba/flakes.png
+++ b/game/images/RAYmba/flakes.png
--- a/game/images/RAYmba/keys.png
+++ b/game/images/RAYmba/keys.png
--- a/game/images/RAYmba/raymba1.png
+++ b/game/images/RAYmba/raymba1.png
--- a/game/images/RAYmba/raymba2.png
+++ b/game/images/RAYmba/raymba2.png
--- a/game/images/RAYmba/raymba3.png
+++ b/game/images/RAYmba/raymba3.png
--- a/game/images/RAYmba/raymba4.png
+++ b/game/images/RAYmba/raymba4.png
--- a/game/images/RAYmba/raymbabox.png
+++ b/game/images/RAYmba/raymbabox.png
--- a/game/images/RAYmba/raymbashadow.png
+++ b/game/images/RAYmba/raymbashadow.png
--- a/game/images/anon/Other/dpromdance.png
+++ b/game/images/anon/Other/dpromdance.png
--- a/game/images/anon/Other/fanganoncarry.png
+++ b/game/images/anon/Other/fanganoncarry.png
--- a/game/images/anon/base
+++ b/game/images/anon/base
--- a/game/images/anon/emotive
+++ b/game/images/anon/emotive
--- a/game/images/anon/emotive
+++ b/game/images/anon/emotive
--- a/game/images/anon/emotive
+++ b/game/images/anon/emotive
--- a/game/images/backgrounds/Bus_Stop.jpg
+++ b/game/images/backgrounds/Bus_Stop.jpg
--- a/game/images/backgrounds/Reed_Backgarden_V2.png
+++ b/game/images/backgrounds/Reed_Backgarden_V2.png
--- a/game/images/backgrounds/airport.jpg
+++ b/game/images/backgrounds/airport.jpg
--- a/game/images/backgrounds/anonroomday2.png
+++ b/game/images/backgrounds/anonroomday2.png
--- a/game/images/backgrounds/anonroomnight2.png
+++ b/game/images/backgrounds/anonroomnight2.png
--- a/game/images/backgrounds/backyard.jpg
+++ b/game/images/backgrounds/backyard.jpg
--- a/game/images/backgrounds/bowlingalley.png
+++ b/game/images/backgrounds/bowlingalley.png
--- a/game/images/backgrounds/carpet.jpg
+++ b/game/images/backgrounds/carpet.jpg
--- a/game/images/backgrounds/courtyard.png
+++ b/game/images/backgrounds/courtyard.png
--- a/game/images/backgrounds/emptyroomday.png
+++ b/game/images/backgrounds/emptyroomday.png
--- a/game/images/backgrounds/emptyroomnight.png
+++ b/game/images/backgrounds/emptyroomnight.png
--- a/game/images/backgrounds/fangapartment.jpg
+++ b/game/images/backgrounds/fangapartment.jpg
--- a/game/images/backgrounds/fangroomfuture.png
+++ b/game/images/backgrounds/fangroomfuture.png
--- a/game/images/backgrounds/fromairplane.jpg
+++ b/game/images/backgrounds/fromairplane.jpg
--- a/game/images/backgrounds/hotellobby.jpg
+++ b/game/images/backgrounds/hotellobby.jpg
--- a/game/images/backgrounds/livingroomdayalt.png
+++ b/game/images/backgrounds/livingroomdayalt.png
--- a/game/images/backgrounds/moespizza
+++ b/game/images/backgrounds/moespizza
--- a/game/images/backgrounds/park_night.png
+++ b/game/images/backgrounds/park_night.png
--- a/game/images/backgrounds/parking_lot.jpg
+++ b/game/images/backgrounds/parking_lot.jpg
--- a/game/images/backgrounds/parkinglot.png
+++ b/game/images/backgrounds/parkinglot.png
--- a/game/images/backgrounds/room
+++ b/game/images/backgrounds/room
--- a/game/images/backgrounds/room
+++ b/game/images/backgrounds/room
--- a/game/images/backgrounds/trishhome.png
+++ b/game/images/backgrounds/trishhome.png
--- a/game/images/cgs/Bathroom1.png
+++ b/game/images/cgs/Bathroom1.png
--- a/game/images/cgs/Bathroom_2.png
+++ b/game/images/cgs/Bathroom_2.png
--- a/game/images/cgs/TroodonConvergence1.jpg
+++ b/game/images/cgs/TroodonConvergence1.jpg
--- a/game/images/cgs/TroodonConvergence1.png
+++ b/game/images/cgs/TroodonConvergence1.png
--- a/game/images/cgs/TroodonConvergence2.jpg
+++ b/game/images/cgs/TroodonConvergence2.jpg
--- a/game/images/cgs/TroodonConvergence2.png
+++ b/game/images/cgs/TroodonConvergence2.png
--- a/game/images/cgs/TroodonConvergence3.jpg
+++ b/game/images/cgs/TroodonConvergence3.jpg
--- a/Show More
+++ b/Show More