kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,150 Commits 1 Branch 0 Tags
1956f0acc0d5aaa7e2416464466264bb8a00432d
Commit Graph
230 Commits
Author SHA1 Message Date
ac-stef 1956f0acc0 clean up loadcrosshair 
* use the same list of gun names for all occasions
* switched syntax, so that argument completion will work
* support old syntax, so old config files will work
* fix path handling by disallowing paths altogether ;)

DOCREF loadcrosshair
 2015-02-23 18:55:58 +01:00
ac-stef 39cbee947d Merge branch 'master' into next 2015-02-08 16:17:04 +01:00
aurhat c31399a36a Add additional options to crosshairfx 
0 - turn off all effects; 1 - turn on all effects;
2 - turn on color change/off size change for AR and > 3 shots in a row;
3 - turn off color change/on size change for AR and > 3 shots in a row.
It fixes https://github.com/assaultcube/AC/issues/72 .

DOCREF crosshairfx
 2015-01-24 12:44:45 +01:00
aurhat d86e1a9581 Allow only flying spectating in bot modes 2015-01-24 12:18:48 +01:00
aurhat 8e6fbd9d7b Add the clock to scoreboard and change clockdisplay 
Commit shows time in format mm:ss in scoreboard, instead of
"X minutes remaining" info.
It also enables the clock default on the HUD and adds "clockcount"
variable which let to choose between counting forward or backward
in the clocks.

DOCREF clockdisplay clockcount
 2014-12-06 17:53:29 +01:00
aurhat 87bf71c8f1 Change position of "SCROLL/SPACE..." HUD messages 
Now "SCROLL/SPACE..." messages will be visible on the right side
of display, in every standard aspect ratio.
 2014-11-15 15:12:06 +01:00
ac-stef 4fdba4fa4a less ugly mapdims 
replaced the mapdims array with a struct with properly identified members

also reduced the calclight postfilter to actually used map areas
 2014-11-12 17:52:44 +01:00
aurhat 8838972e83 Display HUD messages over some less important info 2014-10-04 20:27:44 +02:00
aurhat c2dbf57816 Do "SCROLL to change player" visible in any standard aspect ratio 
Above text was cut for aspect ratio 5:4 (quite much) and 4:3 (a little) for
previous value "left = (VIRTW*3/2)*6/8"
 2014-06-28 12:30:25 +02:00
aurhatandac-stef 07780a8f92 move the clock to the right side 2014-06-11 22:24:31 +02:00
aurhatandac-stef b728a33bb3 Fix of wrong stats of pistol's ammo on HUD 
...when player holds nade and akimbo disappears.
To test the bug: take akimbo, take grenade, press "g"  and wait for akimbo disappearing.
Then stats on HUD shows, that player has pistol with 0 ammo, instead of full magazine.
 2014-05-17 23:41:38 +02:00
ac-stef b0649b5ea5 multiple map buffers for map editing: "xmaps" 
An xmap holds everything related to map editing at a certain moment: it is
a map editing snapshot. It contains the name, the header, the geometry,
the entities, the extra headers, the undo/redo data and the cameraposition
from the moment, the snapshot was taken.

Xmaps are held in memory and, if persistentxmaps is set to "1", are saved
at game end and restored at game start.

xmap_list
  lists all xmaps currently in memory

xmap_store <nickname>
  create a snapshot and store it under the given nickname
  (nicknames have to qualify as valid filenames)

xmap_restore <nickname>
  restores the named snapshot. Also creates a backup snapshot of the
  current editing data.

xmap_restore
  restores the last automatic backup snapshot. Automatic snapshots are
  taken, a) before a snapshot is restored, b) before a new map is loaded
  (if there were unsaved edits on the map) and c) when the game ends (if
  there were unsaved edits).

xmap_delete <nickname>
  deletes the named snapshot.

Unsaved edits are flagged in the HUD with an "U" in the lower right
corner of the screen.

The files with the persistent xmaps are stored in mapediting/xmaps. After
they were restored at game start, the files are moved to
mapediting/xmaps/backups. Xmap files are cubescript files.
 2014-05-15 17:34:25 +02:00
ac-stef eb60302e67 cleanup 
- fix possible crash in conc (but it's still an ugly hack)
- fix noob usage of strcmp
- flag some memory leaks (it would be nice, if the author(s) would clean
   up the mess himself)
- fix crash in substr
- whitespace cleanup

there are plenty more memory leaks in command.cpp - for example, every
goto in cubescript does not clean up anything
 2014-05-14 22:54:37 +02:00
Lucas GAUTHERONandac-stef 8e0796a6ae transparency options for console and votes (resolves #45) 2014-05-14 14:28:54 +02:00
Ronald Reagan 305ef19887 Removing lasttarget 2014-01-23 09:23:40 -08:00
Lucas GAUTHERON 31c0d29bc2 minor code "fixes" 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7276 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2013-03-02 15:04:23 +00:00
Cristian Vlasceanu 491fb73c2d fix for crosshair not showing when spectating; 
fix for setfollowplayer 0 crashing the game in bot mode

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7251 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2013-02-22 20:30:26 +00:00
Bukz f353141284 alias newselkeys - "binds" a list of keys to make new (multiple) selections in editmode (left CTRL is default) 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7221 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2013-02-17 02:21:07 +00:00
Bukz 7ab718f74e /loadcrosshair fixes/updates (plz review/test) 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7211 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2013-02-16 00:09:22 +00:00
Alejandro V. Garcia ea57f8b39a clean up 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7048 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2013-01-09 23:51:00 +00:00
aerkefiende d8815d7362 Removed commented line (based on rev. 7044) 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7045 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2013-01-08 19:32:16 +00:00
Alejandro V. Garcia 4bd9947d67 Flags bug fix 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7044 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2013-01-08 09:58:43 +00:00
Ronald Reagan 3b5d000c78 Added comments and fully commented out drawsgpat 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7041 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2013-01-07 18:16:13 +00:00
aerkefiende 17f62e3375 radarheight min 5 max 500 def 150 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6994 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2012-12-23 23:00:44 +00:00
Lucas GAUTHERON c445995c1a ktf flag icons fix 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6979 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2012-12-16 14:03:53 +00:00
sireus 188e5834dc don't show flag counts in non-team modes (thanks, XFA) 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6972 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2012-12-12 18:08:05 +00:00
aerkefiende 66f8feee3b Replaced every tab with 4 spaces 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6927 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2012-11-12 22:28:11 +00:00
Ronald Reagan 44abbf67d1 New shotty sources 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6919 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2012-10-29 03:01:32 +00:00
sireus b33116712c sane(r) command signatures (warning: huge commit) 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6908 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2012-10-06 22:49:49 +00:00
Lucas GAUTHERON f15733342c avoid command overwriting by the accuracy board 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6886 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2012-09-23 09:53:10 +00:00
sireus 8f39911eb0 cleaned up spectator mess a bit 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6781 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2012-04-05 13:19:06 +00:00
Lucas GAUTHERON 63e3ff8f88 "ambiguous call to overloaded function" fixed 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6764 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2012-03-11 08:05:59 +00:00
Alejandro V. Garcia 5a3716d3d7 Positioning changes applied to other players 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6759 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2012-02-17 01:48:17 +00:00
Alejandro V. Garcia 5e63720fb6 Accurate local player positioning in minimap & radar views 
other players needs to be checked

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6758 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2012-02-16 13:08:42 +00:00
sireus 16c4b28914 HUD fixes 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6757 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2012-02-13 18:35:15 +00:00
Alejandro V. Garcia e368ad2eb8 dbgpos info moved 1 row up 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6753 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2012-02-08 07:00:51 +00:00
sireus e442b79f83 speed indicator 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6749 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2012-01-30 13:09:27 +00:00
sireus 4a6b67de1f show flag count on HUD (WIP) 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6748 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2012-01-30 12:54:18 +00:00
aerkefiende 06f73f4627 Replaced Tabs with 4 spaces in every source file 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6561 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2011-07-31 15:44:57 +00:00
Lucas GAUTHERON 2f3be59098 do not render inactive players (radar/minimap) 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6542 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2011-06-23 22:11:24 +00:00
Bukz 33cf8715e7 "showtargetname" - enables or disables showing the player name on the HUD when in your crosshair. 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6487 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2011-06-01 03:03:33 +00:00
sireus 9c797155a9 restore flashing flag icon (oops) 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6419 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2011-05-11 10:52:15 +00:00
sireus 0c141d4016 flag icon transparency fix 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6341 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2011-04-25 21:01:38 +00:00
flowtron ad32bca94f allow transparent CTF-icons in HUD 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6264 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2011-04-17 14:52:50 +00:00
flowtron 2ef8bd9d4e radarentsize de-coupled from gdim, radarheight default = 150 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6200 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2011-04-02 19:14:46 +00:00
flowtron 5bce19a3fd getEngineState COMMAND && DOC 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6197 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2011-04-02 15:41:52 +00:00
flowtron 2d9edb6dc4 rewrite of radar-code 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6110 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2011-02-27 22:16:28 +00:00
flowtron a83856a1d2 preload scope.png 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6057 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2011-02-05 09:44:31 +00:00
flowtron 913ac5f749 getposition command (*type 0|1 int|float) 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6027 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2011-01-18 06:04:07 +00:00
RandumKiwi d40d709dfd move crosshairs directory to its own packages path 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5823 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2010-11-10 22:44:50 +00:00