Commit graph

122 commits

Author SHA1 Message Date
yangfl 81a39c229b Fix typo 2018-07-10 17:29:02 +08:00
heinrich5991 f8277267a0 Remove mem_alloc and mem_free, use standard C functions instead
Replace `mem_free` by `free`, and `mem_alloc` by `malloc` or `calloc`
(the latter one being used to allocate a zeroed array of elements,
sometimes, this makes a call to `mem_zero` superfluous).

This results in having to remove `mem_stats` which previously recorded
the number of allocations and their size that the Teeworlds code did
directly.

Remove OOM handling in `src/game/client/components/binds.cpp`.

Remove needless copying in the CSV code in
`src/game/client/components/statboard.cpp`.
2018-04-09 11:56:39 +02:00
Marcel Herd d513af6a42 Removed default bind for home key (kill)
Kill is already bound to K by default, binding it on home as well doesn't really have any purpose. (?)
Furthermore, the home key is right next to page up which is bound to toggling entities.
It is very easy to accidentally hit home instead of page up, which is highly frustrating.. therefore I suggest removing this duplicate binding.
2017-07-26 20:43:26 +02:00
def b57ffa429e Use scancodes instead of keycodes for input (fixes #796, please test) 2017-07-21 19:53:49 +02:00
def 35befec54c Clean up key binding a bit 2017-07-21 19:32:32 +02:00
heinrich5991 409bc0e019 Ensure null-termination in str_escape
This also fixes a couple of potential buffer overflows. The affected
code is still buggy (doesn't do the right thing on potential buffer
overflow), but at least it won't result in crashes/out of bound writes
anymore.
2017-07-08 13:06:03 +02:00
def 36d5c8d608 string toggling supports escaped strings; also some code cleanup 2017-07-08 11:03:51 +02:00
def 27074e926a Further cleanup 2017-06-02 19:44:14 +02:00
heinrich5991 921cfb29f8 Fix use-after-free on unbind 2017-04-13 02:09:42 +02:00
heinrich5991 1b88017fc5 Fix crashbug in bind system
Restore old behavior around the bind's Get() function, return "" if
there is no bind. Fixes #730.
2017-04-13 02:09:42 +02:00
Learath2 38cd5e89a5 Revert "Missed a case. Fixes #730" 2017-04-13 01:51:00 +02:00
Dennis Felsing 72e9571d57 Merge pull request #732 from Learath2/dd_pr_bindfix
Missed a case. Fixes #730
2017-04-13 01:13:24 +02:00
Learath2 30a9469df2 Missed a case. Fixes #730 2017-04-13 01:06:40 +02:00
Learath 6895b5a180 Check if the allocation succeeded. 2017-04-12 10:05:22 +02:00
Learath ae23924e81 Add arbitrary length binds. Fixes #642 2017-04-12 10:05:22 +02:00
Learath2 0d4499a027 Rename bind_print to dump_binds. 2017-03-06 18:06:55 +01:00
Learath2 759799953f Remove dump_binds. Let bind_print dump all. Fixes #634 2017-03-06 15:32:11 +01:00
Marcel Herd 7737129ed6 Fixed code style 2017-01-28 18:34:24 +01:00
Marcel Herd b09bcb90a3 Added check for unbound key 2017-01-28 17:02:39 +01:00
Marcel Herd 1f58595033 Added command bind_print 2017-01-28 16:29:03 +01:00
def a0a7d96ca0 Fix statboard bind 2016-04-30 23:39:42 +02:00
def 4761608329 Input fixes from TW master for mouse wheel 2016-04-30 20:11:26 +02:00
def e8965bee68 Some keyboard input changes from teeworlds master 2016-04-29 21:56:38 +02:00
def db8a126315 Merge swick's SDL2 branch 2016-04-29 21:55:48 +02:00
def f524c71c38 Fix a few default binds 2016-03-26 01:09:34 +01:00
H-M-H 8e24ef8020 commanddescription can now be placed directly in
the commandparamsstring: "s[file]"
2015-12-28 16:19:52 +01:00
H-M-H 11a426c18b added (console-)command usage 2015-12-23 14:29:31 +01:00
def 348ac53226 Bind chat on enter/return by default as well 2015-08-05 15:34:08 +02:00
def 30e3861117 More reasonable default key bindings 2015-07-07 12:40:22 +02:00
Nikita Zyuzin 002fb4c0a6 Add default key binding for statboard 2015-05-21 15:36:56 +04:00
def ad255ccfe5 Add default bind for converse 2015-03-15 10:18:43 +01:00
def b0594d5e5a Change some default binds 2014-07-26 01:12:32 +02:00
def 2f491a7d2f Better on screen keys for Android 2014-06-16 14:44:00 +02:00
def 7875c2ec36 Android support (by Pelya) 2014-06-16 13:29:18 +02:00
def 3dce4c9489 Add dummy (Thanks to //toast and Monsta) 2014-04-26 20:29:42 +02:00
def 028d3d731f DDNet auto binds 2014-01-14 21:47:54 +01:00
def 7d2b92b68f Add default binds 2013-08-18 03:33:55 +02:00
GreYFoX 7e24be5d83 Version 1.091a 2011-08-31 12:10:15 +02:00
GreYFoX 5b27758650 Removed level stuff
Removed client ID stuff
Removed console stuff
Resolved merge conflicts
Upgraded Banmaster
Cleaned up
2011-08-13 02:11:06 +02:00
GreYFoX dad66bffc3 General DDRace binds improvements 2011-04-17 19:45:48 +02:00
GreYFoX 0df6d0541f Merge branch 'master' of git://github.com/oy/teeworlds into HEAD
Conflicts:
	bam.lua
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config.h
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/game/client/components/binds.cpp
	src/game/client/components/chat.h
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/controls.cpp
	src/game/client/components/emoticon.h
	src/game/client/components/maplayers.cpp
	src/game/client/components/menus.h
	src/game/client/components/scoreboard.h
	src/game/client/components/spectator.h
	src/game/client/components/voting.h
	src/game/client/gameclient.cpp
	src/game/client/gameclient.h
	src/game/client/render.h
	src/game/collision.cpp
	src/game/editor/ed_layer_tiles.cpp
	src/game/gamecore.cpp
	src/game/gamecore.h
	src/game/layers.cpp
	src/game/layers.h
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/entities/laser.h
	src/game/server/entities/pickup.cpp
	src/game/server/entities/pickup.h
	src/game/server/entities/projectile.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gameworld.cpp
	src/game/server/gameworld.h
	src/game/server/player.cpp
	src/game/variables.h
2011-04-14 01:27:49 +02:00
heinrich5991 c83c7b1a19 reworked IConsole::PrintResponse to IResult::Print (and obviously CConsole::PrintResponse to CResult::Print) 2011-04-14 00:34:10 +02:00
oy 06115dd49d added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
oy 537e5fa7b6 added default keys for spectator next/previous and updated localisations 2011-04-13 17:39:26 +02:00
GreYFoX f7f6058a92 Merged Oy, Cleaned up, removed some useless features and code parts
Added Icon by landil
alot more...
2011-04-09 22:32:17 +02:00
GreYFoX b7d5014d3c fixed a little mistake 2011-03-18 01:36:03 +02:00
GreYFoX 8c2ef1f1ea version 1.063a
some default binds
2011-03-17 03:50:07 +02:00
GreYFoX 0cbcdd027a Removed Helper made Moderators able to moderate only
Enumerated levels
http://ddrace.info/forum/showthread.php?t=528
or modify the server and change the game type to something other than DDRace thank you
2011-03-16 16:27:30 +02:00
oy ee2f625754 added extended spectator mode. Closes #28 2011-03-10 10:08:14 +01:00
GreYFoXGTi 6904956a14 Added some DDRace Menu Items
Enforced cl_ddrace_cheats on zoom
2011-02-16 11:20:27 +02:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
GreYFoXGTi 1b2703aaba Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
GreYFoXGTi 5d9ee1736e made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/dutch.txt
	data/languages/french.txt
	data/languages/german.txt
	data/languages/russian.txt
	src/game/server/entities/flag.cpp
	src/game/server/entities/flag.h
	src/game/server/gamecontext.cpp
	src/game/server/gamemodes/ctf.cpp
	src/game/server/gamemodes/ctf.h
	src/game/server/gamemodes/dm.cpp
	src/game/server/gamemodes/dm.h
	src/game/server/gamemodes/mod.cpp
	src/game/server/gamemodes/tdm.cpp
	src/game/server/gamemodes/tdm.h
2010-11-22 00:26:00 +02:00
Sworddragon fc9211c777 Updated copyrights 2010-11-20 21:26:06 +01:00
btd 909c583d96 End merge 2010-08-26 00:30:21 +04:00
oy 41afca6db2 added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8 2010-08-25 01:17:02 +02:00
oy cabecb7fa9 added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8 2010-08-18 00:06:00 +02:00
Thomas 361380d630 *some esthetic changes
*split "CHud::RenderGoals()"
*added "reload" command
*added the ability to show last chat lines (+show_chat)
*updated french.txt
2010-05-30 12:01:11 +00:00
Tom Adams 659d66104e fixed dump_binds command (#806) 2010-05-30 00:15:26 +00:00
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00
Alfred Eriksson 82f9be8ce0 added help messages for all commands. added syntax in the help msg 2009-01-24 14:10:26 +00:00
Magnus Auvinen 5f186c8906 fixed so the console show help for each command. not all commands have descriptions however 2009-01-24 13:12:04 +00:00
Magnus Auvinen 9d51d47cea added tab completion to the console. works for local and remote 2009-01-24 12:16:02 +00:00
Dominik Geyer 003c2c7d44 fixed check for bind-keyid; patch by RomD 2008-11-04 23:39:02 +00:00
Magnus Auvinen bd5b2b9f85 removed glfw and portaudio. SDL is now a requirement 2008-10-23 16:18:33 +00:00
Magnus Auvinen 8404143afe added SDL support 2008-10-20 17:47:42 +00:00
Magnus Auvinen 6d44adb711 fixed keybindings. reworked the voting a bit. added vote spamming protection. added ingame voting hud. 2008-09-25 14:04:02 +00:00
Magnus Auvinen fa266334fd fixed on_console_init and on_save 2008-09-04 21:36:44 +00:00
Magnus Auvinen 8949d77fc4 added the binding commands to the console again 2008-08-30 21:01:57 +00:00
Magnus Auvinen 2b53f91a1f added the special binds again. console can now be accessed in the menus aswell 2008-08-30 09:34:55 +00:00
Magnus Auvinen ae364d4d29 scoreboard fixed 2008-08-27 19:50:33 +00:00
Magnus Auvinen dfe499248f major commit. game client restructure. not complete, loads of stuff not working, but the structure is there 2008-08-27 15:48:50 +00:00