Merge pull request #13 from taysta/killfeed

Killfeed
taysta · Oct 5, 2023 · 0c734b5 · 0c734b5
2 parents 814cf8f + 645f9db
commit 0c734b5
Show file tree

Hide file tree

Showing 48 changed files with 814 additions and 296 deletions.
diff --git a/assets/japro/hud/mod/DEMP2.png b/assets/japro/hud/mod/DEMP2.png
diff --git a/assets/japro/hud/mod/DEMP2_alt.png b/assets/japro/hud/mod/DEMP2_alt.png
diff --git a/assets/japro/hud/mod/bowcaster.png b/assets/japro/hud/mod/bowcaster.png
diff --git a/assets/japro/hud/mod/concussion.png b/assets/japro/hud/mod/concussion.png
diff --git a/assets/japro/hud/mod/concussion_alt.png b/assets/japro/hud/mod/concussion_alt.png
diff --git a/assets/japro/hud/mod/crushed.png b/assets/japro/hud/mod/crushed.png
diff --git a/assets/japro/hud/mod/detpack.png b/assets/japro/hud/mod/detpack.png
diff --git a/assets/japro/hud/mod/disruptor.png b/assets/japro/hud/mod/disruptor.png
diff --git a/assets/japro/hud/mod/disruptor_alt.png b/assets/japro/hud/mod/disruptor_alt.png
diff --git a/assets/japro/hud/mod/fall.png b/assets/japro/hud/mod/fall.png
diff --git a/assets/japro/hud/mod/flachette.png b/assets/japro/hud/mod/flachette.png
diff --git a/assets/japro/hud/mod/flachette_alt.png b/assets/japro/hud/mod/flachette_alt.png
diff --git a/assets/japro/hud/mod/force.png b/assets/japro/hud/mod/force.png
diff --git a/assets/japro/hud/mod/generic.png b/assets/japro/hud/mod/generic.png
diff --git a/assets/japro/hud/mod/lava.png b/assets/japro/hud/mod/lava.png
diff --git a/assets/japro/hud/mod/melee.png b/assets/japro/hud/mod/melee.png
diff --git a/assets/japro/hud/mod/merrsonn.png b/assets/japro/hud/mod/merrsonn.png
diff --git a/assets/japro/hud/mod/merrsonn_alt.png b/assets/japro/hud/mod/merrsonn_alt.png
diff --git a/assets/japro/hud/mod/merrsonn_splash.png b/assets/japro/hud/mod/merrsonn_splash.png
diff --git a/assets/japro/hud/mod/mine.png b/assets/japro/hud/mod/mine.png
diff --git a/assets/japro/hud/mod/mine_alt.png b/assets/japro/hud/mod/mine_alt.png
diff --git a/assets/japro/hud/mod/ooze.png b/assets/japro/hud/mod/ooze.png
diff --git a/assets/japro/hud/mod/pistol.png b/assets/japro/hud/mod/pistol.png
diff --git a/assets/japro/hud/mod/pistol_alt.png b/assets/japro/hud/mod/pistol_alt.png
diff --git a/assets/japro/hud/mod/portable_turret.png b/assets/japro/hud/mod/portable_turret.png
diff --git a/assets/japro/hud/mod/repeater.png b/assets/japro/hud/mod/repeater.png
diff --git a/assets/japro/hud/mod/repeater_alt.png b/assets/japro/hud/mod/repeater_alt.png
diff --git a/assets/japro/hud/mod/rifle.png b/assets/japro/hud/mod/rifle.png
diff --git a/assets/japro/hud/mod/rifle_alt.png b/assets/japro/hud/mod/rifle_alt.png
diff --git a/assets/japro/hud/mod/saber.png b/assets/japro/hud/mod/saber.png
diff --git a/assets/japro/hud/mod/stun.png b/assets/japro/hud/mod/stun.png
diff --git a/assets/japro/hud/mod/swoop.png b/assets/japro/hud/mod/swoop.png
diff --git a/assets/japro/hud/mod/telefrag.png b/assets/japro/hud/mod/telefrag.png
diff --git a/assets/japro/hud/mod/thermal.png b/assets/japro/hud/mod/thermal.png
diff --git a/assets/japro/hud/mod/thermal_alt.png b/assets/japro/hud/mod/thermal_alt.png
diff --git a/assets/japro/hud/mod/turret.png b/assets/japro/hud/mod/turret.png
diff --git a/assets/japro/hud/mod/water.png b/assets/japro/hud/mod/water.png
diff --git a/codemp/cgame/CMakeLists.txt b/codemp/cgame/CMakeLists.txt
@@ -63,6 +63,7 @@ set(MPCGameCgameFiles
  "${MPDir}/cgame/cg_effects.c"
  "${MPDir}/cgame/cg_ents.c"
  "${MPDir}/cgame/cg_event.c"
+ "${MPDir}/cgame/cg_hud.c"
  "${MPDir}/cgame/cg_info.c"
  "${MPDir}/cgame/cg_light.c"
  "${MPDir}/cgame/cg_localents.c"
@@ -91,11 +92,14 @@ set(MPCGameCgameFiles
  "${MPDir}/cgame/fx_force.c"
  "${MPDir}/cgame/fx_heavyrepeater.c"
  "${MPDir}/cgame/fx_rocketlauncher.c"
+ "${MPDir}/cgame/hud_obituary.c"
+ "${MPDir}/cgame/hud_shared.c"
  "${MPDir}/cgame/animtable.h"
  "${MPDir}/cgame/cg_local.h"
  "${MPDir}/cgame/cg_public.h"
  "${MPDir}/cgame/cg_xcvar.h"
  "${MPDir}/cgame/fx_local.h"
+ "${MPDir}/cgame/hud_local.h"
  )
 source_group("cgame" FILES ${MPCGameCgameFiles})
 set(MPCGameFiles ${MPCGameFiles} ${MPCGameCgameFiles})

diff --git a/codemp/cgame/cg_draw.c b/codemp/cgame/cg_draw.c
@@ -7057,7 +7057,6 @@ void CG_AddSpeed(void)
 #define SPEEDOMETER_MIN_RANGE 900
 #define SPEED_MED 1000.f
 #define SPEED_FAST 1600.f
-#define Vector4Copy( a, b ) ((b)[0]=(a)[0],(b)[1]=(a)[1],(b)[2]=(a)[2],(b)[3]=(a)[3])
 #define VectorLerp( f, s, e, r ) ((r)[0]=(s)[0]+(f)*((e)[0]-(s)[0]),\
  (r)[1]=(s)[1]+(f)*((e)[1]-(s)[1]),\
  (r)[2]=(s)[2]+(f)*((e)[2]-(s)[2]))
@@ -11280,6 +11279,9 @@ static void CG_Draw2D( void ) {
  return;
  }
 
+ if(cg_killfeed.integer)
+ CG_Draw2DNew( );
+
  CG_Draw2DScreenTints();
 
  if (cg.snap->ps.rocketLockIndex != ENTITYNUM_NONE && (cg.time - cg.snap->ps.rocketLockTime) > 0)