Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/etlegacy/etlegacy
Browse files Browse the repository at this point in the history
  • Loading branch information
@jackeri
jackeri committed Mar 25, 2013
2 parents 17c3f56 + 926d915 commit 680d945
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 11 deletions.
2 changes: 1 addition & 1 deletion etmain/ui/ingame_main.menu
View file
Expand Up @@ -28,7 +28,7 @@ menuDef {
}

// Window //
WINDOW( "MAIN", 50 )
WINDOW( "^1Legacy", 50 )

// Buttons //
BUTTONEXT( 6, 32, WINDOW_WIDTH-12, 18, "VOTE", .3, 14, uiScript clientCheckVote ;
Expand Down
9 changes: 6 additions & 3 deletions etmain/ui/options_customise_hud.menu
View file
Expand Up @@ -8,7 +8,7 @@
#define WINDOW_X 16
#define WINDOW_Y 16
#define WINDOW_WIDTH 608 //400
#define WINDOW_HEIGHT 332
#define WINDOW_HEIGHT 356
#define GROUP_NAME "grpOptionsCustomiseHud"
//#define SUBWINDOW_WIDTH WINDOW_WIDTH-12

Expand All @@ -32,7 +32,7 @@ menuDef {

// Hud Display //
#define HUD_Y 32
SUBWINDOW( 6, HUD_Y, (SUBWINDOW_WIDTH_L), 136, "HUD DISPLAY" )
SUBWINDOW( 6, HUD_Y, (SUBWINDOW_WIDTH_L), 160, "HUD DISPLAY" )
YESNO( 8, HUD_Y+16, (SUBWINDOW_WIDTH_L)-4, 10, "Draw Gun:", .2, 8, "cg_drawGun", "Show gun model on-screen" )
YESNO( 8, HUD_Y+28, (SUBWINDOW_WIDTH_L)-4, 10, "Show Compass:", .2, 8, "cg_drawCompass", "Displays compass (with icons when near select events)" )
MULTI( 8, HUD_Y+40, (SUBWINDOW_WIDTH_L)-4, 10, "Mission Timer:", .2, 8, "cg_drawRoundTimer", cvarFloatList { "Off" 0 "On" 1 }, "Displays remaining mission time." )
Expand All @@ -43,9 +43,12 @@ menuDef {
MULTI( 8, HUD_Y+100, (SUBWINDOW_WIDTH_L)-4, 10, "Show Locations:", .2, 8, "cg_locations", cvarFloatList { "Cordinates Only" 0 "Names Fireteam Only" 1 "Names Team Chat Only" 2 "Team & Fireteam Chat" 3 }, "Displays locations in fireteam" )
YESNO( 8, HUD_Y+112, (SUBWINDOW_WIDTH_L)-4, 10, "Enable Flags:", .2, 8, "cg_countryflags", "Display players country flags in score board." )
YESNO( 8, HUD_Y+124, (SUBWINDOW_WIDTH_L)-4, 10, "Fireteam Latched Class:", .2, 8, "cg_fireteamLatchedClass", "Display Fireteam latched class." )
MULTI( 8, HUD_Y+136, (SUBWINDOW_WIDTH_L)-4, 10, "Switch HUD:", .2, 8, "cg_altHud", cvarFloatList { "Standard Hud" 0 "Alternate Hud 1" 1 "Alternate Hud 2" 2 }, "Switch between different HUD" )
MULTI( 8, HUD_Y+148, (SUBWINDOW_WIDTH_L)-4, 10, "Modify Alternate HUD:", .2, 8, "cg_altHudFlags", cvarFloatList { "Standard" 0 "Move Timers" 1 "Remove Ranks" 2 "Timer + Ranks" 3 }, "Customise Alternate HUD" )


// In-Game Display //
#define DISPLAY_Y 174
#define DISPLAY_Y 198
SUBWINDOW( 6, DISPLAY_Y, (SUBWINDOW_WIDTH_L), 125, "IN-GAME DISPLAY" )
MULTI( 8, DISPLAY_Y+16, (SUBWINDOW_WIDTH_L)-4, 10, "Ejecting Brass:", .2, 8, "cg_brassTime", cvarFloatList { "High" 15000 "Med" 2500 "Off" 0 }, "Sets the duration ejected bullet shells etc last for." )
SLIDER( 8, DISPLAY_Y+28, (SUBWINDOW_WIDTH_L)-4, 10, "Field Of View:", .2, 8, "cg_fov" 1.3 80 120, "BEST FOV (4:3) = 90 | (16:10) = 100.39 | (16:9) = 106.27" )
Expand Down
10 changes: 6 additions & 4 deletions etmain/ui/polish/options_customise_hud.menu
View file
Expand Up @@ -8,7 +8,7 @@
#define WINDOW_X 16
#define WINDOW_Y 16
#define WINDOW_WIDTH 608 //400
#define WINDOW_HEIGHT 332
#define WINDOW_HEIGHT 356
#define GROUP_NAME "grpOptionsCustomiseHud"
//#define SUBWINDOW_WIDTH WINDOW_WIDTH-12

Expand All @@ -32,7 +32,7 @@ menuDef {

// Hud Display //
#define HUD_Y 32
SUBWINDOW( 6, HUD_Y, (SUBWINDOW_WIDTH_L), 136, "WYGLAD HUD" )
SUBWINDOW( 6, HUD_Y, (SUBWINDOW_WIDTH_L), 160, "WYGLAD HUD" )
YESNO( 8, HUD_Y+16, (SUBWINDOW_WIDTH_L)-4, 10, "Pokaz Bron:", .2, 8, "cg_drawGun", "Pokazuj model broni" )
YESNO( 8, HUD_Y+28, (SUBWINDOW_WIDTH_L)-4, 10, "Pokaz Kompas:", .2, 8, "cg_drawCompass", "Wyswietl Kompas" )
MULTI( 8, HUD_Y+40, (SUBWINDOW_WIDTH_L)-4, 10, "Czas Misji:", .2, 8, "cg_drawRoundTimer", cvarFloatList { "Wylacz" 0 "Wlacz" 1 }, "Wyswietlaj pozostaly czas misji" )
Expand All @@ -43,9 +43,11 @@ menuDef {
MULTI( 8, HUD_Y+100, (SUBWINDOW_WIDTH_L)-4, 10, "Pokaz Lokacje:", .2, 8, "cg_locations", cvarFloatList { "Kordynaty Tylko" 0 "Nazwy Fire-Teamu Tylko" 1 "Nazwy Team Chatu Tylko" 2 "Team & Fireteam Chat" 3 }, "Wyswietl lokalizacje w Fire-Teamie" )
YESNO( 8, HUD_Y+112, (SUBWINDOW_WIDTH_L)-4, 10, "Wlacz Flagi:", .2, 8, "cg_countryflags", "Wyswietl flagi graczy na tablicy wynikow" )
YESNO( 8, HUD_Y+124, (SUBWINDOW_WIDTH_L)-4, 10, "Klasa w Fireteamie:", .2, 8, "cg_fireteamLatchedClass", "Pokazuj zmiany klas w firteamie." )

MULTI( 8, HUD_Y+136, (SUBWINDOW_WIDTH_L)-4, 10, "Zmiana HUD:", .2, 8, "cg_altHud", cvarFloatList { "Standardowy Hud" 0 "Alternatywny Hud 1" 1 "Alternatywny Hud 2" 2 }, "Zmieniaj pomiedzy innymi Hudami" )
MULTI( 8, HUD_Y+148, (SUBWINDOW_WIDTH_L)-4, 10, "Zmiana alternatywna HUD:", .2, 8, "cg_altHudFlags", cvarFloatList { "Standardowy" 0 "Przenies Czasy" 1 "Usun rangi" 2 "Czas + Rangi" 3 }, "Dostosuj alternatywny Hud" )

// In-Game Display //
#define DISPLAY_Y 174
#define DISPLAY_Y 198
SUBWINDOW( 6, DISPLAY_Y, (SUBWINDOW_WIDTH_L), 125, "WYGLAD W GRZE" )
MULTI( 8, DISPLAY_Y+16, (SUBWINDOW_WIDTH_L)-4, 10, "Wyswietlanie Lusek:", .2, 8, "cg_brassTime", cvarFloatList { "Wysokie" 15000 "Srednie" 2500 "Wylaczone" 0 }, "Ustaw dlugosc rysowania wypadajacych lusek" )
SLIDER( 8, DISPLAY_Y+28, (SUBWINDOW_WIDTH_L)-4, 10, "Pole Widzenia:", .2, 8, "cg_fov" 1.3 80 120, "BEST FOV (4:3) = 90 | (16:10) = 100.39 | (16:9) = 106.27" )
Expand Down
6 changes: 3 additions & 3 deletions etmain/ui/polish/options_graphics.menu
View file
Expand Up @@ -32,7 +32,7 @@ menuDef {
WINDOW( "GRAFIKA", 90 )

// Simple settings //
SUBWINDOW( 6, 32, (SUBWINDOW_WIDTH), 78, "PROSTE" )
SUBWINDOW( 6, 32, (SUBWINDOW_WIDTH), 114, "PROSTE" )
MULTIACTION( 8, 48, (SUBWINDOW_WIDTH)-4, 10, "Ogolna Jakosc:", .2, 8, "ui_glCustom", cvarFloatList { "najszybsza" 3 "szybka" 2 "normalna" 1 "mocna" 0 }, uiScript update "ui_glcustom", "" )
MULTIACTION( 8, 60, (SUBWINDOW_WIDTH)-4, 10, "Rozdzielczosc:", .2, 8, "ui_r_mode", cvarFloatList { "desktop resolution" -2 "640*480" 3 "800*600" 4 "960*720" 5 "1024*768" 6 "1152*864" 7 "1280*1024" 8 "1600*1200" 9 "2048*1536" 10 "856*480 Wide Screen" 11 "1360x768 (16:9)" 12 "1440x900 (16:10)" 13 "1680x1050 (16:10)" 14 "1600x1200" 15 "1920x1080 (16:9)" 16 "1920x1200 (16:10)" 17 "2560x1600 (16:10)" 18 }, uiScript glCustom, "" )
YESNOACTION( 8, 72, (SUBWINDOW_WIDTH)-4, 10, "Pelnyobraz:", .2, 8, "ui_r_fullscreen", uiScript glCustom, "" )
Expand All @@ -43,15 +43,15 @@ menuDef {
YESNOACTION( 8, 132, (SUBWINDOW_WIDTH)-4, 10, "Overbright Bits:", .2, 8, "r_overBrightBits", uiScript update "ui_glcustom", "Mapa swieci jasniej (wymagany vid_restart)" )

// Advanced settings //
SUBWINDOW( 6, 152, (SUBWINDOW_WIDTH), 256, "ZAAWANSOWANE" )
SUBWINDOW( 6, 152, (SUBWINDOW_WIDTH), 220, "ZAAWANSOWANE" )
YESNO( 8, 168, (SUBWINDOW_WIDTH)-4, 10, "Niebo Slabej Jakosci:", .2, 8, "r_fastsky", "Rysuj niebo z detalami lub proste" )
MULTIACTION( 8, 180, (SUBWINDOW_WIDTH)-4, 10, "Detale Cieni:", .2, 8, "ui_cg_shadows", cvarFloatList { "Brak (najsz.)" 0 "Blob (stary styl)" 1 "Wzorowe Cienie" 2 "Projektowe Cienie" 3 "Polygonowe Cienie" 4 }, uiScript glCustom, "" )
MULTIACTION( 8, 192, (SUBWINDOW_WIDTH)-4, 10, "Detale Textur:", .2, 8, "ui_r_picmip", cvarFloatList { "Niskie" 2 "Srednie" 1 "Mocne" 0 }, uiScript glCustom, "" )
// add options 0 - disabled, 1 - single path, 2 - path
YESNOACTION( 8, 204, (SUBWINDOW_WIDTH)-4, 10, "Dynamiczne Swiatla:", .2, 8, "ui_r_dynamiclight", uiScript glCustom; uiScript update "r_dynamicLight", "" )
// check this if ET supports same way
MULTIACTION( 8, 216, (SUBWINDOW_WIDTH)-4, 10, "Detale Geometryczne:", .2, 8, "ui_r_lodbias", cvarFloatList { "Niskie" 2 "Srednie" 1 "Mocne" 0 }, uiScript glCustom ; uiScript update "r_lodbias", "" )
MULTIACTION( 8, 128, (SUBWINDOW_WIDTH)-4, 10, "Jakosc Textur:", .2, 8, "ui_r_texturebits", cvarFloatList { "Domyslne" 0 "16-bit" 16 "32-bit" 32 }, uiScript glCustom, "" )
MULTIACTION( 8, 228, (SUBWINDOW_WIDTH)-4, 10, "Jakosc Textur:", .2, 8, "ui_r_texturebits", cvarFloatList { "Domyslne" 0 "16-bit" 16 "32-bit" 32 }, uiScript glCustom, "" )
// "GL_NEAREST" "GL_LINEAR" "GL_NEAREST_MIPMAP_NEAREST" "GL_LINEAR_MIPMAP_NEAREST" "GL_NEAREST_MIPMAP_LINEAR" "GL_LINEAR_MIPMAP_LINEAR"
MULTIACTION( 8, 240, (SUBWINDOW_WIDTH)-4, 10, "Filtrowanie Textur:", .2, 8, "ui_r_texturemode", cvarStrList { "Bilinear"; "GL_LINEAR_MIPMAP_NEAREST"; "Trilinear"; "GL_LINEAR_MIPMAP_LINEAR" }, uiScript glCustom, "" )
MULTIACTION( 8, 252, (SUBWINDOW_WIDTH)-4, 10, "Filtrowanie Anizotropoficzne:", .2, 8, "ui_r_ext_texture_filter_anisotropic", cvarFloatList { "Wylaczone" 0 "Srednie" 4 "Mocne" 8 }, uiScript glCustom, "" )
Expand Down

0 comments on commit 680d945

Please sign in to comment.