diff --git a/Projects/Android/jni/rtcw/src/ui/ui_main.c b/Projects/Android/jni/rtcw/src/ui/ui_main.c index 93e119a..dcdbb7a 100644 --- a/Projects/Android/jni/rtcw/src/ui/ui_main.c +++ b/Projects/Android/jni/rtcw/src/ui/ui_main.c @@ -4490,6 +4490,7 @@ UI_RunMenuScript ============== */ +qboolean showCredits = qtrue; static void UI_RunMenuScript( char **args ) { const char *name, *name2; char buff[1024]; @@ -4775,8 +4776,14 @@ static void UI_RunMenuScript( char **args ) { } //#endif // #ifdef MISSIONPACK } else if ( Q_stricmp( name, "Quit" ) == 0 ) { - trap_Cvar_Set( "ui_singlePlayerActive", "0" ); - trap_Cmd_ExecuteText( EXEC_NOW, "quit" ); + if (showCredits) { + showCredits = qfalse; + Menus_CloseAll(); + Menus_OpenByName( "credits" ); + } else { + trap_Cvar_Set( "ui_singlePlayerActive", "0" ); + trap_Cmd_ExecuteText( EXEC_NOW, "quit" ); + } } else if ( Q_stricmp( name, "Controls" ) == 0 ) { trap_Cvar_Set( "cl_paused", "1" ); trap_Key_SetCatcher( KEYCATCH_UI ); diff --git a/Projects/Android/z_vr_assets/ui/credits.menu b/Projects/Android/z_vr_assets/ui/credits.menu new file mode 100644 index 0000000..0e23a7b --- /dev/null +++ b/Projects/Android/z_vr_assets/ui/credits.menu @@ -0,0 +1,244 @@ +#include "ui/menudef.h" +{ + +menuDef { + name "credits" + fullScreen 1 + rect 0 0 640 480 + visible 1 + focusColor 1 1 1 1 + style 0 + onESC { uiScript Quit } + +itemDef { + name none + style WINDOW_STYLE_SHADER + rect 0 0 640 480 + background "gfx/2d/backtile" + forecolor 0 0 0 1 + backcolor 0 0 0 1 + visible 1 + decoration +} + +itemDef { + name none + type ITEM_TYPE_TEXT + rect 0 15 640 40 + text "RTCWQuest by Team Beef" + forecolor 1 0 0 1 + textscale .4 + textalign ITEM_ALIGN_CENTER + textalignx 320 + textaligny 10 + visible 1 + decoration +} + +itemDef { + name none + type ITEM_TYPE_TEXT + rect 0 35 640 40 + text "====================" + forecolor 1 1 1 1 + textscale .4 + textalign ITEM_ALIGN_CENTER + textalignx 320 + textaligny 10 + visible 1 + decoration +} + +itemDef { + name none + type ITEM_TYPE_TEXT + rect 0 70 640 40 + text "Team Beef are DrBeef, Baggyg, Bummser" + forecolor 0 0 1 1 + textscale .4 + textalign ITEM_ALIGN_CENTER + textalignx 320 + textaligny 10 + visible 1 + decoration +} + +itemDef { + name none + type ITEM_TYPE_TEXT + rect 0 120 640 40 + text "Lead programmer" + forecolor 1 0 0 1 + textscale .4 + textalign ITEM_ALIGN_CENTER + textalignx 320 + textaligny 10 + visible 1 + decoration +} + +itemDef { + name none + type ITEM_TYPE_TEXT + rect 0 140 640 40 + text "DrBeef" + forecolor 1 1 1 1 + textscale .3 + textalign ITEM_ALIGN_CENTER + textalignx 320 + textaligny 10 + visible 1 + decoration +} + +itemDef { + name none + type ITEM_TYPE_TEXT + rect 0 170 640 40 + text "Additional Development Contributions" + forecolor 1 0 0 1 + textscale .4 + textalign ITEM_ALIGN_CENTER + textalignx 320 + textaligny 10 + visible 1 + decoration +} + +itemDef { + name none + type ITEM_TYPE_TEXT + rect 0 190 640 40 + text "Baggyg, Eigenlaut, MuadDib" + forecolor 1 1 1 1 + textscale .3 + textalign ITEM_ALIGN_CENTER + textalignx 320 + textaligny 10 + visible 1 + decoration +} + +itemDef { + name none + type ITEM_TYPE_TEXT + rect 0 220 640 40 + text "VR Compatible Weapon Models" + forecolor 1 0 0 1 + textscale .4 + textalign ITEM_ALIGN_CENTER + textalignx 320 + textaligny 10 + visible 1 + decoration +} + +itemDef { + name none + type ITEM_TYPE_TEXT + rect 0 240 640 40 + text "Dark Matter Productions and William Faure" + forecolor 1 1 1 1 + textscale .3 + textalign ITEM_ALIGN_CENTER + textalignx 320 + textaligny 10 + visible 1 + decoration +} + +itemDef { + name none + type ITEM_TYPE_TEXT + rect 0 310 640 40 + text "With Special Thanks to:" + forecolor 1 0 0 1 + textscale .4 + textalign ITEM_ALIGN_CENTER + textalignx 320 + textaligny 10 + visible 1 + decoration +} + +itemDef { + name none + type ITEM_TYPE_TEXT + rect 0 340 640 40 + text "Emile Belanger for providing the android port upon which this is based," + forecolor 1 1 1 1 + textscale .3 + textalign ITEM_ALIGN_CENTER + textalignx 320 + textaligny 10 + visible 1 + decoration +} + +itemDef { + name none + type ITEM_TYPE_TEXT + rect 0 360 640 40 + text "HellBaron for allowing us to provide a custom version of his excellent Venom Mod," + forecolor 1 1 1 1 + textscale .3 + textalign ITEM_ALIGN_CENTER + textalignx 320 + textaligny 10 + visible 1 + decoration +} + +itemDef { + name none + type ITEM_TYPE_TEXT + rect 0 380 640 40 + text "ptitSeb for the OpenGL => OpenGLES2 translation making this project possible," + forecolor 1 1 1 1 + textscale .3 + textalign ITEM_ALIGN_CENTER + textalignx 320 + textaligny 10 + visible 1 + decoration +} + +itemDef { + name none + type ITEM_TYPE_TEXT + rect 0 400 640 40 + text "Team Beef patrons and all Team Beef discord members for supporting us." + forecolor 1 1 1 1 + textscale .3 + textalign ITEM_ALIGN_CENTER + textalignx 320 + textaligny 10 + visible 1 + decoration +} + +itemDef { + name none + type ITEM_TYPE_TEXT + rect 0 455 640 40 + text "Join our Patreon: patreon.com/teambeef" + forecolor 1 0 0 1 + textscale .4 + textalign ITEM_ALIGN_CENTER + textalignx 320 + textaligny 10 + visible 1 + decoration +} + +itemDef { + name none + style WINDOW_STYLE_EMPTY + type ITEM_TYPE_BUTTON + rect 0 0 640 480 + visible 1 + action { uiScript Quit } +} + +} // end menudef +} // end all diff --git a/Projects/Android/z_vr_assets/ui/ingame.txt b/Projects/Android/z_vr_assets/ui/ingame.txt index 08c9802..01a8c83 100644 --- a/Projects/Android/z_vr_assets/ui/ingame.txt +++ b/Projects/Android/z_vr_assets/ui/ingame.txt @@ -26,4 +26,6 @@ loadMenu { "ui/ingame_help.menu" } loadMenu { "ui/cheats.menu" } + + loadMenu { "ui/credits.menu" } } diff --git a/Projects/Android/z_vr_assets/ui/menus.txt b/Projects/Android/z_vr_assets/ui/menus.txt new file mode 100644 index 0000000..5d9e2de --- /dev/null +++ b/Projects/Android/z_vr_assets/ui/menus.txt @@ -0,0 +1,52 @@ +// menu defs +// +{ + loadMenu { "ui/main.menu" } +// loadMenu { "ui/joinserver.menu" } // NERVE - SMF - commented in for multiplayer + loadMenu { "ui/setup.menu" } + loadMenu { "ui/controls.menu" } + loadMenu { "ui/cdkey.menu" } + loadMenu { "ui/system.menu" } + loadMenu { "ui/options.menu" } +// loadMenu { "ui/cinematicmenu.menu" } + loadMenu { "ui/credit.menu" } + loadMenu { "ui/connect.menu" } + loadMenu { "ui/quit.menu" } + loadMenu { "ui/vid_restart.menu" } + loadMenu { "ui/snd_restart.menu" } + loadMenu { "ui/rec_restart.menu" } + loadMenu { "ui/default.menu" } + loadMenu { "ui/error.menu" } + loadMenu { "ui/serverinfo.menu" } + loadMenu { "ui/quitcredit.menu" } + loadMenu { "ui/resetscore.menu" } + loadMenu { "ui/multiplayer_pop.menu" } + + loadMenu { "ui/play.menu" } // (mx) added + loadMenu { "ui/load.menu" } // (mx) added +// loadMenu { "ui/multiplayer.menu" } // (mx) added + + loadMenu { "ui/briefing.menu" } //----(SA) added + + + +// (SA) removed old q3a stuff so we don't get so many yellow startup warnings +// loadMenu { "ui/player.menu" } +// loadMenu { "ui/fight.menu" } +// loadMenu { "ui/skirmish.menu" } +// loadMenu { "ui/createserver.menu" } +// loadMenu { "ui/help.menu" } +// loadMenu { "ui/ordershelp.menu" } +// loadMenu { "ui/mod.menu" } +// loadMenu { "ui/demo.menu" } +// loadMenu { "ui/demo_quit.menu" } +// loadMenu { "ui/powerup.menu" } +// loadMenu { "ui/password.menu" } +// loadMenu { "ui/quake3.menu" } +// loadMenu { "ui/addfilter.menu" } +// loadMenu { "ui/findplayer.menu" } +// loadMenu { "ui/endofgame.menu" } +// loadMenu { "ui/createfavorite.menu" } + + loadMenu { "ui/credits.menu" } +}