edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-11 02:28:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
4925 commits 1 branch 429 tags 411 MiB
Commit graph

51 commits

Author SHA1 Message Date
def 4b70e195c1 Multiline broadcasts 2014-04-19 00:40:21 +02:00
def 3eaad43b6b Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace 
Conflicts:
	bam.lua
	data/languages/index.txt
	src/engine/server/server.cpp
	src/engine/shared/network_server.cpp
	src/game/client/components/chat.cpp
	src/game/client/components/menus_settings.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/version.h
 2013-12-26 18:02:22 +01:00
oy 77478707f2 fixed a server crash due to faulty offsets. #1173 2013-12-15 12:30:27 +01:00
GreYFoX cd4ba53bae Merge branch 'master' of git://github.com/teeworlds/teeworlds into DDRace 
Conflicts:
	bam.lua
	scripts/build.py
	scripts/make_release.py
	src/engine/server.h
	src/game/client/gameclient.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/player.cpp
	src/game/version.h
 2012-04-12 02:09:31 +02:00
XXLTomate f9e4547b31 fixing the console (2) 2012-01-28 11:14:31 +01:00
oy de8c9b23eb added command to toggle config values. Closes #888 2012-01-09 01:25:18 +01:00
GreYFoX ee670118a5 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 
Conflicts:
	src/engine/console.h
	src/engine/server/server.cpp
	src/engine/server/server.h
	src/engine/shared/config.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
@heinrich5991 todo
 2012-01-01 00:11:56 +02:00
oy ec4bb94537 added logout command for econ 2011-12-30 19:12:31 +01:00
XXLTomate 137a447065 Victims without callback(s) 2011-11-08 12:30:54 +02:00
Ravomavain 7d1a392f03 Fix chat command and close #81 2011-08-31 22:58:48 +02:00
GreYFoX bf5374adbf Reverted a change 2011-08-31 02:48:58 +02:00
GreYFoX 7e6f6465b7 typo 2011-08-27 14:12:13 +02:00
GreYFoX c7d9b289e7 Added a command to check user status commands 2011-08-26 23:37:10 +02:00
GreYFoX 9fe96f6b04 Test Commands check and feedback on command not executed 2011-08-26 23:24:46 +02:00
GreYFoX b75a26eed9 Fixed the console 2011-08-26 20:03:30 +02:00
Ravomavain 15d0a40825 Add user level access and use this level for /cmds if player is not authed. 2011-08-26 16:28:14 +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 35d16bd58c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 
Conflicts:
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/menus_browser.cpp
	src/game/client/gameclient.cpp
	src/game/editor/editor.cpp
	src/game/editor/editor.h
	src/game/editor/io.cpp
	src/game/editor/layer_tiles.cpp
	src/game/editor/popups.cpp
	src/game/gamecore.cpp
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gamemodes/ctf.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2011-08-13 02:01:40 +02:00
oy a0a62bcd70 fixed econ feature and tcp 2011-07-30 13:40:01 +02:00
oy 571dff6216 made rcon auto completion serverside. Closes #97 2011-07-14 22:07:21 +02:00
oy 1ae474689d added moderator support for the remote console. #518 2011-07-05 21:54:10 +02:00
GreYFoX cc63cf2553 Merge branch 'master' of git://github.com/oy/teeworlds 
Conflicts:
	src/engine/external/pnglite/pnglite.c
	src/engine/external/pnglite/pnglite.h
	src/engine/shared/config_variables.h
	src/game/client/components/menus_browser.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/version.h
 2011-05-09 18:36:13 +02:00
Choupom c2f75b0017 structs are structs, classes are classes 2011-05-03 19:23:33 +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
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 16c074741f To have Cheats you must set a password and sv_register 0 
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 15:41:26 +02:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
GreYFoXGTi 2ec0e0eec4 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/shared/console.cpp
	src/game/client/components/hud.cpp
	src/game/client/components/scoreboard.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
 2011-01-12 11:08:17 +02:00
oy 4a79e575a0 fixed a compiler warning 2011-01-11 00:57:44 +01:00
oy 26f7c67895 fixed console parsing when using the exec command. Closes #381 2011-01-07 19:33:29 +01:00
heinrich5991 73ca31d168 changed rcon command "cmdlist" nearly completly 2010-11-24 22:09:31 +01:00
GreYFoXGTi 2ad456433d Made File Execution Level 3, but level 4 only for autoexec.cfg at server start 
Removed TODO, because it's needed there to reset tunings on map change
 2010-11-22 10:27:13 +02:00
GreYFoXGTi bdd3af9f43 Applied CMDList Pages 2010-11-22 09:55:50 +02: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
heinrich5991 daeb395e25 rcon victim system: replaced constants by enums 2010-11-16 16:07:45 +01:00
heinrich5991 50b8d93d6d finished system to generalize rcon commands, sorry for last commit's description 2010-11-07 17:35:11 +01:00
heinrich5991 6f35687e03 added system to generalize rcon commands 2010-11-07 16:29:55 +01:00
GreYFoXGTi 4d204d642f Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/console.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
 2010-10-26 00:25:36 +02:00
oy 8ca6a28088 parse line on addvote and skip invalid ones 2010-10-25 18:30:35 +02:00
GreYFoXGTi 5cf469fa11 Re-Added Command CMDList 2010-10-12 10:25:48 +02:00
GreYFoXGTi 332fb1de09 chat commands redirect to rcon and vice versa by heinrich5991 2010-10-11 00:40:07 +02: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
GreYFoXGTi 60b5acbb15 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/server/server.cpp
	src/engine/shared/console.cpp
	src/engine/shared/storage.cpp
	src/game/server/gamecontext.cpp
Alterations:
	src/engine/shared/console.h  | made StoreCommands(,)take also the client id
	src/engine/console.h  | made StoreCommands(,)take also the client id

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
 2010-08-09 17:54:42 +03:00
oy ad9b32b741 added the possibility to store commands within the console and execute them later on when everything is initialised correctly - fixes several possible startup crashes and the "Support bans in server configuration"-ticket 2010-08-07 20:22:25 +02:00
GreYFoXGTi 434b4aad86 The Porting of DDRace-Beta to trunk by [BlackTee] den Maps with one and two layer works properly. Laser works. Fix second game layer Re-added logs Readded the rcon commands addvote and scoring system and time Fixed Weapons 
Signed-off-by: btd <bardadymchik@gmail.com>
 2010-07-29 08:59:32 +03:00
oy ea64b0d7b3 made the console use the flagmask when looking for command (FindCommand) and removed double "No such command" console message 2010-06-18 20:32:52 +02:00