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

645 commits

Author SHA1 Message Date
GreYFoXGTi ddb4c2e370 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into teams2 
Conflicts:
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamemodes/DDRace.h
	src/engine/shared/config_variables.h

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-08 22:22:08 +02:00
btd fec294caee Fix linux compilation. Revert last changes. Add /show_other option (in menu now working) 2010-09-08 20:22:11 +04: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
ghost 56c4081da4 Demo name is now showed while playing a demo file 2010-09-07 19:12:11 +02:00
GreYFoXGTi 9dda4a5a81 merging conflict mistake 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 08:09:35 +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
GreYFoXGTi 1fe93f4592 Reworked the Crazy Shotgun, and fixed a bug ( still needs testing ) 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 07:47:10 +02:00
GreYFoXGTi db3a97c771 Small Mistake. Closes #19 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 06:45:36 +02:00
GreYFoXGTi 15576f123a Something i forgot to do while merging from Oy 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 06:45:36 +02:00
GreYFoXGTi 91d65a5e69 Added /kill 
but i couldn't make the clients have a suicide penalty for some trivial reason since i am ill.. -.-"

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 06:45:35 +02:00
GreYFoXGTi 290c453a83 Removed useless config variables 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 06:45:35 +02:00
GreYFoXGTi ebb5636fa3 /pause no longer pauses you time by default 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 06:42:42 +02:00
Choupom fcfaa8389f added Remove button in demos browser (#66) 2010-09-05 17:40:51 +02:00
oy 2800832e12 add maps from maps folder to the demo as well and prevent that 0.5 demo players read the new demos 2010-09-05 17:39:55 +02:00
Choupom 0198e51fa3 made demo readable for custom map that user doesn't have (#5) 2010-09-05 16:34:39 +02:00
Choupom 3dd1ea0d8f fixed header and swap sizes in datafiles (may fixes #14) 2010-09-05 14:30:44 +02:00
Choupom 885d695f92 show map name without his folder in server info 2010-09-05 14:11:56 +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
GreYFoXGTi 8901057944 Modified the config variables to have level 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-31 01:47:55 +02:00
GreYFoXGTi 7f0fa6d6b1 Added Switch Layer and it Finally works like it should 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-28 18:24:56 +02:00
GreYFoXGTi 883e0f2222 Trying to fix the crazy shotgun bullets -.-" 2010-08-26 19:55:22 +02:00
GreYFoXGTi 7918fcd179 Trimmed ends 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-26 03:12:56 +02:00
GreYFoXGTi de4a0559d8 need to make this parse work 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-26 03:12:01 +02:00
GreYFoXGTi 06445bfb62 Changed the config_variables.h for parsing reasons 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-26 03:10:50 +02:00
btd d24ca19752 End merge(Good Work btd) 2010-08-26 00:17:05 +02:00
GreYFoXGTi 51b16803d7 Merge branch 'master' of http://github.com/btd/DDRace 2010-08-25 19:16:08 +02: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
btd 525e72b1dd Forgot to delete this 2010-08-25 18:39:18 +04:00
btd ecdcf09456 Merge branch 'master' of git://github.com/GreYFoXGTi/DDRace-Server 2010-08-25 18:34:21 +04:00
btd 091a1125a3 Uncomment things in file_score. Add config variables 2010-08-25 18:33:21 +04:00
GreYFoXGTi e37992ae56 fixes after cherry picking 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-25 15:24:31 +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
GreYFoXGTi 7ff7ca85ec sometimes my git just wants to commit a file no matter how many times i revert it 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-24 23:38:40 +02:00
GreYFoXGTi 92b51c3ec8 SvShotgunBulletSound default is now 0 sorry i can't take those annoying sounds 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-24 22:47:35 +02:00
GreYFoXGTi 51c6af1303 SvShotgunBulletSound 
also added protection to shotgun stucks, needs to be tested when a random crazy shotgun bullet gets stuck
loaded the score file before saving to avoid corruption
added freeze and unfreeze in rcon
added protection in some rcon commands

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-23 23:40:23 +02:00
GreYFoXGTi 8b67e70dfb Fixed /pause not saving the time 
made sv_pauseable on by default

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-23 01:59:54 +02:00
GreYFoXGTi 76c6bc7e2f Added option to make super hook endless 
removed RACE_PAUSE

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-23 01:40:05 +02:00
GreYFoXGTi c4d60e93ba NOt needed as you can bind your own emote now 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-22 21:32:41 +02:00
GreYFoXGTi 999e8590e7 Fixed Ban --->All<--- System Issues 
Also it's not possible do hide the Ban message by setting the reason trying to connect too soon from rcon

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-22 18:06:20 +02:00
GreYFoXGTi e3dffbb741 Making the Mod Cooler ( Pimp My Mod ) xD 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-22 06:28:14 +02:00
GreYFoXGTi 5a2af8f3ff re worked timer commands fixes issue #11 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-21 05:19:47 +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
GreYFoXGTi 01cc3f4d68 Merge branch 'master' of http://github.com/oy/teeworlds 
and fixed Conflicts:
	src/engine/server/register.h
	src/game/server/gamemodes/mod.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
 2010-08-15 20:46:02 +03:00
btd bbd48810ad Merge branch 'master' of http://github.com/oy/teeworlds 2010-08-15 19:20:39 +04:00
oy 94b28c8c97 fixed quit/exit command problem on startup 2010-08-15 15:41:04 +02:00
oy 0e36b772d4 fixed line endings in some files 2010-08-15 15:34:55 +02:00
oy 5a237c6f78 fixed utf8 problem with empty entries in the server browser 2010-08-12 19:29:59 +02:00
oy d9a3cc032f updated refactor script and fixed a thing 2010-08-12 19:03:03 +02:00
oy 54f804eda2 fixed bug in servers setclientname 2010-08-12 16:12:25 +02:00
oy f494d344a9 removed some not longer needed stuff 2010-08-12 15:44:11 +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
GreYFoXGTi 20930ce68b too many stuff to write but the idea is to implement the telelayer&speed thnx to Redix and Sushi Tee 
also FrontLayer is ready to be implemented soon

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
 2010-08-10 19:32:32 +03: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 3797eba179 added demo recording button by fujnky 2010-08-09 14:14:15 +02:00
btd 227c03cbb1 Fix mistake 2010-08-07 22:49:57 +04:00
oy 0a66e0586d fixed a small bug in the ban command 2010-08-07 20:31:36 +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
btd e416c38ad1 GreYFoX fix of ban 2010-08-07 21:16:48 +04:00
btd 84cf23203d Revert storage.h 2010-08-07 12:02:58 +04: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 4a365d41b6 added fix for crash when there is no datadir 2010-08-05 20:34:16 +02:00
oy 665205327d added lost datadir override feature 2010-08-05 20:26:03 +02:00
btd ecedf0a54f Merge 2010-08-01 00:14:58 +04:00
btd e8018dd712 Optional timer command 2010-07-31 16:58:57 +04:00
btd 7f65d880f3 Fix external records 2010-07-31 15:04:19 +04:00
btd eabe4639c8 Add storage.h. Add config variable for holding records in appSaveDir. I am not sure is it right way 2010-07-31 13:14:20 +04:00
btd 37b0f43d1c Fix strange 0 pointer bug. (very strange bug) 2010-07-31 00:16:36 +04:00
btd c280e5c5b4 Fix ban 2010-07-30 21:20:58 +04:00
btd 9c052398f4 Last changes added. All fixed. Server builded. 
Need many test before release.

Signed-off-by: btd <bardadymchik@gmail.com>
 2010-07-30 16:50:09 +04:00
btd 7f42b6225b To the last DDRace. Need a lot fix 2010-07-29 23:55:33 +04:00
GreYFoXGTi eb9793d89a Moved all used server variables to config_variables.h 
tried to fix /pause and failed cause i can't get the hooked player's character to check if he is paused or not
changed welcome message default.
on join player sees the server's /info

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
 2010-07-29 22:51:58 +03:00
GreYFoXGTi 0a9dc07d0c Fixes Issue #5 
Changed /info
Fixed anti-rainbowmod

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
 2010-07-29 17:54:04 +03:00
GreYFoXGTi a8d1c536af re-enabled the DDRace ip count check, then found it's useless tw trunk has it's own 
fixed ip 0.0.0.0 showing for the rest of the notifications in server.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
 2010-07-29 13:09:25 +03:00
GreYFoXGTi 7b5df1e1d3 Fixed Client authentication with blank password 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
 2010-07-29 12:15:55 +03:00
GreYFoXGTi a9c00caafb Merge branch 'master' of http://github.com/matricks/teeworlds 2010-07-29 09:46:07 +03: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 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 9130c91841 fixed entering a private server on a map change without password. Closes #142 2010-06-26 17:59:59 +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 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 a5bc567e84 fixed a server register issue 2010-06-13 19:34:14 +02:00
xalduin 6e1eaa96ec Fixed issue #115, text now fits into columns in server browser 2010-06-10 20:38:04 +08:00
xalduin dc3feaf42c Fixed remaining compiler warnings for gcc on Linux 2010-06-10 20:38:03 +08:00