Skip to content

Commit

Permalink
[#9] Implement killfeed icons from Circa
Browse files Browse the repository at this point in the history
  • Loading branch information
taysta committed Oct 1, 2023
1 parent c902c97 commit 2c9e32c
Show file tree
Hide file tree
Showing 35 changed files with 37 additions and 37 deletions.
Binary file removed assets/japro/hud/generic.tga
Binary file not shown.
Binary file added assets/japro/hud/mod/DEMP2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/DEMP2_alt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/bowcaster.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/concussion.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/concussion_alt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/crushed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/detpack.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/disruptor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/disruptor_alt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/fall.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/flechette.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/flechette_alt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/force.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/generic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/lava.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/melee.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/merrsonn.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/merrsonn_alt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/mine.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/ooze.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/pistol.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/portable_turret.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/repeater.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/repeater_alt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/rifle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/japro/hud/mod/saber.png
Binary file added assets/japro/hud/mod/stun.png
Binary file added assets/japro/hud/mod/swoop.png
Binary file added assets/japro/hud/mod/telefrag.png
Binary file added assets/japro/hud/mod/thermal.png
Binary file added assets/japro/hud/mod/turret.png
Binary file added assets/japro/hud/mod/water.png
Binary file removed assets/japro/hud/telefrag.tga
Binary file not shown.
74 changes: 37 additions & 37 deletions codemp/cgame/hud_shared.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,44 +48,44 @@ const char *hud_weapon_icons[WP_NUM_WEAPONS] = {

const char *hud_mod_icons[ MOD_MAX ] = {
"hud/mod/generic", // MOD_UNKNOWN
"gfx/hud/w_icon_stunbaton", // MOD_STUN_BATON
"gfx/hud/w_icon_melee", // MOD_MELEE
"gfx/hud/w_icon_lightsaber", // MOD_SABER
"gfx/hud/w_icon_blaster_pistol", // MOD_BRYAR_PISTOL
"gfx/hud/w_icon_blaster_pistol", // MOD_BRYAR_PISTOL_ALT
"gfx/hud/w_icon_blaster", // MOD_BLASTER
"gfx/hud/w_icon_blaster", // MOD_TURBLAST
"gfx/hud/w_icon_disruptor", // MOD_DISRUPTOR
"gfx/hud/w_icon_disruptor", // MOD_DISRUPTOR_SPLASH
"gfx/hud/w_icon_disruptor", // MOD_DISRUPTOR_SNIPER
"gfx/hud/w_icon_bowcaster", // MOD_BOWCASTER
"gfx/hud/w_icon_repeater", // MOD_REPEATER
"gfx/hud/w_icon_repeater", // MOD_REPEATER_ALT
"gfx/hud/w_icon_repeater", // MOD_REPEATER_ALT_SPLASH
"gfx/hud/w_icon_demp2", // MOD_DEMP2
"gfx/hud/w_icon_demp2", // MOD_DEMP2_ALT
"gfx/hud/w_icon_flachette", // MOD_FLECHETTE
"gfx/hud/w_icon_flachette", // MOD_FLECHETTE_ALT_SPLASH
"gfx/hud/w_icon_merrsonn", // MOD_ROCKET
"gfx/hud/w_icon_merrsonn", // MOD_ROCKET_SPLASH
"gfx/hud/w_icon_merrsonn", // MOD_ROCKET_HOMING
"gfx/hud/w_icon_merrsonn", // MOD_ROCKET_HOMING_SPLASH
"gfx/hud/w_icon_thermal", // MOD_THERMAL
"gfx/hud/w_icon_thermal", // MOD_THERMAL_SPLASH
"gfx/hud/w_icon_tripmine", // MOD_TRIP_MINE_SPLASH
"gfx/hud/w_icon_tripmine", // MOD_TIMED_MINE_SPLASH
"gfx/hud/w_icon_detpack", // MOD_DET_PACK_SPLASH
"hud/mod/generic", // MOD_VEHICLE
"gfx/hud/w_icon_melee", // MOD_CONC
"gfx/hud/w_icon_melee", // MOD_CONC_ALT
"hud/mod/generic", // MOD_FORCE_DARK
"hud/mod/i_icon_sentrygun", // MOD_SENTRY
"hud/mod/generic", // MOD_WATER
"hud/mod/generic", // MOD_SLIME
"hud/mod/generic", // MOD_LAVA
"hud/mod/generic", // MOD_CRUSH
"hud/mod/stun", // MOD_STUN_BATON
"hud/mod/melee", // MOD_MELEE
"hud/mod/saber", // MOD_SABER
"hud/mod/pistol", // MOD_BRYAR_PISTOL
"hud/mod/pistol", // MOD_BRYAR_PISTOL_ALT
"hud/mod/rifle", // MOD_BLASTER
"hud/mod/rifle", // MOD_TURBLAST
"hud/mod/disruptor", // MOD_DISRUPTOR
"hud/mod/disruptor", // MOD_DISRUPTOR_SPLASH
"hud/mod/disruptor_alt", // MOD_DISRUPTOR_SNIPER
"hud/mod/bowcaster", // MOD_BOWCASTER
"hud/mod/repeater", // MOD_REPEATER
"hud/mod/repeater_alt", // MOD_REPEATER_ALT
"hud/mod/repeater_alt", // MOD_REPEATER_ALT_SPLASH
"hud/mod/demp2", // MOD_DEMP2
"hud/mod/demp2_alt", // MOD_DEMP2_ALT
"hud/mod/flachette", // MOD_FLECHETTE
"hud/mod/flachette_alt", // MOD_FLECHETTE_ALT_SPLASH
"hud/mod/merrsonn", // MOD_ROCKET
"hud/mod/merrsonn", // MOD_ROCKET_SPLASH
"hud/mod/merrsonn_alt", // MOD_ROCKET_HOMING
"hud/mod/merrsonn_alt", // MOD_ROCKET_HOMING_SPLASH
"hud/mod/thermal", // MOD_THERMAL
"hud/mod/thermal_alt", // MOD_THERMAL_SPLASH
"hud/mod/mine", // MOD_TRIP_MINE_SPLASH
"hud/mod/mine", // MOD_TIMED_MINE_SPLASH
"hud/mod/detpack", // MOD_DET_PACK_SPLASH
"hud/mod/swoop", // MOD_VEHICLE
"hud/mod/concussion", // MOD_CONC
"hud/mod/concussion_alt", // MOD_CONC_ALT
"hud/mod/force", // MOD_FORCE_DARK
"hud/mod/portable_turret", // MOD_SENTRY
"hud/mod/water", // MOD_WATER
"hud/mod/ooze", // MOD_SLIME
"hud/mod/lava", // MOD_LAVA
"hud/mod/crushed", // MOD_CRUSH
"hud/mod/telefrag", // MOD_TELEFRAG
"hud/mod/generic", // MOD_FALLING
"hud/mod/fall", // MOD_FALLING
"hud/mod/generic", // MOD_SUICIDE
"hud/mod/generic", // MOD_TARGET_LASER
"hud/mod/generic", // MOD_TRIGGER_HURT
Expand Down

0 comments on commit 2c9e32c

Please sign in to comment.