From 94b2ecf53aff78c9a928a4370c0fdf78dcbd0891 Mon Sep 17 00:00:00 2001 From: Bukz Date: Mon, 6 Jun 2011 14:23:32 +0000 Subject: [PATCH] changelog updates, getposition/positiontype removed in favor of the player1 command, etc. git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6511 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- changelog.txt | 85 ++++++++++++++++++++++----------------- config/survival.cfg | 2 +- docs/reference.xml | 35 ---------------- source/src/clientgame.cpp | 20 --------- 4 files changed, 48 insertions(+), 94 deletions(-) diff --git a/changelog.txt b/changelog.txt index 14d88763..c7695f1e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,66 +1,66 @@ AssaultCube ChangeLog -1.1.0.4 => 1.1.0.5 +1.1.0.4 -> 1.1.0.5/6? --------------------- -Please add all commited changes to the SVN trunk from last release here, check TODO's -This changelog is a WIP; +Please add all commited changes to the SVN trunk from last release here, check TODO's. +This changelog is a WIP! Find me a category! --------------------- // TODO : move this into other categories (you'll have to add some cats..) -[*] Drop camera to previous followed player position when switching to fly editmode. -[*] nearplane fix // TODO explain -[*] fix broken demo-viewer not able to change to SPECTATOR +[*] Drop camera to previous followed player position when switching to fly specmode. +[*] Nearplane fix. // TODO explain +[*] Fix broken demo-viewer not able to change to SPECTATOR. Weapons --------------------- [*] Sniper damage changed (82 -> 80) -[*] New shotgun behavior // TODO : explain ? -[*] Quicknadethrow now switches to nade even if the player was attacking -[*] nades accuracy, real shotgun accuracy -[*] Sniper trail bug fixed -[*] Hudgun can be displayed when spectating +[*] New shotgun behavior. // TODO : explain ? +[*] Quicknadethrow now switches to nade even if the player was attacking. +[*] Grenades accuracy, real shotgun accuracy. +[*] Sniper trail bug fixed. // TODO: Is this for the "stop the sniper trail upon hit thing"? If so I'm not 100% certain it's completely fixed. // Bukz +[*] Hudgun can be displayed when spectating (and in demos - e.g. /spechudgun 1). Servers --------------------- -[*] Sets kill messages to appear in log for each weapon from a config file, default : serverkillmessages.cfg -[*] New switch to disable game status table of scores logging (-l switch) +[*] Sets kill messages to appear in log for each weapon from a config file. (Default: serverkillmessages.cfg) +[*] New switch to disable game status table of scores logging. (-l switch) [*] Linux server available HDD space bug fixed. [*] /setnext bug fixed. -[*] Fixed bug with map names containing slashes -[*] The carbine is now consistently called such (not "Rifle") +[*] Fixed bug with map names containing slashes. +[*] The carbine is now consistently called such. (not "Rifle") +[*] The server now differentiates between CTF/HTF scored flags in the serverlogs. (Useful for parsing/stats collection.) Server browser // TODO : merge with "Servers" ? ---------------------- -[*] Colored ping in serverbrowser +[*] Colored ping in serverbrowser. [*] Ability to connect to a server that requires a password via the server browser. (password protected, deban, etc.) -[*] New updated kick/ban/reason menu with client statistics. (Reports teamkills as well.) Bots --------------------- [*] New scripted "bot survival mode". [*] Bots in plclips bug fixed. -[*] bots now actually fire the rifle -[*] Bots can change use pistol, knife or nades -[*] Bots have different fov, depending on their level -[*] Bot PF, LSS, Team survivor & TOSOK modes +[*] Bots now actually fire the carbine. +[*] Bots can switch to, and use pistol, knife or grenades. +[*] Bots have different fov, depending on their difficulty. +[*] Bot PF, LSS, Team Survivor & TOSOK modes. Media (maps/textures/models) --------------------- // TODO add new maps & any new textures or models please :) (waypoints, new maps..) -[*] ac_edifice, ac_industrial, ac_stellar added to the official map package +[*] ac_edifice, ac_industrial, ac_stellar added to the official map package. Textures / Screenshots / ... --------------------- -[*] Textures can now have a non-default scale, definable through the texture command -[*] screenshotscale - in-engine scaling of screenshots +[*] Textures can now have a non-default scale, definable through the texture command. +[*] screenshotscale - in-engine scaling of screenshots. Physics --------------------- @@ -71,32 +71,33 @@ Physics Rendering / HUD / ... --------------------- -[*] Now using ANIM_REVERSE for playermodels going backward -[*] Fixed flag icon transparency +[*] Now using ANIM_REVERSE for playermodels going backward. +[*] Fixed flag icon transparency. Mapping --------------------- [*] Key "F7" is now key bound to toggle fullbright on/off. -[*] Key "7" is now key bound to "nextclosestent" - it gets typo'd all the time - know from experience. -[*] entproperty now works in MP coop, but buffered +[*] Key "7" is now key bound to "nextclosestent" - it gets typo'd all the time. +[*] entproperty now works in MP coop, but buffered. I18n / L10n --------------------- -[*] Client now tries to set the LANG alias if it's not defined +[*] Client now tries to set the LANG alias if it's not defined. [*] fixed LANG for windows (breaks Win98/2K compatibility!) -[*] Float separator set to "." (dot) regardless of locale +[*] Float separator set to "." (dot) regardless of locale. Menus --------------------- [*] New menuitems in the Keyboard menu, for looking up keybinds, and enabling/disabling the old editing binds system. [*] New menuitems in the gameplay settings menu, for setting fly velocities, and the color that your name is highlighted in, when it appears on the console via chat. (HIGHLIGHT) +[*] New updated kick/ban/reason menu with client statistics. (Reports teamkills as well.) Cubescript --------------------- [*] addpunct - Injects CubeScript punctuation. (e.g. echo (addpunct hello) // Output: "hello") -[*] break - Jumps out of a loop created with the "loop" or "while" command +[*] break - Jumps out of a loop created with the "loop" or "while" command. [*] continue - Skip current iteration of a "loop" or "while" command. [*] delmenu - Deletes all of the menu items in the specified menu. [*] akimboautoswitch - Enables or disables automatically switching to akimbo upon pickup. (regardless of current weapon) @@ -104,6 +105,7 @@ Cubescript [*] getvar - Gets the current value of a CVAR. (client variable) [*] isIdent - Determines if the argument given is a built-in identifier. [*] isSpect - Determines if you are in any form of spectating (team, or singleplayer "fly") +[*] inWater - Determines if you are standing or submerged in water. [*] l0 - Adds leading zeros to an integer. [*] powf - Returns a floating point integer raised to the power of another, floating point integer. [*] rrnd - Returns a ranged random integer. @@ -118,7 +120,6 @@ Cubescript [*] getEngineState - Returns a list of the items that showstats displays. (i.e. FPS LOD WQD WVT EVT) [*] getmode - Returns the current mode. (e.g. echo (getmode) // Output: team deathmatch // echo (getmode 1) // Output: TDM) [*] megabind - Bind a key to many different actions depending on the current game state. (i.e. do this if watching a demo, do this if editing or in coop-edit mode, do this if connected to a server, etc.) -[*] getposition - Returns the coordinates of the player as a list of 3 integers or floating-point values - X, Y and Z. // TODO remove (playerinfo does the job) [*] onCallVote - Native alias that is executed when someone (including yourself) calls a vote. [*] onChangeVote - Native alias that is executed when someone (including yourself) changes a vote. [*] onVoteEnd - Native alias that is executed when a vote passes or fails. @@ -129,7 +130,6 @@ Cubescript [*] onReload - Native alias that is executed when you reload a weapon. [*] onNewMap - Native alias that is executed when you executed the /newmap command. [*] afterinit - Native alias that is executed immediately after saved.cfg is loaded. -[*] positiontype - Modifies the type of data that getposition returns. (0 for integer, 1 for floating point integer) [*] setfollowplayer - Spectates the player with client number x. [*] setmr - Restarts a demo and "fast forwards" to minutes remaining x. [*] dyngamma - Enables or disables a new "per-official-map dynamic gamma system". @@ -147,11 +147,11 @@ Cubescript [*] getscrext - Returns the proper file extension of your current screenshottype setting. (e.g. ".jpg" without the quotes) [*] oldselstyle - Enables or disables the old (1.0.4) grid/current selection style. (squares instead of triangles) [*] Multiple Idents - New helper aliases for (c). (e.g. echo (red)Hello (blue)world! (white)My fov today is: (orange) $fov) -[*] resetsleeps - Reset all pending sleeps +[*] resetsleeps - Reset all pending sleeps. [*] settex - Set texture given as first argument to the walls of current selection and of the type specified in 2nd argument. -[*] round - Round a float, returns an integer -[*] ceil - Returns the ceil value of a float -[*] floor - Returns the floor value of a float +[*] round - Round a float, returns an integer. +[*] ceil - Returns the ceil value of a float. +[*] floor - Returns the floor value of a float. [*] aliasinit - Uses checkinit to initialize a list of aliases. [*] checkinit - Determines if an alias exists or not, and if it does not exist, it is initialized to a specified value. (If no value is given, it is simply initialized to "") [*] checkmag - Determines if there is *any* ammunition available for the specified weapon. (counts currently loaded rounds, and magreserve rounds) @@ -162,11 +162,20 @@ Cubescript [*] gndtoggle - Toggles between primary/grenades. [*] disablehud - Stores your current HUD configuration into a buffer (for later restoration with /enablehud) and disables it entirely. [*] enablehud - Restores your HUD configuration from a previous /disablehud. +[*] tolower - Converts a string to all lowercase characters. +[*] toupper - Converts a string to all uppercase characters. +[*] convertcase - Converts a list of strings to lower/uppercase characters. +[*] testchar - Tests a character argument for certain things. (e.g. echo (testchar a) // Output: 0 // It is not a 0-9 digit.) +[*] testlist - Tests a list argument for certain things. (e.g. echo (testlist "1 2.3 3.14") // Output: 1 // It is a valid list of ints/floats.) +[*] player1 - // TODO explain // Also getposition and positiontype have been removed in favor of this command which does that and a lot more. :p [*] Multiple Idents - New helper aliases for voting for SURV, TPF, and TLSS. (e.g. /surv ac_desert) -[*] "Sleeps" can be persistent (3rd argument of "sleep" command) +[*] "Sleeps" can be persistent. (3rd argument of "sleep" command) [*] Substr crash bug is fixed. Also the command can now use a negative position value. [*] New stat in (pstat_score) for teamkills. New list is: FLAGS FRAGS DEATHS POINTS TEAM TEAMKILLS NAME // TODO move to compatibility.cfg [*] on_quit.cfg for deleting aliases from saved.cfg upon quit. [*] Many aliases that were stored in saved.cfg are now being stored as a single alias (list) "tmpClientData" and being restored on start. (see on_quit.cfg) // Not yet, still buggy. :P [*] Missing bracket ([], (), etc.) errors now also notify the client of what file the error resides in. [*] New automatically executed scripts folder in the root install directory of AC. +[*] The /spectate command can now only be used if connected to a server. +[*] togglebotview can no longer be used in arena modes. +[*] New delta_edit/game_# aliases for easily tweaking gamma/fov/flyspeed on-the-fly. (e.g. Hold F5 and scroll for gamma, F6 for fov, bind "domodifier 10" to a key for flyspeed) diff --git a/config/survival.cfg b/config/survival.cfg index ecb72985..87989e52 100644 --- a/config/survival.cfg +++ b/config/survival.cfg @@ -91,7 +91,7 @@ findCenter = [ teleportPlayer = [ if (! (alive)) [ attack ]; if (!= $gamespeed 100) [ gamespeed 100 ]; survTeleported = 1; findCenter; if (! $editing) [ edittoggle ]; go_to (at $tmpZoneCenter 0) (at $tmpZoneCenter 1); sleep 25 [ edittoggle ] ] isInZone = [ - if (&& (&& (>= (getposition 0) (at $zone 0)) (>= (getposition 1) (at $zone 2))) (&& (<= (getposition 0) (at $zone 1)) (<= (getposition 1) (at $zone 3)))) [ + if (&& (&& (>= (player1 x) (at $zone 0)) (>= (player1 y) (at $zone 2))) (&& (<= (player1 x) (at $zone 1)) (<= (player1 y) (at $zone 3)))) [ result 1 ] [ result 0 diff --git a/docs/reference.xml b/docs/reference.xml index 24f22a17..0c450652 100644 --- a/docs/reference.xml +++ b/docs/reference.xml @@ -1938,23 +1938,6 @@ echo foo - - - - Whether the values returned by getposition are integers (0) or floating-point numbers (1). - - - - - - - - Returns the coordinates of the player as a list of 3 integers or floating-point values - X, Y and Z. - - - - - Returns the score statistics for the player with the given clientnumber. @@ -6393,24 +6376,6 @@ Output: Clears all demos currently in memory on the server. - - Get information about your place in the world. Dimension: 0123 => XYZ and yaw - - - - - - - - - - 0: int, 1: float - - - - - - returns the currently used formatstring for demo filenames diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 7c257098..554f21a3 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -1768,26 +1768,6 @@ COMMAND(setfollowplayer, ARG_1INT); int isalive() { return player1->state==CS_ALIVE ? 1 : 0; } COMMANDN(alive, isalive, ARG_IVAL); -VARP(positiontype, 0, 1, 1); // integer (0) or float (1) return values? -void getposition(int dim) -{ - string posr; //posr[0] = '\0'; - formatstring(posr)("?"); - float cv = 0; - switch(dim) - { - case 0: cv = player1->o.x; break; - case 1: cv = player1->o.y; break; - case 2: cv = player1->o.z; break; - case 3: cv = player1->yaw; break; - default: break; - } - if(positiontype) formatstring(posr)("%.2f", cv); - else formatstring(posr)("%d", (int)(cv*100)); - result(posr); -} -COMMAND(getposition, ARG_1INT); - void serverextension(char *ext, char *args) { if(!ext || !ext[0]) return;