diff --git a/Source/client/cstrike.src b/Source/client/cstrike.src index 304baf92..93d95af8 100755 --- a/Source/client/cstrike.src +++ b/Source/client/cstrike.src @@ -1,5 +1,5 @@ #pragma target fte -#pragma progs_dat "../../cstrike/csprogs.dat" +#pragma progs_dat "../../cstrike/data.pk3dir/csprogs.dat" #define CSQC #define CSTRIKE diff --git a/Source/client/events.c b/Source/client/events.c index f451980c..b2408ba9 100644 --- a/Source/client/events.c +++ b/Source/client/events.c @@ -16,23 +16,27 @@ Spawns a shell tempentity. Looking fancy void Event_EjectShell(void) { static void Event_EjectShell_Death(void) { - remove( self ); + remove(self); } - vector vOrigin = pSeat->vPlayerOrigin; - vector vEndPos = gettaginfo( pSeat->eViewModel, pSeat->fEjectBone ); - makevectors( view_angles ); + vector vOrigin = pSeat->vPlayerOrigin + [0, 0, getstatf(STAT_VIEWHEIGHT)]; + vector vEndPos = gettaginfo(pSeat->eViewModel, pSeat->fEjectBone); + makevectors(view_angles); - vOrigin += ( v_forward * vEndPos_x ) + ( v_right * -vEndPos_y ) + ( v_up * vEndPos_z ) + [ 0, 0, getstatf( STAT_VIEWHEIGHT ) ]; + vOrigin += (v_forward * vEndPos[0]); + vOrigin += (v_right * -vEndPos[1]); + vOrigin += (v_up * vEndPos[2]) ; entity eShell = spawn(); - setorigin( eShell, vOrigin ); + setorigin(eShell, vOrigin); #ifdef CSTRIKE - setmodel( eShell, sShellModel[ wptTable[ getstati( STAT_ACTIVEWEAPON ) ].iShellType ] ); + setmodel(eShell, sShellModel[wptTable[getstati(STAT_ACTIVEWEAPON)].iShellType]); #endif eShell.movetype = MOVETYPE_BOUNCE; eShell.drawmask = MASK_ENGINE; - eShell.angles = [ view_angles_x, view_angles_y, 0 ]; - eShell.velocity = pSeat->vPlayerVelocity + ( v_up * random( 70, 120 ) ) + ( v_right * -random( 50, 70 ) ); + eShell.angles = [view_angles[0], view_angles[1], 0]; + eShell.velocity = pSeat->vPlayerVelocity; + eShell.velocity += (v_up * random(70, 120)); + eShell.velocity += (v_right * -random(50, 70)); eShell.avelocity = [0,45,900]; eShell.think = Event_EjectShell_Death; eShell.nextthink = time + 2.5f; @@ -46,33 +50,33 @@ Called by the engine whenever a model tries to play an event. ==================== */ -void Event_ProcessModel( float fTimeStamp, int iCode, string sData ) +void Event_ProcessModel(float fTimeStamp, int iCode, string sData) { - if ( iCode == 5004 ) { - localsound( sData, CHAN_AUTO, 1.0 ); - } else if ( iCode == 5001 ) { + if (iCode == 5004) { + localsound(sData, CHAN_AUTO, 1.0); + } else if (iCode == 5001) { pSeat->eMuzzleflash.alpha = 1.0f; pSeat->eMuzzleflash.scale = 0.5; pSeat->eMuzzleflash.skin = pSeat->fNumBones; - setmodel( pSeat->eMuzzleflash, sprintf( "sprites/muzzleflash%s.spr", substring( sData, 1, 1 ) ) ); + setmodel(pSeat->eMuzzleflash, sprintf("sprites/muzzleflash%s.spr", substring(sData, 1, 1))); Event_EjectShell(); - } else if( iCode == 5011 ) { + } else if(iCode == 5011) { pSeat->eMuzzleflash.alpha = 1.0f; pSeat->eMuzzleflash.scale = 0.5; pSeat->eMuzzleflash.skin = pSeat->fNumBones + 1; - setmodel( pSeat->eMuzzleflash, sprintf( "sprites/muzzleflash%s.spr", substring( sData, 1, 1 ) ) ); + setmodel(pSeat->eMuzzleflash, sprintf("sprites/muzzleflash%s.spr", substring(sData, 1, 1))); Event_EjectShell(); - } else if ( iCode == 5021 ) { + } else if (iCode == 5021) { pSeat->eMuzzleflash.alpha = 1.0f; pSeat->eMuzzleflash.scale = 0.5; pSeat->eMuzzleflash.skin = pSeat->fNumBones + 2; - setmodel( pSeat->eMuzzleflash, sprintf( "sprites/muzzleflash%s.spr", substring( sData, 1, 1 ) ) ); + setmodel(pSeat->eMuzzleflash, sprintf("sprites/muzzleflash%s.spr", substring(sData, 1, 1))); Event_EjectShell(); - } else if ( iCode == 5031 ) { + } else if (iCode == 5031) { pSeat->eMuzzleflash.alpha = 1.0f; pSeat->eMuzzleflash.scale = 0.5; pSeat->eMuzzleflash.skin = pSeat->fNumBones + 3; - setmodel( pSeat->eMuzzleflash, sprintf( "sprites/muzzleflash%s.spr", substring( sData, 1, 1 ) ) ); + setmodel(pSeat->eMuzzleflash, sprintf("sprites/muzzleflash%s.spr", substring(sData, 1, 1))); Event_EjectShell(); } } diff --git a/Source/client/rewolf.src b/Source/client/rewolf.src index 267fd73c..c1a2888b 100755 --- a/Source/client/rewolf.src +++ b/Source/client/rewolf.src @@ -1,5 +1,5 @@ #pragma target fte -#pragma progs_dat "../../rewolf/csprogs.dat" +#pragma progs_dat "../../rewolf/data.pk3dir/csprogs.dat" #define CSQC #define VALVE diff --git a/Source/client/scihunt.src b/Source/client/scihunt.src index 93d79ce8..47db7ac8 100644 --- a/Source/client/scihunt.src +++ b/Source/client/scihunt.src @@ -1,5 +1,5 @@ #pragma target fte -#pragma progs_dat "../../scihunt/csprogs.dat" +#pragma progs_dat "../../scihunt/data.pk3dir/csprogs.dat" #define CSQC #define VALVE diff --git a/Source/client/valve.src b/Source/client/valve.src index 12589bc7..d60c47e1 100755 --- a/Source/client/valve.src +++ b/Source/client/valve.src @@ -1,5 +1,5 @@ #pragma target fte -#pragma progs_dat "../../valve/csprogs.dat" +#pragma progs_dat "../../valve/data.pk3dir/csprogs.dat" #define CSQC #define VALVE diff --git a/Source/gs-entbase/server.src b/Source/gs-entbase/server.src index c4fcdb49..ff18a2d7 100644 --- a/Source/gs-entbase/server.src +++ b/Source/gs-entbase/server.src @@ -24,6 +24,7 @@ ../gs-entbase/server/func_illusionary.cpp ../gs-entbase/server/func_ladder.cpp ../gs-entbase/server/func_train.cpp +../gs-entbase/server/func_pushable.cpp ../gs-entbase/server/func_wall.cpp ../gs-entbase/server/func_wall_toggle.cpp ../gs-entbase/server/func_conveyor.cpp diff --git a/Source/gs-entbase/server/func_pushable.cpp b/Source/gs-entbase/server/func_pushable.cpp new file mode 100644 index 00000000..5dacc625 --- /dev/null +++ b/Source/gs-entbase/server/func_pushable.cpp @@ -0,0 +1,4 @@ +class func_pushable:func_breakable +{ + +}; diff --git a/Source/menu-fn/progs.src b/Source/menu-fn/progs.src index f939657f..06114de8 100644 --- a/Source/menu-fn/progs.src +++ b/Source/menu-fn/progs.src @@ -1,5 +1,5 @@ #pragma target fte -#pragma progs_dat "../../valve/menu.dat" +#pragma progs_dat "../../valve/data.pk3dir/menu.dat" #define MENU diff --git a/Source/server/cstrike.src b/Source/server/cstrike.src index 17d4d8d4..f6f5b513 100755 --- a/Source/server/cstrike.src +++ b/Source/server/cstrike.src @@ -1,5 +1,5 @@ #pragma target fte -#pragma progs_dat "../../cstrike/progs.dat" +#pragma progs_dat "../../cstrike/data.pk3dir/progs.dat" #define QWSSQC #define CSTRIKE diff --git a/Source/server/rewolf.src b/Source/server/rewolf.src index de1fdbf3..1655e2b1 100755 --- a/Source/server/rewolf.src +++ b/Source/server/rewolf.src @@ -1,5 +1,5 @@ #pragma target fte -#pragma progs_dat "../../rewolf/progs.dat" +#pragma progs_dat "../../rewolf/data.pk3dir/progs.dat" #define QWSSQC #define VALVE diff --git a/Source/server/scihunt.src b/Source/server/scihunt.src index 71fe916f..cd6d3b72 100755 --- a/Source/server/scihunt.src +++ b/Source/server/scihunt.src @@ -1,5 +1,5 @@ #pragma target fte -#pragma progs_dat "../../scihunt/progs.dat" +#pragma progs_dat "../../scihunt/data.pk3dir/progs.dat" #define QWSSQC #define VALVE diff --git a/Source/server/valve.src b/Source/server/valve.src index 175f28d2..7131494a 100755 --- a/Source/server/valve.src +++ b/Source/server/valve.src @@ -1,5 +1,5 @@ #pragma target fte -#pragma progs_dat "../../valve/progs.dat" +#pragma progs_dat "../../valve/data.pk3dir/progs.dat" #define QWSSQC #define VALVE diff --git a/cstrike/csprogs.dat b/cstrike/data.pk3dir/csprogs.dat similarity index 95% rename from cstrike/csprogs.dat rename to cstrike/data.pk3dir/csprogs.dat index 99d79a1a..e3f373e3 100644 Binary files a/cstrike/csprogs.dat and b/cstrike/data.pk3dir/csprogs.dat differ diff --git a/cstrike/data.pk3dir/csprogs.dat.de.po b/cstrike/data.pk3dir/csprogs.dat.de.po new file mode 100755 index 00000000..0a7ba45e --- /dev/null +++ b/cstrike/data.pk3dir/csprogs.dat.de.po @@ -0,0 +1,483 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-21 15:30+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "VGUI_TITLE_MOTD" +msgstr "Nachricht des Tages" + +msgid "VGUI_TITLE_TEAMS" +msgstr "Team Auswahl" + +msgid "VGUI_TITLE_TSEL" +msgstr "Terroristen Auswahl" + +msgid "VGUI_TITLE_CTSEL" +msgstr "Anti-Terror Auswahl" + +msgid "VGUI_TITLE_BUY" +msgstr "Kauf-Menue" + +msgid "VGUI_TITLE_HANDGUN" +msgstr "Handfeuerwaffen" + +msgid "VGUI_TITLE_SHOTGUN" +msgstr "Schrotflinten" + +msgid "VGUI_TITLE_SMG" +msgstr "Maschinenpistole" + +msgid "VGUI_TITLE_RIFLE" +msgstr "Gewehre" + +msgid "VGUI_TITLE_MG" +msgstr "Maschinengewehre" + +msgid "VGUI_TITLE_EQUIPMENT" +msgstr "Ausruestung" + +msgid "WEAPON_NONE" +msgstr "Keine" + +msgid "WEAPON_KNIFE" +msgstr "Messer" + +msgid "WEAPON_USP" +msgstr "H&K USP .45 Taktisch" + +msgid "WEAPON_GLOCK18" +msgstr "Glock 18 SF" + +msgid "WEAPON_DEAGLE" +msgstr "Desert Eagle .50AE" + +msgid "WEAPON_P228" +msgstr "SIG P228" + +msgid "WEAPON_ELITES" +msgstr "Zwei Beretta 96G Elite" + +msgid "WEAPON_FIVESEVEN" +msgstr "FN Five-Seven" + +msgid "WEAPON_M3" +msgstr "Benelli M3 Super90" + +msgid "WEAPON_XM1014" +msgstr "Benelli XM1014" + +msgid "WEAPON_MP5" +msgstr "H&K MP5-Navy" + +msgid "WEAPON_P90" +msgstr "FN P90" + +msgid "WEAPON_UMP45" +msgstr "H&K UMP45" + +msgid "WEAPON_MAC10" +msgstr "Ingram MAC-10" + +msgid "WEAPON_TMP" +msgstr "Steyr Taktik Maschinenpistole" + +msgid "WEAPON_AK47" +msgstr "AK-47" + +msgid "WEAPON_SG552" +msgstr "Sig SG-552 Kommando" + +msgid "WEAPON_M4A1" +msgstr "Colt M4A1 Karabiner" + +msgid "WEAPON_AUG" +msgstr "Steyr Aug" + +msgid "WEAPON_SCOUT" +msgstr "Steyr Scout" + +msgid "WEAPON_AWP" +msgstr "AI Arctic Warfare/Magnum" + +msgid "WEAPON_G3SG1" +msgstr "H&K G3/SG-1" + +msgid "WEAPON_SG550" +msgstr "Sig SG-550" + +msgid "WEAPON_PARA" +msgstr "FN M249 Para" + +msgid "EQUIPMENT_KEVLAR" +msgstr "Kevlar" + +msgid "EQUIPMENT_HELMET" +msgstr "Kevlar & Helm" + +msgid "WEAPON_FLASHBANG" +msgstr "Flashbang" + +msgid "WEAPON_HEGRENADE" +msgstr "HE Granate" + +msgid "WEAPON_SMOKEGRENADE" +msgstr "Smoke Granate" + +msgid "EQUIPMENT_DEFUSALKIT" +msgstr "Entschaerfungs Kit" + +msgid "EQUIPMENT_NIGHTVISION" +msgstr "Nachtsicht Geraet" + +msgid "VGUI_TITLE_AMMO1" +msgstr "Primaere Munition" + +msgid "VGUI_TITLE_AMMO2" +msgstr "Sekundaere Munition" + +msgid "VGUI_EXIT" +msgstr "Beenden" + +msgid "BUY_PRICETAG" +msgstr "Preis: $%i" + +msgid "BUY_CALIBER" +msgstr "Kaliber: %i" + +msgid "BUY_RPM" +msgstr "Schuss pro Minute: %d" + +msgid "VGUI_BACK" +msgstr "Zurueck" + +msgid "VGUI_OK" +msgstr "OK" + +msgid "RADIO_TITLE1" +msgstr "Radio Befehle" + +msgid "RADIO_TITLE2" +msgstr "Gruppen Befehle" + +msgid "RADIO_TITLE3" +msgstr "Radio Antworten" + +msgid "SCORE_TITLE_SPECTATOR" +msgstr "Zuschauer" + +msgid "SCORE_TITLE_T" +msgstr "Terroristen" + +msgid "SCORE_TITLE_CT" +msgstr "AT Einheiten" + +msgid "SCORE_TITLE_VIP" +msgstr "VIP" + +msgid "SCORE_DEAD" +msgstr "%s [TOT]" + +msgid "SCORE_VIP" +msgstr "%s [VIP]" + +msgid "SCORE_PLAYERS" +msgstr "%i Spieler" + +msgid "SCORE_SCORE" +msgstr "PUNKTE" + +msgid "SCORE_DEATHS" +msgstr "TODE" + +msgid "SCORE_LATENCY" +msgstr "LATENZ" + +msgid "SCORE_VOICE" +msgstr "VOICE" + +msgid "VGUI_SPEC_TCOUNTER" +msgstr "Terroristen: %d" + +msgid "VGUI_SPEC_CTCOUNTER" +msgstr "AT Einheiten: %d" + +msgid "VGUI_T1_TITLE" +msgstr "Phoenix Connexion" + +msgid "VGUI_T1_TXT1" +msgstr "The Phoenix Fraktion wurde kurz nach dem" + +msgid "VGUI_T1_TXT2" +msgstr "Fall der UDSSR gegruendet. Sie haben eine" + +msgid "VGUI_T1_TXT3" +msgstr "Reputation fuer das vernichten jener, der" + +msgid "VGUI_T1_TXT4" +msgstr "ihnen in den Weg kommt." + +msgid "VGUI_T1_TXT5" +msgstr "Sie ist eine der meist gefuerchtesten" + +msgid "VGUI_T1_TXT6" +msgstr "Terroristen Gruppen in Ost-Europa." + +msgid "VGUI_T2_TITLE" +msgstr "L337 Krew" + +msgid "VGUI_T2_TXT1" +msgstr "Fundamentalisten aus dem Mittleren Osten" + +msgid "VGUI_T2_TXT2" +msgstr "die sich die Weltherrschaft an sich" + +msgid "VGUI_T2_TXT3" +msgstr "reissen wollen, sowie andere Fiese Taten" + +msgid "VGUI_T2_TXT4" +msgstr "begehen." + +msgid "VGUI_T2_TXT5" +msgstr " " + +msgid "VGUI_T2_TXT6" +msgstr " " + +msgid "VGUI_T3_TITLE" +msgstr "Arctic Avengers" + +msgid "VGUI_T3_TXT1" +msgstr "Swedische Terror Fraktion, gegruendet 1977." + +msgid "VGUI_T3_TXT2" +msgstr "Beruehmt fuer das bombardieren der Kanadischen" + +msgid "VGUI_T3_TXT3" +msgstr "Botschaft im Jahre 1990." + +msgid "VGUI_T3_TXT4" +msgstr " " + +msgid "VGUI_T3_TXT5" +msgstr " " + +msgid "VGUI_T3_TXT6" +msgstr " " + +msgid "VGUI_T4_TITLE" +msgstr "Guerilla Warfare" + +msgid "VGUI_T4_TXT1" +msgstr "Eine Terror Fraktion, die im Mittleren Osten" + +msgid "VGUI_T4_TXT2" +msgstr "gegruendet wurde. Bekannt fuer Ihre Ruecksichts-" + +msgid "VGUI_T4_TXT3" +msgstr "losigkeit. Ihr hass fuer den Amerikanischen" + +msgid "VGUI_T4_TXT4" +msgstr "Lebensstil haben Sie mit der Bombadierung" + +msgid "VGUI_T4_TXT5" +msgstr "eines Schulbusses voller Rock&Roll stars" + +msgid "VGUI_T4_TXT6" +msgstr "im Jahre 1982 bewiesen." + +msgid "VGUI_CT1_TITLE" +msgstr "Seal Team 6" + +msgid "VGUI_CT1_TXT1" +msgstr "Seal Team 6 (spaeter bekannt als DEVGRU)" + +msgid "VGUI_CT1_TXT2" +msgstr "wurde im Jahre 1980 unter dem Kommando von" + +msgid "VGUI_CT1_TXT3" +msgstr "Lieutenant-Kommander Richard Marcincko." + +msgid "VGUI_CT1_TXT4" +msgstr "gegruendet. Sie ist permanent bereit" + +msgid "VGUI_CT1_TXT5" +msgstr "Terror Attacken gegen Amerikanische" + +msgid "VGUI_CT1_TXT6" +msgstr "Ziele zu bekaempfen." + +msgid "VGUI_CT2_TITLE" +msgstr "Deutsche GSG 9" + +msgid "VGUI_CT2_TXT1" +msgstr "Grenzschutzgruppe 9 der Bundespolizei" + +msgid "VGUI_CT2_TXT2" +msgstr "wurde nach der Geiselnahme von" + +msgid "VGUI_CT2_TXT3" +msgstr "Israelischen Teilnehmern waehrend" + +msgid "VGUI_CT2_TXT4" +msgstr "der 1972 Olympischen Spiele in Muenchen" + +msgid "VGUI_CT2_TXT5" +msgstr "gegruendet." + +msgid "VGUI_CT2_TXT6" +msgstr " " + +msgid "VGUI_CT3_TITLE" +msgstr "Britische SAS" + +msgid "VGUI_CT3_TXT1" +msgstr "Die Welt-Bekannte Britische SAS wurde" + +msgid "VGUI_CT3_TXT2" +msgstr "im Zweiten Weltkrieg von dem Offizier" + +msgid "VGUI_CT3_TXT3" +msgstr "David Stirling gegruendet. Ihre Rolle" + +msgid "VGUI_CT3_TXT4" +msgstr "involvierte das Sammeln von Informationen" + +msgid "VGUI_CT3_TXT5" +msgstr "hinter Feindlichen Linien, Sabotage" + +msgid "VGUI_CT3_TXT6" +msgstr "und Ermordungen spezifischer Ziele." + +msgid "VGUI_CT4_TITLE" +msgstr "Franzoesische GIGN" + +msgid "VGUI_CT4_TXT1" +msgstr "Frankreichs Elite Anti-Terroreinheit" + +msgid "VGUI_CT4_TXT2" +msgstr "soll eine schnelle Reaktions-Gruppe" + +msgid "VGUI_CT4_TXT3" +msgstr "darstellen, die zu jeder Art von Grosser" + +msgid "VGUI_CT4_TXT4" +msgstr "Attacke antworten kann. Sie besteht aus" + +msgid "VGUI_CT4_TXT5" +msgstr "nicht mehr als 100 Mann. Die GIGN hat" + +msgid "VGUI_CT4_TXT6" +msgstr "viele erfolgreiche Missionen hinter sich." + +msgid "VGUI_TEAM_T" +msgstr "Terroristen" + +msgid "VGUI_TEAM_CT" +msgstr "Anti-Terror Einheit" + +msgid "VGUI_TEAM_AUTO" +msgstr "Auto-Auswahl" + +msgid "VGUI_TEAM_SPEC" +msgstr "Zuschauen" + +msgid "RADIO_BLOW" +msgstr "Raus da! Es wird gleich hochgehen!" +msgid "RADIO_BOMBDEF" +msgstr "Die Bombe wurde entschaerft." +msgid "RADIO_BOMBPL" +msgstr "Die Bombe wurde gelegt." +msgid "RADIO_CIRCLEBACK" +msgstr "Kreise um die Rueckseite!" +msgid "RADIO_CLEAR" +msgstr "Sektor sicher." +msgid "RADIO_COM_FOLLOWCOM" +msgstr "Alles klar, folge meinem Kommando." +msgid "RADIO_COM_GETINPOS" +msgstr "Geh in Position und warte auf mein Zeichen." +msgid "RADIO_COM_GO" +msgstr "Los, los, los!" +msgid "RADIO_COM_REPORTIN" +msgstr "Erstatte Bericht, Team!" +msgid "RADIO_CT_AFFIRM" +msgstr "Positiv." +msgid "RADIO_CT_BACKUP" +msgstr "Brauche Unterstuetzung!" +msgid "RADIO_CT_COVERME" +msgstr "Gib mir Deckung!" +msgid "RADIO_CT_ENEMYS" +msgstr "Feind gesichtet." +msgid "RADIO_CT_FIREINHOLE" +msgstr "Granate vorraus!" +msgid "RADIO_CT_IMHIT" +msgstr "Bin getroffen!" +msgid "RADIO_CT_INPOS" +msgstr "Ich bin in Position." +msgid "RADIO_CT_POINT" +msgstr "Ich nehme das Ziel ein." +msgid "RADIO_CT_REPORTINGIN" +msgstr "Ich erstatte Bericht." +msgid "RADIO_CTWIN" +msgstr "Anti-Terror Einheiten gewinnen!" +msgid "RADIO_ENEMYDOWN" +msgstr "Feind am Boden!" +msgid "RADIO_FALLBACK" +msgstr "Team, zurueckfallen!" +msgid "RADIO_FIREASSIS" +msgstr "Unter Beschuss, brauche Unterstuetzung!" +msgid "RADIO_FOLLOWME" +msgstr "Folge mir!" +msgid "RADIO_GETOUT" +msgstr "Team, lass bloss raus hier!" +msgid "RADIO_GO" +msgstr "Okay, los gehts." +msgid "RADIO_HITASSIST" +msgstr "Bin getroffen! Brauche Unterstuetzung!" +msgid "RADIO_HOSDOWN" +msgstr "Geisel am Boden!" +msgid "RADIO_LETSGO" +msgstr "Okay, los gehts." +msgid "RADIO_LOCKNLOAD" +msgstr "Lock 'n load." +msgid "RADIO_MATEDOWN" +msgstr "Teammitglied am Boden!" +msgid "RADIO_MEETME" +msgstr "Trefft micht am Rendezvous Zíel." +msgid "RADIO_MOVEOUT" +msgstr "Alles klar, bewegen wir uns." +msgid "RADIO_NEGATIVE" +msgstr "Negativ." +msgid "RADIO_POSITION" +msgstr "Halte diese Position!" +msgid "RADIO_REGROUP" +msgstr "Gruppieren, Team!" +msgid "RADIO_RESCUED" +msgstr "Eine Geisel wurde gerettet." +msgid "RADIO_ROGER" +msgstr "Verstanden." +msgid "RADIO_ROUNDDRAW" +msgstr "Runde unentschieden!" +msgid "RADIO_STICKTOG" +msgstr "Zusammenbleiben, Team!" +msgid "RADIO_STORMFRONT" +msgstr "Stuerme die Front!" +msgid "RADIO_TAKEPOINT" +msgstr "Du nimmst das Ziel!" +msgid "RADIO_TERWIN" +msgstr "Terroristen gewinnen!" +msgid "RADIO_VIP" +msgstr "Beschuetzt den VIP, Team!" diff --git a/cstrike/data.pk3dir/csprogs.dat.en.po b/cstrike/data.pk3dir/csprogs.dat.en.po new file mode 100755 index 00000000..36dad966 --- /dev/null +++ b/cstrike/data.pk3dir/csprogs.dat.en.po @@ -0,0 +1,483 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-21 15:30+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "VGUI_TITLE_MOTD" +msgstr "Message Of The Day" + +msgid "VGUI_TITLE_TEAMS" +msgstr "Team Selection" + +msgid "VGUI_TITLE_TSEL" +msgstr "Terrorist Selection" + +msgid "VGUI_TITLE_CTSEL" +msgstr "Counter-Terrorist Selection" + +msgid "VGUI_TITLE_BUY" +msgstr "Buy Menu" + +msgid "VGUI_TITLE_HANDGUN" +msgstr "Handguns" + +msgid "VGUI_TITLE_SHOTGUN" +msgstr "Shotgun" + +msgid "VGUI_TITLE_SMG" +msgstr "Sub-Machine-Guns" + +msgid "VGUI_TITLE_RIFLE" +msgstr "Rifles" + +msgid "VGUI_TITLE_MG" +msgstr "Machineguns" + +msgid "VGUI_TITLE_EQUIPMENT" +msgstr "Equipment" + +msgid "WEAPON_NONE" +msgstr "None" + +msgid "WEAPON_KNIFE" +msgstr "Knife" + +msgid "WEAPON_USP" +msgstr "H&K USP .45 Tactical" + +msgid "WEAPON_GLOCK18" +msgstr "Glock18 Select Fire" + +msgid "WEAPON_DEAGLE" +msgstr "Desert Eagle .50AE" + +msgid "WEAPON_P228" +msgstr "SIG P228" + +msgid "WEAPON_ELITES" +msgstr "Dual Beretta 96G Elite" + +msgid "WEAPON_FIVESEVEN" +msgstr "FN Five-Seven" + +msgid "WEAPON_M3" +msgstr "Benelli M3 Super90" + +msgid "WEAPON_XM1014" +msgstr "Benelli XM1014" + +msgid "WEAPON_MP5" +msgstr "H&K MP5-Navy" + +msgid "WEAPON_P90" +msgstr "FN P90" + +msgid "WEAPON_UMP45" +msgstr "H&K UMP45" + +msgid "WEAPON_MAC10" +msgstr "Ingram MAC-10" + +msgid "WEAPON_TMP" +msgstr "Steyr Tactical Machine Pistol" + +msgid "WEAPON_AK47" +msgstr "AK-47" + +msgid "WEAPON_SG552" +msgstr "Sig SG-552 Commando" + +msgid "WEAPON_M4A1" +msgstr "Colt M4A1 Carbine" + +msgid "WEAPON_AUG" +msgstr "Steyr Aug" + +msgid "WEAPON_SCOUT" +msgstr "Steyr Scout" + +msgid "WEAPON_AWP" +msgstr "AI Arctic Warfare/Magnum" + +msgid "WEAPON_G3SG1" +msgstr "H&K G3/SG-1 Sniper Rifle" + +msgid "WEAPON_SG550" +msgstr "Sig SG-550 Sniper" + +msgid "WEAPON_PARA" +msgstr "FN M249 Para" + +msgid "EQUIPMENT_KEVLAR" +msgstr "Kevlar" + +msgid "EQUIPMENT_HELMET" +msgstr "Kevlar & Helmet" + +msgid "WEAPON_FLASHBANG" +msgstr "Flashbang" + +msgid "WEAPON_HEGRENADE" +msgstr "HE Grenade" + +msgid "WEAPON_SMOKEGRENADE" +msgstr "Smoke Grenade" + +msgid "EQUIPMENT_DEFUSALKIT" +msgstr "Defusal Kit" + +msgid "EQUIPMENT_NIGHTVISION" +msgstr "NightVision" + +msgid "VGUI_TITLE_AMMO1" +msgstr "Primary Ammo" + +msgid "VGUI_TITLE_AMMO2" +msgstr "Secondary Ammo" + +msgid "VGUI_EXIT" +msgstr "Exit" + +msgid "BUY_PRICETAG" +msgstr "Price: $%i" + +msgid "BUY_CALIBER" +msgstr "Caliber: %i" + +msgid "BUY_RPM" +msgstr "Rounds Per Minute: %d" + +msgid "VGUI_BACK" +msgstr "Back" + +msgid "VGUI_OK" +msgstr "OK" + +msgid "RADIO_TITLE1" +msgstr "Radio Commands" + +msgid "RADIO_TITLE2" +msgstr "Group Radio Commands" + +msgid "RADIO_TITLE3" +msgstr "Radio Responses" + +msgid "SCORE_TITLE_SPECTATOR" +msgstr "Spectator" + +msgid "SCORE_TITLE_T" +msgstr "Terrorists" + +msgid "SCORE_TITLE_CT" +msgstr "CT Forces" + +msgid "SCORE_TITLE_VIP" +msgstr "VIP" + +msgid "SCORE_DEAD" +msgstr "%s [DEAD]" + +msgid "SCORE_VIP" +msgstr "%s [VIP]" + +msgid "SCORE_PLAYERS" +msgstr "(%i players)" + +msgid "SCORE_SCORE" +msgstr "SCORE" + +msgid "SCORE_DEATHS" +msgstr "DEATHS" + +msgid "SCORE_LATENCY" +msgstr "LATENCY" + +msgid "SCORE_VOICE" +msgstr "VOICE" + +msgid "VGUI_SPEC_TCOUNTER" +msgstr "Terrorists: %d" + +msgid "VGUI_SPEC_CTCOUNTER" +msgstr "CT Forces: %d" + +msgid "VGUI_T1_TITLE" +msgstr "Phoenix Connexion" + +msgid "VGUI_T1_TXT1" +msgstr "The Phoenix Faction was formed shortly" + +msgid "VGUI_T1_TXT2" +msgstr "after the breakup of the USSR. Having" + +msgid "VGUI_T1_TXT3" +msgstr "established a reputation for killing" + +msgid "VGUI_T1_TXT4" +msgstr "anyone that gets in their way." + +msgid "VGUI_T1_TXT5" +msgstr "The Phoenix Faction is one of the most" + +msgid "VGUI_T1_TXT6" +msgstr "feared terrorist groups in Eastern Europe." + +msgid "VGUI_T2_TITLE" +msgstr "L337 Krew" + +msgid "VGUI_T2_TXT1" +msgstr "Middle Eastern fundamentalist group bent" + +msgid "VGUI_T2_TXT2" +msgstr "on world domination and various other" + +msgid "VGUI_T2_TXT3" +msgstr "evil deeds." + +msgid "VGUI_T2_TXT4" +msgstr " " + +msgid "VGUI_T2_TXT5" +msgstr " " + +msgid "VGUI_T2_TXT6" +msgstr " " + +msgid "VGUI_T3_TITLE" +msgstr "Arctic Avengers" + +msgid "VGUI_T3_TXT1" +msgstr "Swedish terrorist faction founded in 1977." + +msgid "VGUI_T3_TXT2" +msgstr "Famous for their bombing of the Canadian" + +msgid "VGUI_T3_TXT3" +msgstr "embassy in 1990." + +msgid "VGUI_T3_TXT4" +msgstr " " + +msgid "VGUI_T3_TXT5" +msgstr " " + +msgid "VGUI_T3_TXT6" +msgstr " " + +msgid "VGUI_T4_TITLE" +msgstr "Guerilla Warfare" + +msgid "VGUI_T4_TXT1" +msgstr "A terrorist faction founded in the" + +msgid "VGUI_T4_TXT2" +msgstr "Middle East, Guerilla Warfare, has a" + +msgid "VGUI_T4_TXT3" +msgstr "reputation for ruthlessness. Their disgust" + +msgid "VGUI_T4_TXT4" +msgstr "for the American lifestyle was demonstrated" + +msgid "VGUI_T4_TXT5" +msgstr "in their 1982 bombing of a school bus full" + +msgid "VGUI_T4_TXT6" +msgstr "of Rock and Roll musicians." + +msgid "VGUI_CT1_TITLE" +msgstr "Seal Team 6" + +msgid "VGUI_CT1_TXT1" +msgstr "Seal Team 6 (to be known later as DEVGRU)" + +msgid "VGUI_CT1_TXT2" +msgstr "was founded in 1980 under the command of" + +msgid "VGUI_CT1_TXT3" +msgstr "Lieutenant-Commander Richard Marcincko." + +msgid "VGUI_CT1_TXT4" +msgstr "ST-6 was placed on permanent alert to" + +msgid "VGUI_CT1_TXT5" +msgstr "respond to terrorist attacks against" + +msgid "VGUI_CT1_TXT6" +msgstr "American targets worldwide." + +msgid "VGUI_CT2_TITLE" +msgstr "German GSG9" + +msgid "VGUI_CT2_TXT1" +msgstr "GSG-9 was born out of the tragic events" + +msgid "VGUI_CT2_TXT2" +msgstr "that led to the death of several" + +msgid "VGUI_CT2_TXT3" +msgstr "Israeli athletes during the 1972 Olympic" + +msgid "VGUI_CT2_TXT4" +msgstr "games in Munich, Germany." + +msgid "VGUI_CT2_TXT5" +msgstr " " + +msgid "VGUI_CT2_TXT6" +msgstr " " + +msgid "VGUI_CT3_TITLE" +msgstr "UK SAS" + +msgid "VGUI_CT3_TXT1" +msgstr "The world-renowned British SAS was founded" + +msgid "VGUI_CT3_TXT2" +msgstr "in the Second World War by a man named" + +msgid "VGUI_CT3_TXT3" +msgstr "David Stirling. Their role during WW2" + +msgid "VGUI_CT3_TXT4" +msgstr "involved gathering intelligence behind enemy" + +msgid "VGUI_CT3_TXT5" +msgstr "lines and executing sabotage strikes and" + +msgid "VGUI_CT3_TXT6" +msgstr "assassinations against key targets." + +msgid "VGUI_CT4_TITLE" +msgstr "French GIGN" + +msgid "VGUI_CT4_TXT1" +msgstr "France's elite Counter-Terrorist unit was" + +msgid "VGUI_CT4_TXT2" +msgstr "designed to be a fast response force" + +msgid "VGUI_CT4_TXT3" +msgstr "that could decisively react to any large-" + +msgid "VGUI_CT4_TXT4" +msgstr "scale terrorist incident. Consisting of no" + +msgid "VGUI_CT4_TXT5" +msgstr "more than 100 men, the GIGN has earned its" + +msgid "VGUI_CT4_TXT6" +msgstr "reputation through a history of successful ops." + +msgid "VGUI_TEAM_T" +msgstr "Terrorists" + +msgid "VGUI_TEAM_CT" +msgstr "Counter-Terrorists" + +msgid "VGUI_TEAM_AUTO" +msgstr "Auto-Assign" + +msgid "VGUI_TEAM_SPEC" +msgstr "Spectate" + +msgid "RADIO_BLOW" +msgstr "Get out of there, it's gonna blow!" +msgid "RADIO_BOMBDEF" +msgstr "The bomb has been defused." +msgid "RADIO_BOMBPL" +msgstr "The bomb has been planted." +msgid "RADIO_CIRCLEBACK" +msgstr "Circle around back!" +msgid "RADIO_CLEAR" +msgstr "Sector clear." +msgid "RADIO_COM_FOLLOWCOM" +msgstr "Okay team, follow my command!" +msgid "RADIO_COM_GETINPOS" +msgstr "Get in position and wait for my go!" +msgid "RADIO_COM_GO" +msgstr "Go, go, go!" +msgid "RADIO_COM_REPORTIN" +msgstr "Report in, team!" +msgid "RADIO_CT_AFFIRM" +msgstr "Affirmative." +msgid "RADIO_CT_BACKUP" +msgstr "Need backup!" +msgid "RADIO_CT_COVERME" +msgstr "Cover me!" +msgid "RADIO_CT_ENEMYS" +msgstr "Enemy spotted." +msgid "RADIO_CT_FIREINHOLE" +msgstr "Fire in the hole!" +msgid "RADIO_CT_IMHIT" +msgstr "I'm hit!" +msgid "RADIO_CT_INPOS" +msgstr "I'm in position." +msgid "RADIO_CT_POINT" +msgstr "I'll take the point." +msgid "RADIO_CT_REPORTINGIN" +msgstr "Reporting in." +msgid "RADIO_CTWIN" +msgstr "Counter-Terrorists win!" +msgid "RADIO_ENEMYDOWN" +msgstr "Enemy down!" +msgid "RADIO_FALLBACK" +msgstr "Team, fall back!" +msgid "RADIO_FIREASSIS" +msgstr "Taking fire, need assistance!" +msgid "RADIO_FOLLOWME" +msgstr "Follow me!" +msgid "RADIO_GETOUT" +msgstr "Team, let's get out of here!" +msgid "RADIO_GO" +msgstr "Okay, let's go." +msgid "RADIO_HITASSIST" +msgstr "I'm hit! Need assistance!" +msgid "RADIO_HOSDOWN" +msgstr "Hostage down." +msgid "RADIO_LETSGO" +msgstr "Okay, let's go." +msgid "RADIO_LOCKNLOAD" +msgstr "Lock 'n load." +msgid "RADIO_MATEDOWN" +msgstr "Teammate down." +msgid "RADIO_MEETME" +msgstr "Meet at the rendezvous point." +msgid "RADIO_MOVEOUT" +msgstr "Alright, let's move out." +msgid "RADIO_NEGATIVE" +msgstr "Negative." +msgid "RADIO_POSITION" +msgstr "Hold this position!" +msgid "RADIO_REGROUP" +msgstr "Regroup, team!" +msgid "RADIO_RESCUED" +msgstr "A hostage has been rescued." +msgid "RADIO_ROGER" +msgstr "Roger that." +msgid "RADIO_ROUNDDRAW" +msgstr "Round draw!" +msgid "RADIO_STICKTOG" +msgstr "Stick together, team!" +msgid "RADIO_STORMFRONT" +msgstr "Storm the front!" +msgid "RADIO_TAKEPOINT" +msgstr "You take the point!" +msgid "RADIO_TERWIN" +msgstr "Terrorists win!" +msgid "RADIO_VIP" +msgstr "Protect the VIP, team!" diff --git a/valve/default.cfg b/cstrike/data.pk3dir/default.cfg similarity index 94% rename from valve/default.cfg rename to cstrike/data.pk3dir/default.cfg index 7eda842f..6ff8203a 100755 --- a/valve/default.cfg +++ b/cstrike/data.pk3dir/default.cfg @@ -32,6 +32,7 @@ bind z radio1 bind y messagemode bind u messagemode2 bind t "impulse 201" +bind f "impulse 100" bind SPACE +jump bind CTRL +duck diff --git a/cstrike/progs.dat b/cstrike/data.pk3dir/progs.dat similarity index 51% rename from cstrike/progs.dat rename to cstrike/data.pk3dir/progs.dat index 47647326..24694ba2 100644 Binary files a/cstrike/progs.dat and b/cstrike/data.pk3dir/progs.dat differ diff --git a/cstrike/freecs_data.pk3 b/cstrike/freecs_data.pk3 deleted file mode 100644 index 5196c317..00000000 Binary files a/cstrike/freecs_data.pk3 and /dev/null differ diff --git a/rewolf/csprogs.dat b/rewolf/data.pk3dir/csprogs.dat similarity index 93% rename from rewolf/csprogs.dat rename to rewolf/data.pk3dir/csprogs.dat index ae64621c..1c99cffb 100644 Binary files a/rewolf/csprogs.dat and b/rewolf/data.pk3dir/csprogs.dat differ diff --git a/rewolf/progs.dat b/rewolf/data.pk3dir/progs.dat similarity index 52% rename from rewolf/progs.dat rename to rewolf/data.pk3dir/progs.dat index d8ee69c2..77643192 100644 Binary files a/rewolf/progs.dat and b/rewolf/data.pk3dir/progs.dat differ diff --git a/rewolf/modinfo.txt b/rewolf/modinfo.txt new file mode 100644 index 00000000..f0c10697 --- /dev/null +++ b/rewolf/modinfo.txt @@ -0,0 +1,9 @@ +game "Gunman Chronicles" +url_info "www.gunmanchronicles.com" +version "1.0" +size "496200000" +svonly "0" +cldll "1" +hlversion "1000" +mpentity "info_player_deathmatch" +startmap "city1a" diff --git a/scihunt/csprogs.dat b/scihunt/data.pk3dir/csprogs.dat similarity index 92% rename from scihunt/csprogs.dat rename to scihunt/data.pk3dir/csprogs.dat index b50403a4..04f3ddee 100644 Binary files a/scihunt/csprogs.dat and b/scihunt/data.pk3dir/csprogs.dat differ diff --git a/scihunt/progs.dat b/scihunt/data.pk3dir/progs.dat similarity index 58% rename from scihunt/progs.dat rename to scihunt/data.pk3dir/progs.dat index 85bdf308..37c7136e 100644 Binary files a/scihunt/progs.dat and b/scihunt/data.pk3dir/progs.dat differ diff --git a/scihunt/modinfo.txt b/scihunt/modinfo.txt new file mode 100644 index 00000000..3bce1d55 --- /dev/null +++ b/scihunt/modinfo.txt @@ -0,0 +1,10 @@ +game "Scientist Hunt" +url_info "richwhitehouse.com" +version "1.0" +size "800000" +svonly "0" +cldll "1" +hlversion "1000" +mpentity "info_player_deathmatch" +startmap "c1a0" +type "multiplayer_only" diff --git a/valve/csprogs.dat b/valve/csprogs.dat index b47b1473..c4573b7b 100644 Binary files a/valve/csprogs.dat and b/valve/csprogs.dat differ diff --git a/valve/data.pk3dir/csprogs.dat b/valve/data.pk3dir/csprogs.dat new file mode 100644 index 00000000..c4573b7b Binary files /dev/null and b/valve/data.pk3dir/csprogs.dat differ diff --git a/cstrike/default.cfg b/valve/data.pk3dir/default.cfg similarity index 77% rename from cstrike/default.cfg rename to valve/data.pk3dir/default.cfg index 7eda842f..34035d49 100755 --- a/cstrike/default.cfg +++ b/valve/data.pk3dir/default.cfg @@ -23,15 +23,12 @@ bind "MWHEELDOWN" "invnext" bind "MWHEELUP" "invprev" bind r +reload bind e +use -bind n nightvision bind g drop bind TAB +showscores -bind c radio3 -bind x radio2 -bind z radio1 bind y messagemode bind u messagemode2 bind t "impulse 201" +bind f "impulse 100" bind SPACE +jump bind CTRL +duck @@ -43,20 +40,6 @@ bind ESC togglemenu // Game variables seta maxplayers 8 -seta mp_startmoney "800" -seta mp_buytime 90 -seta mp_freezetime 6 -seta mp_c4timer 45 -seta mp_roundtime 5 -seta fcs_knifeonly 0 -seta fcs_swapteams 0 -seta fcs_nopickups 0 -seta fcs_reward_kill 300 -seta fcs_penalty_pain -150 -seta fcs_penalty_kill -1500 -seta fcs_maxmoney 16000 -seta fcs_fillweapons 0 -seta fcs_autoreload 0 // Movement Variables seta sv_maxspeed 240 @@ -78,7 +61,7 @@ seta con_color "255 150 0" seta vgui_color "255 170 0" seta cross_color "0 255 0" -hostname "FreeCS Server" +hostname "FreeHL Server" seta vid_conautoscale "1" seta r_polygonoffset_submodel_offset "0" diff --git a/valve/data.pk3dir/gfx.wad b/valve/data.pk3dir/gfx.wad new file mode 100644 index 00000000..8de6737e Binary files /dev/null and b/valve/data.pk3dir/gfx.wad differ diff --git a/valve/data.pk3dir/gfx/cursor.tga b/valve/data.pk3dir/gfx/cursor.tga new file mode 100755 index 00000000..67a2f9fb Binary files /dev/null and b/valve/data.pk3dir/gfx/cursor.tga differ diff --git a/valve/data.pk3dir/gfx/shell/arial.ttf b/valve/data.pk3dir/gfx/shell/arial.ttf new file mode 100644 index 00000000..feb95b0d Binary files /dev/null and b/valve/data.pk3dir/gfx/shell/arial.ttf differ diff --git a/valve/data.pk3dir/gfx/shell/arialbd.ttf b/valve/data.pk3dir/gfx/shell/arialbd.ttf new file mode 100644 index 00000000..d0d857e2 Binary files /dev/null and b/valve/data.pk3dir/gfx/shell/arialbd.ttf differ diff --git a/valve/data.pk3dir/gfx/shell/mssansserif.ttf b/valve/data.pk3dir/gfx/shell/mssansserif.ttf new file mode 100644 index 00000000..56e4afe1 Binary files /dev/null and b/valve/data.pk3dir/gfx/shell/mssansserif.ttf differ diff --git a/valve/glsl/default2d.glsl b/valve/data.pk3dir/glsl/default2d.glsl similarity index 100% rename from valve/glsl/default2d.glsl rename to valve/data.pk3dir/glsl/default2d.glsl diff --git a/valve/glsl/defaultadditivesprite.glsl b/valve/data.pk3dir/glsl/defaultadditivesprite.glsl similarity index 100% rename from valve/glsl/defaultadditivesprite.glsl rename to valve/data.pk3dir/glsl/defaultadditivesprite.glsl diff --git a/valve/glsl/defaultfill.glsl b/valve/data.pk3dir/glsl/defaultfill.glsl similarity index 100% rename from valve/glsl/defaultfill.glsl rename to valve/data.pk3dir/glsl/defaultfill.glsl diff --git a/valve/glsl/defaultskin.glsl b/valve/data.pk3dir/glsl/defaultskin.glsl similarity index 100% rename from valve/glsl/defaultskin.glsl rename to valve/data.pk3dir/glsl/defaultskin.glsl diff --git a/valve/glsl/defaultsky.glsl b/valve/data.pk3dir/glsl/defaultsky.glsl similarity index 100% rename from valve/glsl/defaultsky.glsl rename to valve/data.pk3dir/glsl/defaultsky.glsl diff --git a/valve/glsl/defaultskybox.glsl b/valve/data.pk3dir/glsl/defaultskybox.glsl similarity index 100% rename from valve/glsl/defaultskybox.glsl rename to valve/data.pk3dir/glsl/defaultskybox.glsl diff --git a/valve/glsl/defaultsprite.glsl b/valve/data.pk3dir/glsl/defaultsprite.glsl similarity index 100% rename from valve/glsl/defaultsprite.glsl rename to valve/data.pk3dir/glsl/defaultsprite.glsl diff --git a/valve/glsl/defaultwall.glsl b/valve/data.pk3dir/glsl/defaultwall.glsl similarity index 86% rename from valve/glsl/defaultwall.glsl rename to valve/data.pk3dir/glsl/defaultwall.glsl index dce06ab7..db923341 100644 --- a/valve/glsl/defaultwall.glsl +++ b/valve/data.pk3dir/glsl/defaultwall.glsl @@ -24,14 +24,9 @@ varying vec2 lm_c; vec4 diffuse_f = texture2D(s_diffuse, tex_c); vec3 light = texture2D(s_lightmap, lm_c).rgb; - if (light.r > 1.0f) { - light.r = 1.0f; - } - if (light.g > 1.0f) { - light.g = 1.0f; - } - if (light.b > 1.0f) { - light.b = 1.0f; + if (diffuse_f.rgb == vec3(0,0,1)) { + diffuse_f.rgb = vec3(0,0,0); + discard; } if (diffuse_f.a < 0.5) { @@ -55,5 +50,6 @@ varying vec2 lm_c; #endif gl_FragColor = diffuse_f; + } #endif diff --git a/valve/glsl/defaultwarp.glsl b/valve/data.pk3dir/glsl/defaultwarp.glsl similarity index 100% rename from valve/glsl/defaultwarp.glsl rename to valve/data.pk3dir/glsl/defaultwarp.glsl diff --git a/valve/data.pk3dir/menu.dat b/valve/data.pk3dir/menu.dat new file mode 100644 index 00000000..07c25263 Binary files /dev/null and b/valve/data.pk3dir/menu.dat differ diff --git a/valve/particles/decal_glass.tga b/valve/data.pk3dir/particles/decal_glass.tga similarity index 100% rename from valve/particles/decal_glass.tga rename to valve/data.pk3dir/particles/decal_glass.tga diff --git a/valve/particles/decal_shot.tga b/valve/data.pk3dir/particles/decal_shot.tga similarity index 100% rename from valve/particles/decal_shot.tga rename to valve/data.pk3dir/particles/decal_shot.tga diff --git a/valve/particles/default.cfg b/valve/data.pk3dir/particles/default.cfg similarity index 100% rename from valve/particles/default.cfg rename to valve/data.pk3dir/particles/default.cfg diff --git a/valve/data.pk3dir/progs.dat b/valve/data.pk3dir/progs.dat new file mode 100644 index 00000000..67924e95 Binary files /dev/null and b/valve/data.pk3dir/progs.dat differ diff --git a/valve/gfx.wad b/valve/gfx.wad deleted file mode 100644 index 0a81dc80..00000000 Binary files a/valve/gfx.wad and /dev/null differ diff --git a/valve/menu.dat b/valve/menu.dat index af1e6421..07c25263 100644 Binary files a/valve/menu.dat and b/valve/menu.dat differ diff --git a/valve/modinfo.txt b/valve/modinfo.txt index 021644cf..f34c95e4 100644 --- a/valve/modinfo.txt +++ b/valve/modinfo.txt @@ -4,7 +4,6 @@ version "1.0" size "396800000" svonly "0" cldll "1" -hlversion "1104" nomodels "0" nohimodel "0" mpentity "info_player_deathmatch" diff --git a/valve/pak_fragnet.pk3 b/valve/pak_fragnet.pk3 deleted file mode 100644 index f8df1a52..00000000 Binary files a/valve/pak_fragnet.pk3 and /dev/null differ diff --git a/valve/progs.dat b/valve/progs.dat index aea91f66..67924e95 100644 Binary files a/valve/progs.dat and b/valve/progs.dat differ