diff options
26 files changed, 29 insertions, 188 deletions
diff --git a/assets/scripts/system_ui.shader b/assets/scripts/system_ui.shader index 4650ee0..33d9658 100644 --- a/assets/scripts/system_ui.shader +++ b/assets/scripts/system_ui.shader @@ -61,7 +61,7 @@ ui/assets/score_baseb scripts/loading_add { { - map ui/assets/loading_add.png + map ui/assets/loading_add.jpg blendfunc add } } @@ -69,7 +69,7 @@ scripts/loading_add scripts/stage_add { { - map ui/assets/stage_add.png + map ui/assets/stage_add.jpg blendfunc add } } @@ -77,7 +77,7 @@ scripts/stage_add scripts/main_add { { - map ui/assets/main_add.png + map ui/assets/main_add.jpg blendfunc add } } @@ -85,7 +85,7 @@ scripts/main_add scripts/main_add_pulse { { - map ui/assets/main_add_pulse.png + map ui/assets/main_add_pulse.jpg blendfunc add rgbGen wave sin 0.6 .7 5 0.2 } @@ -94,7 +94,7 @@ scripts/main_add_pulse scripts/scoreaddlight { { - map ui/assets/score_flicker.png + map ui/assets/score_flicker.jpg blendfunc add rgbGen wave sin 0.4 1 8 0.1 } @@ -103,7 +103,7 @@ scripts/scoreaddlight scripts/scoreadd { { - map ui/assets/score_add.png + map ui/assets/score_add.jpg blendfunc add } } @@ -158,12 +158,12 @@ gfx/misc/yaltsedges scripts/ye_full { { - map ui/assets/ye_full.png + map ui/assets/ye_full.jpg blendfunc add } { - map ui/assets/ye_full.png + map ui/assets/ye_full.jpg blendfunc add rgbGen wave sin 0.1 0.2 0 15 } diff --git a/assets/ui/assets/loading_add.jpg b/assets/ui/assets/loading_add.jpg Binary files differnew file mode 100644 index 0000000..4174e0d --- /dev/null +++ b/assets/ui/assets/loading_add.jpg diff --git a/assets/ui/assets/main_add.jpg b/assets/ui/assets/main_add.jpg Binary files differnew file mode 100644 index 0000000..d9cdd94 --- /dev/null +++ b/assets/ui/assets/main_add.jpg diff --git a/assets/ui/assets/main_add_pulse.jpg b/assets/ui/assets/main_add_pulse.jpg Binary files differnew file mode 100644 index 0000000..e913a98 --- /dev/null +++ b/assets/ui/assets/main_add_pulse.jpg diff --git a/assets/ui/assets/main_base.jpg b/assets/ui/assets/main_base.jpg Binary files differnew file mode 100644 index 0000000..a39fa2c --- /dev/null +++ b/assets/ui/assets/main_base.jpg diff --git a/assets/ui/assets/score_add.jpg b/assets/ui/assets/score_add.jpg Binary files differnew file mode 100644 index 0000000..a2d1223 --- /dev/null +++ b/assets/ui/assets/score_add.jpg diff --git a/assets/ui/assets/score_flicker.jpg b/assets/ui/assets/score_flicker.jpg Binary files differnew file mode 100644 index 0000000..8e41bef --- /dev/null +++ b/assets/ui/assets/score_flicker.jpg diff --git a/assets/ui/assets/stage_add.jpg b/assets/ui/assets/stage_add.jpg Binary files differnew file mode 100644 index 0000000..e93b598 --- /dev/null +++ b/assets/ui/assets/stage_add.jpg diff --git a/assets/ui/connect.menu b/assets/ui/connect.menu index 45c62d6..44a7568 100644 --- a/assets/ui/connect.menu +++ b/assets/ui/connect.menu @@ -31,17 +31,7 @@ background "ui/menu_main_aurora_base" decoration } - - itemDef - { - name "dist" - style WINDOW_STYLE_SHADER - rect 0 13 640 440 - visible 1 - background "gfx/edge/basi_invisble_overlay" - decoration - } - + itemDef { name window diff --git a/assets/ui/createserver.menu b/assets/ui/createserver.menu index 9ebe65d..ebd6ef5 100644 --- a/assets/ui/createserver.menu +++ b/assets/ui/createserver.menu @@ -80,17 +80,7 @@ background "ui/menu_main_aurora_base" decoration } - - itemDef - { - name "dist" - style WINDOW_STYLE_SHADER - rect 0 13 640 440 - visible 1 - background "gfx/edge/basi_invisble_overlay" - decoration - } - + itemDef { name window diff --git a/assets/ui/ingame.menu b/assets/ui/ingame.menu index 033e6f1..8dd9b6c 100644 --- a/assets/ui/ingame.menu +++ b/assets/ui/ingame.menu @@ -39,16 +39,6 @@ menuDef itemDef { - name "dist" - style WINDOW_STYLE_SHADER - rect -250 0 1000 480 - visible 1 - background "gfx/edge/basi_invisble_overlay" - decoration - } - - itemDef - { name "edgesplash" rect 250 50 680 680 type ITEM_TYPE_MODEL @@ -231,4 +221,4 @@ menuDef open ingame_leave } } -}
\ No newline at end of file +} diff --git a/assets/ui/ingame_game.menu b/assets/ui/ingame_game.menu index 76d4ed6..3af0a4b 100644 --- a/assets/ui/ingame_game.menu +++ b/assets/ui/ingame_game.menu @@ -44,16 +44,6 @@ background "ui/menu_main_aurora_base" decoration } - - itemDef - { - name "dist" - style WINDOW_STYLE_SHADER - rect -50 -150 1000 600 - visible 1 - background "gfx/edge/basi_invisble_overlay" - decoration - } itemDef { diff --git a/assets/ui/ingame_ignore.menu b/assets/ui/ingame_ignore.menu index ec56a3a..aae8d0f 100644 --- a/assets/ui/ingame_ignore.menu +++ b/assets/ui/ingame_ignore.menu @@ -121,16 +121,6 @@ background "ui/menu_main_aurora_base" decoration } - - itemDef - { - name "dist" - style WINDOW_STYLE_SHADER - rect -50 -150 1000 600 - visible 1 - background "gfx/edge/basi_invisble_overlay" - decoration - } itemDef { diff --git a/assets/ui/ingame_leave.menu b/assets/ui/ingame_leave.menu index 7aaa94a..be68711 100644 --- a/assets/ui/ingame_leave.menu +++ b/assets/ui/ingame_leave.menu @@ -43,16 +43,6 @@ background "ui/menu_main_aurora_base" decoration } - - itemDef - { - name "dist" - style WINDOW_STYLE_SHADER - rect -50 -150 1000 600 - visible 1 - background "gfx/edge/basi_invisble_overlay" - decoration - } itemDef { diff --git a/assets/ui/ingame_map.menu b/assets/ui/ingame_map.menu index 669cc11..71b2cff 100644 --- a/assets/ui/ingame_map.menu +++ b/assets/ui/ingame_map.menu @@ -40,16 +40,6 @@ background "ui/menu_main_aurora_base" decoration } - - itemDef - { - name "dist" - style WINDOW_STYLE_SHADER - rect -250 0 1000 480 - visible 1 - background "gfx/edge/basi_invisble_overlay" - decoration - } itemDef { @@ -101,4 +91,4 @@ } } } -}
\ No newline at end of file +} diff --git a/assets/ui/ingame_map19201080.menu b/assets/ui/ingame_map19201080.menu index f69ce55..f551a25 100644 --- a/assets/ui/ingame_map19201080.menu +++ b/assets/ui/ingame_map19201080.menu @@ -44,16 +44,6 @@ background "ui/menu_main_aurora_base" decoration } - - itemDef - { - name "dist" - style WINDOW_STYLE_SHADER - rect -50 0 1000 480 - visible 1 - background "gfx/edge/basi_invisble_overlay" - decoration - } itemDef { @@ -211,4 +201,4 @@ decoration } } -}
\ No newline at end of file +} diff --git a/assets/ui/ingame_map640480.menu b/assets/ui/ingame_map640480.menu index 9d6790e..ef89470 100644 --- a/assets/ui/ingame_map640480.menu +++ b/assets/ui/ingame_map640480.menu @@ -44,16 +44,6 @@ background "ui/menu_main_aurora_base" decoration } - - itemDef - { - name "dist" - style WINDOW_STYLE_SHADER - rect -250 0 1000 480 - visible 1 - background "gfx/edge/basi_invisble_overlay" - decoration - } itemDef { @@ -213,4 +203,4 @@ decoration } } -}
\ No newline at end of file +} diff --git a/assets/ui/ingame_options.menu b/assets/ui/ingame_options.menu index 9dbae40..011a957 100644 --- a/assets/ui/ingame_options.menu +++ b/assets/ui/ingame_options.menu @@ -66,16 +66,6 @@ background "ui/menu_main_aurora_base" decoration } - - itemDef - { - name "dist" - style WINDOW_STYLE_SHADER - rect -250 -150 1000 600 - visible 1 - background "gfx/edge/basi_invisble_overlay" - decoration - } itemDef { diff --git a/assets/ui/ingame_robot.menu b/assets/ui/ingame_robot.menu index c9c1e02..7dee5de 100644 --- a/assets/ui/ingame_robot.menu +++ b/assets/ui/ingame_robot.menu @@ -41,16 +41,6 @@ background "ui/menu_main_aurora_base" decoration } - - itemDef - { - name "dist" - style WINDOW_STYLE_SHADER - rect -150 -150 1000 600 - visible 1 - background "gfx/edge/basi_invisble_overlay" - decoration - } itemDef { diff --git a/assets/ui/ingame_sbrowser.menu b/assets/ui/ingame_sbrowser.menu index 4a8a9f2..02c86c8 100644 --- a/assets/ui/ingame_sbrowser.menu +++ b/assets/ui/ingame_sbrowser.menu @@ -86,16 +86,6 @@ background "ui/menu_main_aurora_base" decoration } - - itemDef - { - name "dist" - style WINDOW_STYLE_SHADER - rect -250 0 1000 480 - visible 1 - background "gfx/edge/basi_invisble_overlay" - decoration - } itemDef { @@ -575,4 +565,4 @@ uiScript JoinServer } } -}
\ No newline at end of file +} diff --git a/assets/ui/ingame_yehelp.menu b/assets/ui/ingame_yehelp.menu index a9f9aa7..47f857c 100644 --- a/assets/ui/ingame_yehelp.menu +++ b/assets/ui/ingame_yehelp.menu @@ -39,16 +39,7 @@ background "ui/menu_main_aurora_base" decoration } - - itemDef - { - name "dist" - style WINDOW_STYLE_SHADER - rect -250 0 1000 480 - visible 1 - background "gfx/edge/basi_invisble_overlay" - decoration - } + } itemDef { @@ -84,4 +75,4 @@ decoration } } -}
\ No newline at end of file +} diff --git a/assets/ui/joinserver.menu b/assets/ui/joinserver.menu index 8cc370f..8656b13 100644 --- a/assets/ui/joinserver.menu +++ b/assets/ui/joinserver.menu @@ -86,17 +86,7 @@ background "ui/menu_main_aurora_base" decoration } - - itemDef - { - name "dist" - style WINDOW_STYLE_SHADER - rect 0 13 640 440 - visible 1 - background "gfx/edge/basi_invisble_overlay" - decoration - } - + itemDef { name window @@ -609,4 +599,4 @@ uiScript JoinServer } } -}
\ No newline at end of file +} diff --git a/assets/ui/loading.menu b/assets/ui/loading.menu index 458b245..d4e0e05 100644 --- a/assets/ui/loading.menu +++ b/assets/ui/loading.menu @@ -86,17 +86,7 @@ background "ui/menu_main_aurora_base" decoration } - - itemDef - { - name "dist" - style WINDOW_STYLE_SHADER - rect 0 13 640 440 - visible 1 - background "gfx/edge/basi_invisble_overlay" - decoration - } - + itemDef { name window diff --git a/assets/ui/main.menu b/assets/ui/main.menu index df08bef..23907b7 100644 --- a/assets/ui/main.menu +++ b/assets/ui/main.menu @@ -48,16 +48,6 @@ decoration } - itemDef - { - name "dist" - style WINDOW_STYLE_SHADER - rect 0 13 640 440 - visible 1 - background "gfx/edge/basi_invisble_overlay" - decoration - } - itemDef { name window diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c index c2be336..e59cf8a 100644 --- a/src/cgame/cg_servercmds.c +++ b/src/cgame/cg_servercmds.c @@ -1012,12 +1012,12 @@ static void CG_Say( int clientNum, saymode_t mode, const char *text ) switch( mode ) { case SAY_ALL: - CG_Printf( "%s%s" S_COLOR_WHITE "%s %c" S_COLOR_GREEN "%s\n", - prefix, name, maybeColon, INDENT_MARKER, text ); + CG_Printf( "%s%s" S_COLOR_WHITE "%s " S_COLOR_GREEN "%s\n", + prefix, name, maybeColon, text ); break; case SAY_TEAM: - CG_Printf( "%s(%s" S_COLOR_WHITE ")%s%s %c" S_COLOR_CYAN "%s\n", - prefix, name, location, maybeColon, INDENT_MARKER, text ); + CG_Printf( "%s(%s" S_COLOR_WHITE ")%s%s " S_COLOR_CYAN "%s\n", + prefix, name, location, maybeColon, text ); break; case SAY_ADMINS: case SAY_ADMINS_PUBLIC: @@ -1027,15 +1027,15 @@ static void CG_Say( int clientNum, saymode_t mode, const char *text ) name, maybeColon, INDENT_MARKER, text ); break; case SAY_AREA: - CG_Printf( "%s<%s" S_COLOR_WHITE ">%s%s %c" S_COLOR_BLUE "%s\n", - prefix, name, location, maybeColon, INDENT_MARKER, text ); + CG_Printf( "%s<%s" S_COLOR_WHITE ">%s%s " S_COLOR_BLUE "%s\n", + prefix, name, location, maybeColon, text ); break; case SAY_PRIVMSG: case SAY_TPRIVMSG: color = ( mode == SAY_TPRIVMSG ) ? S_COLOR_CYAN : S_COLOR_GREEN; - CG_Printf( "%s[%s" S_COLOR_WHITE " -> %s" S_COLOR_WHITE "]%s %c%s%s\n", + CG_Printf( "%s[%s" S_COLOR_WHITE " -> %s" S_COLOR_WHITE "]%s %s%s\n", prefix, name, cgs.clientinfo[ cg.clientNum ].name, - maybeColon, INDENT_MARKER, color, text ); + maybeColon, color, text ); CG_CenterPrint( va( "%sPrivate message from: " S_COLOR_WHITE "%s", color, name ), 200, GIANTCHAR_WIDTH * 4 ); break; diff --git a/src/game/bg_public.h b/src/game/bg_public.h index f377739..9a2d464 100644 --- a/src/game/bg_public.h +++ b/src/game/bg_public.h @@ -32,7 +32,7 @@ TREMULOUS EDGE MOD SRC FILE // because games can change separately from the main system version, we need a // second version that must match between game and cgame -#define GAME_VERSION "base" +#define GAME_VERSION "newedge" #define DEFAULT_GRAVITY 800 #define VOTE_TIME 30000 // 30 seconds before vote times out |
