Commit graph

107 commits

Author SHA1 Message Date
GreYFoX 9397c4a55f some make release changes for adding sql server files
Servers are no longer build with SQL by default.
fixed compilation on Mac OS X 10.5
2011-04-15 04:32:53 +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 0d0f72b059 stopped spamming the console 2011-03-18 02:10:48 +02:00
GreYFoX 974f429957 Added git revision to several places 2011-03-18 01:21: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 7b91ebd01c show actual page and fixed overlapping in the console 2011-03-15 09:15:46 +01:00
SushiTee c0b905f852 -fixed compiler warnings
-fixed mac compiling
2011-01-26 14:45:44 +02:00
GreYFoXGTi 2c51511260 Merge branch 'master' of http://github.com/oy/teeworlds into DDRace
Conflicts:
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/game/client/gameclient.cpp
2010-12-10 20:58:53 +02:00
oy 665934ee09 cleaned up several uses of timestamps for filenames 2010-12-08 00:32:50 +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
GreYFoXGTi a109e1150d Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/shared/config_variables.h
	src/game/client/components/console.cpp
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.h
	src/game/server/gamecontext.cpp
2010-11-18 01:10:59 +02:00
oy 8351682edf added constants for console types by Choupom 2010-11-17 13:01:46 +01:00
GreYFoXGTi ddf2883cb2 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/engine/shared/console.cpp
	src/game/server/gamecontext.cpp
2010-10-16 21:59:59 +02:00
oy 5f7efb465e optimised console rendering a bit 2010-10-16 10:32:56 +02:00
GreYFoXGTi d8e6cfcbdd Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/french.txt
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/game/server/gamecontext.cpp
2010-10-11 03:56:58 +02:00
oy 5754812dea clear history of the remote console on disconnect and cleaned up some old stuff in console.cpp 2010-10-11 00:30:56 +02:00
Choupom 00c1421034 fixed so the rcon password is not in the history (fixes #170) 2010-10-11 00:18:04 +02:00
GreYFoXGTi faaa8c241e Merge branch 'master' of http://github.com/oy/teeworlds into Cleanup 2010-10-07 15:33:48 +02:00
oy 3a98f7a048 added mod system. Closes #34 2010-10-06 23:07:35 +02:00
GreYFoXGTi 8a5d1100a5 This reverts commit b4b2404303.
thanks to Speedy-Consoles for pointing out the commit

Closes #54.

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-01 19:25:54 +02:00
GreYFoXGTi fa379a806a Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/server/server.cpp
	src/game/client/components/scoreboard.cpp
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
2010-09-13 07:49:01 +03:00
oy e226b47212 close the emote selector, chat history and the scoreboard when closing the chat, console or ingame menu. Closes #111 2010-09-12 12:43:03 +02:00
btd 909c583d96 End merge 2010-08-26 00:30:21 +04:00
oy c40bc9af3e fixed a possible crash in the client console 2010-06-21 13:45:30 +02:00
oy a5113c6740 added commands to dump the output of the consoles into a file 2010-06-20 14:12:59 +02:00
oy e2c3f744b2 added commands to clear the consoles. Closes #104 2010-06-19 20:51:54 +02:00
oy b790634a2d scroll the possible commands in the console's tab completion if the wanted one is out of sight. Closes #105 2010-06-19 13:48:01 +02: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
oy a41d930a85 fixed some compiler warnings. Closes #76 2010-06-06 17:16:52 +02:00
Tom Adams f14e7369f1 fixed movement bug (#741) 2010-05-31 21:40:40 +00:00
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00
Magnus Auvinen 878ede3080 major update with stuff 2009-10-27 14:38:53 +00:00
Magnus Auvinen cdc5f26900 new font rendering system using freetype2. only compiles under linux for now 2009-06-07 14:36:54 +00:00
Magnus Auvinen 4bb1df3189 moved 0.5 branch to trunk 2009-05-31 09:44:20 +00:00
Magnus Auvinen 01d74a6d4d fixed div by zero bug 2009-01-24 15:22:40 +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 0810f3a526 removed the no matching text in the console 2009-01-24 12:32:53 +00:00
Magnus Auvinen 9d51d47cea added tab completion to the console. works for local and remote 2009-01-24 12:16:02 +00:00
Alfred Eriksson bb6a0504dc editor now works correctly when console is toggled (focus problem) 2008-11-01 16:49:05 +00:00
Magnus Auvinen bd5b2b9f85 removed glfw and portaudio. SDL is now a requirement 2008-10-23 16:18:33 +00:00
Magnus Auvinen b4b2404303 release input when console is showing 2008-10-20 18:12:15 +00:00
Magnus Auvinen 8404143afe added SDL support 2008-10-20 17:47:42 +00:00
Magnus Auvinen cebda9790b some cleanups. splitted e_network.c into several files. continued on the ban support 2008-10-02 12:29:19 +00:00
Magnus Auvinen fa266334fd fixed on_console_init and on_save 2008-09-04 21:36:44 +00:00
Magnus Auvinen cd7a3519a7 added the loading screen again 2008-08-30 22:38:56 +00:00
Magnus Auvinen 432602c4ca renamed gc_ui.* to ui.* 2008-08-30 21:31:01 +00:00
Magnus Auvinen b03b048974 removed gc_client.hpp 2008-08-30 21:09:13 +00:00
Magnus Auvinen b4cef60d62 fixed the remote console 2008-08-30 08:01:29 +00:00
Magnus Auvinen 0511e1152a added sound component 2008-08-29 05:34:18 +00:00
Magnus Auvinen ae364d4d29 scoreboard fixed 2008-08-27 19:50:33 +00:00
Magnus Auvinen 68c52dd5ef repaired the local console 2008-08-27 16:23:15 +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
Renamed from src/game/client/gc_console.cpp (Browse further)