Commit graph

380 commits

Author SHA1 Message Date
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 fa768449e2 fixed issue with reason on forcevotekick 2010-10-13 20:31:21 +02:00
GreYFoXGTi 47714c9468 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/variables.h
2010-10-13 14:08:35 +02:00
oy 8fb39524a9 do not use console in silent mode. Closes #48 2010-10-13 12:54:27 +02:00
oy e4fe7457c8 fixed problems with the mouse movement. Closes #214 2010-10-13 12:47:42 +02:00
GreYFoXGTi dc12d59a00 registered server dummy commands for tab completion in the client 2010-10-12 10:02:46 +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 411db8b885 fixed that chat message gets out of the window. Closes #102 2010-10-11 02:29:30 +02:00
Choupom 7aefbca742 made so we can add the reason for a kick/ban (fixes #123) 2010-10-11 00:31:14 +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 896634a061 Total Cleanup
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 23:28:06 +03:00
GreYFoXGTi e56b75090c Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/server/player.cpp
2010-09-22 11:46:18 +03:00
oy 27e6fa3ad7 fixed problems with key handling on osx. Closes #45 2010-09-22 00:40:35 +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 d913af1ab2 renamed demorec files to demo 2010-09-12 12:16:51 +02:00
GreYFoXGTi d1b3e01892 Merge branch 'master' of http://github.com/oy/teeworlds 2010-09-07 21:49:12 +02:00
ghost 3baf522330 added the option to hide the console window on the client, too. Fixes #48 2010-09-07 19:32:33 +02:00
GreYFoXGTi 616498e7b1 Merge branch 'master' of http://github.com/oy/teeworlds into master
Conflicts:
	src/engine/client/input.h
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/engine/shared/network_server.cpp
	src/engine/storage.h
	src/game/client/components/chat.cpp
	src/game/client/gameclient.cpp
	src/game/client/gameclient.h
	src/game/collision.cpp
	src/game/editor/ed_editor.cpp
	src/game/editor/ed_editor.h
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamemodes/ctf.cpp
	src/game/server/player.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:57:38 +02:00
oy 18632b7f5f fixed last commit 2010-09-05 14:09:55 +02:00
Choupom 44cf6acc3a fixed so png files are closed after loading 2010-09-05 14:07:07 +02:00
oy 8522cab449 fixed variable types 2010-09-05 14:04:50 +02:00
Choupom 25be8b1be3 fixed so clicking 3 times doesn't generate 2 double-clicks 2010-09-05 13:50:10 +02:00
btd 909c583d96 End merge 2010-08-26 00:30:21 +04:00
GreYFoXGTi 7f8fb7a5a7 Merging the client manually into the server
but i can't get the client to accept the console class of the server -.-" yet..

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-25 17:31:49 +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 d972e4ed69 fixed text rendering problem. Closes #12 2010-08-24 23:47:55 +02:00
oy 8cb15be7c0 added fixes for compiler errors and warnings by sworddragon 2010-08-24 23:44:33 +02:00
oy 8efbdda546 reverted input key handling back to 0.52(the keyboard layout problem should be fixed with sdl 1.3 or a customised one). Closes #3. Closes #15. 2010-08-24 23:43:39 +02:00
oy 0f72fd19ef fixed text rendering problem. Closes #12 2010-08-18 00:21:38 +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
oy abc84ac0b0 added fixes for compiler errors and warnings by sworddragon 2010-08-16 02:21:18 +02:00
oy 678fe76566 reverted input key handling back to 0.52(the keyboard layout problem should be fixed with sdl 1.3 or a customised one). Closes #3. Closes #15. 2010-08-15 20:04:03 +02:00
oy 94b28c8c97 fixed quit/exit command problem on startup 2010-08-15 15:41:04 +02:00
oy 5a237c6f78 fixed utf8 problem with empty entries in the server browser 2010-08-12 19:29:59 +02:00
oy 7503c64237 made unpacking of net strings more strict - prevents possible malformed output 2010-08-12 15:22:07 +02:00
oy 1cde96ef79 restore empty strings in the config to their defaults on startup 2010-08-11 00:31:42 +02:00
oy 3797eba179 added demo recording button by fujnky 2010-08-09 14:14:15 +02: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
oy 3f0ff1fb14 removed ServerDummy function cause it isn't needed anymore(actual console separates client and server commands) and added two missing server commands to the tab completion 2010-08-07 00:01:43 +02:00
oy 3c082b6441 changed the client configuration initialisation 2010-08-06 20:47:45 +02:00
oy 49cefa406b added lost logfile feature 2010-08-06 20:38:13 +02:00
oy 05f3757491 added optimisations by sworddragon 2010-08-05 20:55:51 +02:00
oy 665205327d added lost datadir override feature 2010-08-05 20:26:03 +02:00
oy 6193f35423 Merge branch 'master' of http://github.com/matricks/teeworlds 2010-07-17 14:10:43 +02:00
Magnus Auvinen 575f72d978 fixed some compiler errors and warnings with clang 2010-07-05 20:57:07 +02:00
oy 31b63e488a fixed connecting to localhost if the client couldn't find the address and small cleanup 2010-07-02 13:15:35 +02:00
oy 29d29df4f0 fixed screenshot bug. Closes #144 2010-06-27 13:12:00 +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
xalduin 6e1eaa96ec Fixed issue #115, text now fits into columns in server browser 2010-06-10 20:38:04 +08:00