Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
a630265
initial
DESTROYGIRL Jun 26, 2025
4552f43
remove special character
DESTROYGIRL Jun 26, 2025
61b2b33
forgot to change the count
DESTROYGIRL Jun 26, 2025
02ca4f8
control reaches end of non-void function
DESTROYGIRL Jun 26, 2025
086b5bc
Merge branch 'master' into juggernaut_gamemode
DESTROYGIRL Jun 26, 2025
651d642
check round live before playing sound
DESTROYGIRL Jun 28, 2025
b2fc0d0
Merge branch 'master' into juggernaut_gamemode
DESTROYGIRL Jun 29, 2025
b28a2dc
no air speed
DESTROYGIRL Jun 29, 2025
9391653
weapon disallowingment
DESTROYGIRL Jun 30, 2025
7cd6bc1
named gun
DESTROYGIRL Jun 30, 2025
4dbc3e4
space
DESTROYGIRL Jun 30, 2025
05165bf
Merge branch 'master' into juggernaut_gamemode
DESTROYGIRL Jul 4, 2025
c869820
Merge branch 'master' into juggernaut_gamemode
DESTROYGIRL Jul 7, 2025
52788cc
gun sounds, networked steps, no slowclip
DESTROYGIRL Jul 8, 2025
344657f
Merge branch 'master' into juggernaut_gamemode
DESTROYGIRL Jul 12, 2025
bfc5628
night vision
DESTROYGIRL Jul 12, 2025
eb55578
juggernaut hud
DESTROYGIRL Jul 12, 2025
d9a2046
IsAlive
DESTROYGIRL Jul 12, 2025
7646685
fix ctg, extend use time, set spawn orientation
DESTROYGIRL Jul 12, 2025
43b471d
symbol test
DESTROYGIRL Jul 13, 2025
c7f63a5
Merge branch 'master' into juggernaut_gamemode
DESTROYGIRL Jul 23, 2025
b017840
ui conflict part 2
DESTROYGIRL Jul 23, 2025
b5387f5
HOT
DESTROYGIRL Jul 23, 2025
d7848cf
getmaxhealth
DESTROYGIRL Jul 23, 2025
2bc654c
Merge branch 'master' into juggernaut_gamemode
DESTROYGIRL Jul 23, 2025
9e319cd
Merge branch 'master' into juggernaut_gamemode
DESTROYGIRL Jul 23, 2025
c946d77
gun soundscript
DESTROYGIRL Jul 25, 2025
5171f20
Merge branch 'master' into juggernaut_gamemode
DESTROYGIRL Jul 27, 2025
5e94954
Merge branch 'master' into juggernaut_gamemode
DESTROYGIRL Jul 31, 2025
8b4e167
Merge branch 'master' into juggernaut_gamemode
DESTROYGIRL Aug 1, 2025
e0f99f8
Merge branch 'master' into juggernaut_gamemode
DESTROYGIRL Aug 3, 2025
0895607
viewmodel
DESTROYGIRL Aug 13, 2025
0bb2e3b
Merge branch 'master' into juggernaut_gamemode
DESTROYGIRL Aug 15, 2025
4b38886
Merge branch 'master' into juggernaut_gamemode
DESTROYGIRL Aug 19, 2025
63a6528
indont
DESTROYGIRL Aug 19, 2025
66988c4
boundary support
DESTROYGIRL Aug 19, 2025
80b87d0
Merge branch 'master' into juggernaut_gamemode
DESTROYGIRL Aug 19, 2025
c681bbc
max points 0
DESTROYGIRL Aug 19, 2025
a96c498
Merge branch 'master' into juggernaut_gamemode
DESTROYGIRL Aug 20, 2025
0462842
lower balc accuracy
DESTROYGIRL Aug 21, 2025
9969ba3
0.15 damage mod
DESTROYGIRL Aug 23, 2025
2666328
attach balc
DESTROYGIRL Aug 23, 2025
6c4a953
tweak bounds and view
DESTROYGIRL Aug 23, 2025
35c324a
server only
DESTROYGIRL Aug 23, 2025
6e0d294
lean angle override
DESTROYGIRL Aug 23, 2025
c67803c
ragdoll the player
DESTROYGIRL Aug 23, 2025
46157f1
Merge branch 'master' into juggernaut_gamemode
DESTROYGIRL Aug 25, 2025
1f9019a
conflicts fixup
DESTROYGIRL Aug 25, 2025
d7804a8
conflict fix part 2
DESTROYGIRL Aug 25, 2025
45e10df
Merge branch 'master' into juggernaut_gamemode
DESTROYGIRL Aug 26, 2025
714fe67
conflictin' USA
DESTROYGIRL Aug 26, 2025
b240c4f
startup animation
DESTROYGIRL Aug 26, 2025
2779ca8
new vm pos
DESTROYGIRL Aug 26, 2025
cb5bb09
allow anim events backwards
DESTROYGIRL Aug 26, 2025
4c548cd
anim sounds
DESTROYGIRL Aug 26, 2025
0c206ae
play boot sounds, change post death fx
DESTROYGIRL Aug 27, 2025
760eec5
fix post death sequence
DESTROYGIRL Aug 27, 2025
e038485
fix deathcam
DESTROYGIRL Aug 27, 2025
5b630bd
fix weapons in floor
DESTROYGIRL Aug 27, 2025
d8ec933
fix position change
DESTROYGIRL Aug 27, 2025
bcfcb96
no blood hack
DESTROYGIRL Aug 27, 2025
b5a2a59
remove some icky sounds
DESTROYGIRL Aug 27, 2025
7c53c4c
Merge branch 'master' into juggernaut_gamemode
DESTROYGIRL Aug 28, 2025
6690551
refactor away from ghost
DESTROYGIRL Aug 29, 2025
82d469b
smooth deathcam
DESTROYGIRL Aug 29, 2025
335b0b3
mistake on weapons
DESTROYGIRL Aug 30, 2025
32f2ed8
fix jump height comment
DESTROYGIRL Aug 30, 2025
587e5f7
class enum comment
DESTROYGIRL Aug 30, 2025
1f61c82
item uses player dimensions
DESTROYGIRL Aug 30, 2025
296d261
fix bot assert
DESTROYGIRL Aug 31, 2025
81afc0c
deadcam trace
DESTROYGIRL Aug 31, 2025
d670f0b
objective text shorten
DESTROYGIRL Aug 31, 2025
23432bc
not virtual GetOverrideStepSound
DESTROYGIRL Aug 31, 2025
26e30ec
compass marker
DESTROYGIRL Aug 31, 2025
9a399d5
lowveride
DESTROYGIRL Sep 1, 2025
aa40c31
move weapon +use functionality inside use function
DESTROYGIRL Sep 1, 2025
fa6e7b8
fix fake firing while booting
DESTROYGIRL Sep 1, 2025
1191f2b
actually fix fake firing while shooting
DESTROYGIRL Sep 1, 2025
7eb99ec
comment out defs
DESTROYGIRL Sep 1, 2025
46f9ddc
eradicate the changes
DESTROYGIRL Sep 1, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions game/neo/scripts/HudLayout.res
Original file line number Diff line number Diff line change
Expand Up @@ -852,6 +852,11 @@
"ammo_text_color" "255 255 255 100"
"ammo_color" "255 255 255 150"
"emptied_ammo_color" "255 255 255 50"
"heatbar_xpos" "45"
"heatbar_ypos" "12"
"heatbar_w" "150"
"heatbar_h" "15"
"heat_color" "255 50 50 200"
}
NHudHealth
{
Expand Down
92 changes: 92 additions & 0 deletions game/neo/scripts/game_sounds_physics.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3876,6 +3876,98 @@
}
}

"JGR56.FootstepLeft"
{
"volume" "0.6"
"pitch" "100"
"soundlevel" "SNDLVL_80dB"

"rndwave"
{
"wave" "npc/dog/dog_footstep1.wav"
"wave" "npc/dog/dog_footstep2.wav"

}
}

"JGR56.FootstepRight"
{
"volume" "0.6"
"pitch" "100"
"soundlevel" "SNDLVL_80dB"

"rndwave"
{
"wave" "npc/dog/dog_footstep3.wav"
"wave" "npc/dog/dog_footstep4.wav"

}
}

"JGR56.RunFootstepLeft"
{
"volume" "0.8"
"pitch" "100"
"soundlevel" "SNDLVL_80dB"

"rndwave"
{
"wave" "npc/dog/dog_footstep_run1.wav"
"wave" "npc/dog/dog_footstep_run2.wav"
"wave" "npc/dog/dog_footstep_run3.wav"
"wave" "npc/dog/dog_footstep_run4.wav"

}
}

"JGR56.RunFootstepRight"
{
"volume" "0.8"
"pitch" "100"
"soundlevel" "SNDLVL_80dB"

"rndwave"
{
"wave" "npc/dog/dog_footstep_run5.wav"
"wave" "npc/dog/dog_footstep_run6.wav"
"wave" "npc/dog/dog_footstep_run7.wav"
"wave" "npc/dog/dog_footstep_run8.wav"

}
}

"JGR56.Pneumatic"
{
"channel" "CHAN_STATIC"
"volume" "0.9"
"pitch" "90, 110"
"soundlevel" "SNDLVL_80dB"

"rndwave"
{
"wave" "npc/dog/dog_pneumatic1.wav"
"wave" "npc/dog/dog_pneumatic2.wav"
}
}

"JGR56.Servo"
{
"channel" "CHAN_STATIC"
"volume" "0.8"
"pitch" "PITCH_NORM"
"soundlevel" "SNDLVL_70dB"

"rndwave"
{
"wave" "npc/dog/dog_servo1.wav"
"wave" "npc/dog/dog_servo2.wav"
"wave" "npc/dog/dog_servo5.wav"
"wave" "npc/dog/dog_servo6.wav"
"wave" "npc/dog/dog_servo8.wav"
"wave" "npc/dog/dog_servo10.wav"
}
}

"coast.leech_bites_loop"
{
"channel" "CHAN_STATIC"
Expand Down
33 changes: 33 additions & 0 deletions game/neo/scripts/game_sounds_ui.txt
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,39 @@
}
}

"HUD.CPCharge"
{
"channel" "CHAN_ITEM"
"volume" "0.9"
"pitch" "PITCH_NORM"

"soundlevel" "SNDLVL_70dB"

"wave" "player/CPcharging.wav"
}

"HUD.CPNeutral"
{
"channel" "CHAN_ITEM"
"volume" "0.9"
"pitch" "PITCH_NORM"

"soundlevel" "SNDLVL_70dB"

"wave" "player/CPneutral.wav"
}

"HUD.CPCaptured"
{
"channel" "CHAN_ITEM"
"volume" "0.9"
"pitch" "PITCH_NORM"

"soundlevel" "SNDLVL_70dB"

"wave" "player/CPcaptured.wav"
}

"HUD.Ping"
{
"channel" "CHAN_STATIC"
Expand Down
27 changes: 27 additions & 0 deletions game/neo/scripts/game_sounds_weapons.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1428,4 +1428,31 @@
"soundlevel" "SNDLVL_75dB"

"wave" "weapons/slam/throw.wav"
}

// --------------------------
// BALC3
// --------------------------

"weapon_balc.single"
{
"channel" "CHAN_WEAPON"
"soundlevel" "SNDLVL_150dB"
"volume" "0.8"
"pitch" "90,100"
"wave" "^weapons/balc/balc_fire.wav"
}

"weapon_balc.overheat"
{
"channel" "CHAN_ITEM"
"volume" "0.5"
"wave" "weapons/balc/balc_overheat.wav"
}

"weapon_balc.ready"
{
"channel" "CHAN_ITEM"
"volume" "0.5"
"wave" "weapons/balc/balc_ready.wav"
}
134 changes: 134 additions & 0 deletions game/neo/scripts/weapon_balc.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
WeaponData
{
// Weapon data is loaded by both the Game and Client DLLs.
"printname" "BALC3"
"BulletCharacter" "c"
"iDeathIcon" "@"
"viewmodel" "models/weapons/v_balc.mdl"
"playermodel" "models/weapons/w_balc.mdl"
"anim_prefix" "m4"
"bucket" "0"
"bucket_position" "0"
"Damage" "25"
"Penetration" "28.0"
"CycleTime" "0.1" // time between shots

"TPMuzzleFlashScale" "2.0"

"clip_size" "-1"
"default_clip" "40"
"autoswitchfrom" "0"
"primary_ammo" "AMMO_PRI"
"secondary_ammo" "None"
"DropOnDeath" "0"

"weight" "3"
// ITEM_FLAG_SELECTONEMPTY = 1
// ITEM_FLAG_NOAUTOSWITCHEMPTY = (1 << 2)
// ITEM_FLAG_DOHITLOCATIONDMG = (1 << 5)
// Combined as int = 37
"item_flags" "37"
// "item_flags" "0"

"AimType" "0"

"VMFov" "30.0"
"VMOffsetForward" "0.0"
"VMOffsetRight" "3.0"
"VMOffsetUp" "-1.0"
"VMAngleYaw" "4.0"

"VMAimFov" "40.0"
"VMAimOffsetForward" "10.0"
"VMAimOffsetRight" "1.16"
"VMAimOffsetUp" "2.59"

"AimFov" "45.0"

"ViewModelOffset"
{
"fov" "30"
"forward" "0"
"right" "3"
"up" "-1"
"yaw" "4"
"pitch" "-9"
}

"ZoomOffset"
{
"fov" "54"
"forward" "8"
"right" "7"
"up" "2"
}

"AimOffset"
{
"fov" "40"
"forward" "10"
"right" "1.16"
"up" "2.59"
}

// Sounds for the weapon. There is a max of 16 sounds per category (i.e. max 16 "single_shot" sounds)
SoundData
{
"reload" "Weapon_pz.Reload"
"reload_npc" "Weapon_pz.NPC_Reload"
"empty" "weapon_pz.empty"
"single_shot" "weapon_balc.single"
"single_shot_npc" "weapon_balc.single"
"special1" "weapon_balc.overheat"
"special2" "weapon_balc.ready"
}

// Weapon Sprite data is loaded by the Client DLL.
TextureData
{
"weapon"
{
"font" "WeaponIcons"
"character" "d"
}
"weapon_s"
{
"font" "WeaponIconsSelected"
"character" "d"
}
"ammo"
{
"font" "WeaponIcons"
"character" "p"
}
"crosshair"
{
"file" "vgui/hud/crosshair"
"x" "0"
"y" "0"
"width" "128"
"height" "128"
}
"autoaim"
{
"file" "sprites/crosshairs"
"x" "0"
"y" "48"
"width" "24"
"height" "24"
}
}
ModelBounds
{
Viewmodel
{
Mins "-10 -4 -13"
Maxs "21 9 -1"
}
World
{
Mins "-10 -7 -6"
Maxs "22 8 9"
}
}
}
4 changes: 4 additions & 0 deletions src/game/client/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1621,6 +1621,8 @@ target_sources_grouped(
${CMAKE_SOURCE_DIR}/game/shared/neo/neo_gamerules.h
${CMAKE_SOURCE_DIR}/game/shared/neo/neo_ghost_cap_point.cpp
${CMAKE_SOURCE_DIR}/game/shared/neo/neo_ghost_cap_point.h
${CMAKE_SOURCE_DIR}/game/shared/neo/neo_juggernaut.cpp
${CMAKE_SOURCE_DIR}/game/shared/neo/neo_juggernaut.h
${CMAKE_SOURCE_DIR}/game/shared/neo/neo_player_shared.cpp
${CMAKE_SOURCE_DIR}/game/shared/neo/neo_player_shared.h
${CMAKE_SOURCE_DIR}/game/shared/neo/neo_player_spawnpoint.cpp
Expand All @@ -1647,6 +1649,8 @@ target_sources_grouped(
FILES
${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_aa13.cpp
${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_aa13.h
${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_balc.cpp
${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_balc.h
${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_bits.h
${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_detpack.cpp
${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_detpack.h
Expand Down
Loading
Loading