]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into fruitiex/fruitbalance
authorRudolf Polzer <divverent@alientrap.org>
Sat, 6 Nov 2010 21:38:22 +0000 (22:38 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 6 Nov 2010 21:38:22 +0000 (22:38 +0100)
balance25.cfg
balanceTest.cfg
defaultXonotic.cfg
qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh
qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c
qcsrc/menu/xonotic/playerlist.c
qcsrc/menu/xonotic/weaponslist.c
qcsrc/server/g_world.qc

index 673f08ab74348d2590880b15c6e4b5bbe5642faf..09e987a5ecc24cb06d5385eb74650be53b05294e 100644 (file)
@@ -16,7 +16,7 @@ set g_start_weapon_hlac -1 "0 = never provide the weapon, 1 = always provide the
 set g_start_weapon_campingrifle -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_tuba -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_fireball -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_seeker 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_seeker -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_balance_health_start 150
 set g_balance_armor_start 0
 set g_start_ammo_shells 40
@@ -222,7 +222,7 @@ set g_balance_laser_primary_refire 0.7
 set g_balance_laser_primary_animtime 0.3
 set g_balance_laser_primary_lifetime 30
 set g_balance_laser_primary_shotangle 0
-set g_balance_laser_primary_delay 0
+set g_balance_laser_primary_delay 0.05
 set g_balance_laser_primary_gauntlet 0
 set g_balance_laser_primary_force_zscale 1
 set g_balance_laser_primary_force_velocitybias 0
index a6e66c8d8b93e58c49137e5491ef63a7ccd8b134..a5e894b4be1c37f9a04e08b3f5be2c357d595c1f 100644 (file)
@@ -117,7 +117,7 @@ set g_balance_pause_health_regen_spawn 0
 set g_balance_health_rot 0.1
 set g_balance_health_rotlinear 2.5
 set g_balance_pause_health_rot 4
-set g_balance_pause_health_rot_spawn 15
+set g_balance_pause_health_rot_spawn 8
 set g_balance_health_regenstable 100
 set g_balance_health_rotstable 100
 set g_balance_health_limit 999
@@ -126,7 +126,7 @@ set g_balance_armor_regenlinear 0
 set g_balance_armor_rot 0.1
 set g_balance_armor_rotlinear 2.5
 set g_balance_pause_armor_rot 4
-set g_balance_pause_armor_rot_spawn 15
+set g_balance_pause_armor_rot_spawn 8
 set g_balance_armor_regenstable 100
 set g_balance_armor_rotstable 100
 set g_balance_armor_limit 999
@@ -137,7 +137,7 @@ set g_balance_pause_fuel_regen 2 // other than this, fuel uses the health regen
 set g_balance_fuel_rot 0.05
 set g_balance_fuel_rotlinear 0
 set g_balance_pause_fuel_rot 4
-set g_balance_pause_fuel_rot_spawn 15
+set g_balance_pause_fuel_rot_spawn 8
 set g_balance_fuel_regenstable 50
 set g_balance_fuel_rotstable 100
 set g_balance_fuel_limit 999
@@ -222,7 +222,7 @@ set g_balance_laser_primary_refire 0.6
 set g_balance_laser_primary_animtime 0.6
 set g_balance_laser_primary_lifetime 5
 set g_balance_laser_primary_shotangle 0
-set g_balance_laser_primary_delay 0
+set g_balance_laser_primary_delay 0.03
 set g_balance_laser_primary_gauntlet 0
 set g_balance_laser_primary_force_zscale 1
 set g_balance_laser_primary_force_velocitybias 0.25
index d2cf3b76886b00a6cf699fe2837f63ba125beb07..e73af35b4066757af8235043c1f99f603b06bef6 100644 (file)
@@ -2014,3 +2014,12 @@ set cl_db_saveasdump 0 "write client.db in dump format (loads slower, easier to
 
 // uid2name
 seta cl_allow_uid2name -1 "-1 = ask if the player wants to disable/enable this feature, 0 = disable, 1 = enable uid2name (allows showing your name in race rankings for instance)"
+
+// polygonoffset for submodel SUCKS SUCKS SUCKS (only a hack for quake1, we don't need that)
+r_polygonoffset_submodel_offset 0
+r_polygonoffset_submodel_factor 0
+// workaround for "decals flicker all the time" - note that this polygonoffset still is not perfect, also, why do decals need higher polygonoffset when in a warpzone
+// this workaround causes decals to sometimes be visible through walls! (not seen it happen yet though other than on zfightometer)
+// once the issue is found, please revert back to the default of -14
+r_polygonoffset_decals_offset -100
+r_polygonoffset_decals_factor 0
index 33889827e36deebad5975fc15b7cc171b79ff708..5192b75ac24ea37fd4a67cc72bc885b80dd3ea60 100644 (file)
@@ -907,6 +907,7 @@ float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, float pGametype
                {
                        t = car(s); s = cdr(s);
                        if     (t == "weapons") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_WEAPONS;
+                       else if(t == "new_toys") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_WEAPONS;
                        else
                                dprint("Map ", pFilename, " supports unknown feature ", t, ", ignored\n");
                }
@@ -1029,8 +1030,9 @@ float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, float pGametype
        {
                if(!(MapInfo_Map_supportedGametypes & pGametypeToSet))
                {
-                       print("Can't select the requested game type. Trying anyway with stupid settings.\n");
-                       _MapInfo_Map_ApplyGametypeEx("", pGametypeToSet, MAPINFO_TYPE_DEATHMATCH);
+                       error("Can't select the requested game type. This should never happen as the caller should prevent it!\n");
+                       //_MapInfo_Map_ApplyGametypeEx("", pGametypeToSet, MAPINFO_TYPE_DEATHMATCH);
+                       //return;
                }
        }
 
@@ -1232,6 +1234,8 @@ void MapInfo_LoadMapSettings(string s) // to be called from worldspawn
                {
                        print("Mapinfo system is not functional at all. Assuming deathmatch.\n");
                        MapInfo_Map_supportedGametypes = MAPINFO_TYPE_DEATHMATCH;
+                       _MapInfo_Map_ApplyGametypeEx("", t0, t0);
+                       return; // do not call Get_ByName!
                }
 
                t = 1;
@@ -1245,12 +1249,9 @@ void MapInfo_LoadMapSettings(string s) // to be called from worldspawn
                if(cvar("g_mapinfo_allow_unsupported_modes_and_let_stuff_break"))
                {
                        print("EMERGENCY: can't play the selected map in the given game mode. Working with only the override settings.\n");
-                       cvar_set("timelimit", "0");
-                       cvar_set("fraglimit", "0");
-                       cvar_set("g_tdm_teams", "2");
-                       cvar_set("g_keyhunt_teams", "3");
-                       cvar_set("g_race_qualifying_timelimit", "0");
-                       cvar_set("leadlimit", "0");
+                       cvar_settemp_restore();
+                       _MapInfo_Map_ApplyGametypeEx("", t0, t0);
+                       return; // do not call Get_ByName!
                }
                else
                {
index 4e6ac985517df071103f4ea3e70c0d1d53c2229d..1fcc0dc662783ebd056281a5732a9d75ca98a31f 100644 (file)
@@ -1,18 +1,18 @@
-float MAPINFO_TYPE_CTF                         = 1;
-float MAPINFO_TYPE_ASSAULT                     = 2;
-float MAPINFO_TYPE_ONSLAUGHT           = 4;
-float MAPINFO_TYPE_RACE                                = 8;
-float MAPINFO_TYPE_DEATHMATCH          = 16;
-float MAPINFO_TYPE_TEAM_DEATHMATCH     = 32;
-float MAPINFO_TYPE_DOMINATION          = 64;
-float MAPINFO_TYPE_RUNEMATCH           = 128;
-float MAPINFO_TYPE_LMS                         = 256;
-float MAPINFO_TYPE_ARENA                       = 512;
-float MAPINFO_TYPE_KEYHUNT                     = 1024;
-float MAPINFO_TYPE_NEXBALL          = 2048;
-float MAPINFO_TYPE_CTS              = 4096;
-float MAPINFO_TYPE_CA                          = 8192;
-float MAPINFO_TYPE_ALL              = 16383; // this has to include all above bits
+float MAPINFO_TYPE_DEATHMATCH          = 1;
+float MAPINFO_TYPE_LMS                 = 2;
+float MAPINFO_TYPE_ARENA               = 4;
+float MAPINFO_TYPE_RUNEMATCH           = 8;
+float MAPINFO_TYPE_RACE                        = 16;
+float MAPINFO_TYPE_CTS                 = 32;
+float MAPINFO_TYPE_TEAM_DEATHMATCH     = 64;
+float MAPINFO_TYPE_CTF                 = 128;
+float MAPINFO_TYPE_CA                  = 256;
+float MAPINFO_TYPE_DOMINATION          = 512;
+float MAPINFO_TYPE_KEYHUNT             = 1024;
+float MAPINFO_TYPE_ASSAULT             = 2048;
+float MAPINFO_TYPE_ONSLAUGHT           = 4096;
+float MAPINFO_TYPE_NEXBALL             = 8192;
+float MAPINFO_TYPE_ALL                 = 16383; // this has to include all above bits
 
 float MAPINFO_FEATURE_WEAPONS       = 1; // not defined for minstagib-only maps
 
index ec006bd82141162885aa53262756d503c4e24b9e..b8b33c9739e756f4b4cdbf8872de035c6611648b 100644 (file)
@@ -172,8 +172,6 @@ void XonoticServerInfoDialog_loadServerInfo(entity me, float i)
        me.currentServerPing = strzone(s);
        me.pingLabel.setText(me.pingLabel, me.currentServerPing);
 
-       print(me.currentServerCName, "\n");
-
        s = crypto_getidfp(me.currentServerCName);
        if not(s)
                s = "N/A";
index f409a1b99df2742445a88bd1cfe1ea3b5f63ce2b..b3a658e3bd5732850058723633eb3ce8b12259a2 100644 (file)
@@ -36,8 +36,6 @@ entity makeXonoticPlayerList()
 
 void XonoticPlayerList_setPlayerList(entity me, string plist)
 {
-       dprint(plist,"------------\n");
-
        float buf,i,n;
        string s;
 
index bd2acdf5a60ea0e20718ea363b9c9ee1d905a2bc..aa47110bee63eeec644582a2b99e8b356d955d15 100644 (file)
@@ -36,10 +36,7 @@ void XonoticWeaponsList_draw(entity me)
        s = W_NumberWeaponOrder(cvar_string("cl_weaponpriority"));
        t = W_FixWeaponOrder(s, 1);
        if(t != s)
-       {
-               print("AUTOFIXED\n");
                cvar_set("cl_weaponpriority", W_NameWeaponOrder(t));
-       }
        me.nItems = tokenize_console(t);
        SUPER(XonoticWeaponsList).draw(me);
 }
index acfbb8a7c7561061d09dc749687c30893d6a064e..b351d77615732eb249be7c7c775c3bdbb017ceba 100644 (file)
@@ -360,6 +360,7 @@ void cvar_changes_init()
                BADCVAR("g_runematch_point_leadlimit");
                BADCVAR("leadlimit_and_fraglimit");
                BADCVAR("leadlimit_override");
+               BADCVAR("sv_checkforpacketsduringsleep");
                BADPREFIX("crypto_");
                BADPREFIX("g_chat_");
                BADPREFIX("prvm_");