Commit graph

299 commits

Author SHA1 Message Date
GreYFoXGTi 2f5f332cbb Merge branch 'master' into DDRace
Conflicts:
	src/engine/client/client.cpp
	src/engine/shared/config_variables.h
2010-12-13 03:43:22 +02:00
oy c75a75b64f made it possible to automatically take game over screenshots. Closes #339 2010-12-12 16:48:13 +01:00
GreYFoXGTi 46c2225d60 Merge branch 'master' of http://github.com/oy/teeworlds into DDRace
Conflicts:
	data/languages/dutch.txt
	data/languages/french.txt
	data/languages/russian.txt
	scripts/make_release.py
	src/engine/shared/config_variables.h
2010-12-11 21:28:43 +02:00
oy a0985314c9 made it possible to "recycle" auto recorded demos 2010-12-11 18:55:28 +01: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 0fe8cabe78 added auto recording support by Batchyx 2010-12-08 01:42:32 +01:00
GreYFoXGTi 122c7954d9 Announcement Randomness 2010-12-06 04:27:35 +02:00
GreYFoXGTi 69ce24b92c forgot this 2010-12-04 03:13:24 +02:00
GreYFoXGTi 83cea23373 Reworked some stuff 2010-12-03 14:58:38 +02:00
GreYFoXGTi 0a29aae473 added old Laser Behavior Configuration 2010-12-02 00:07:33 +02:00
GreYFoXGTi 7f24d0f144 Fixed ID 0 Bug 2010-11-26 20:01:55 +02:00
GreYFoXGTi eed83bd7cb Added Announcement 2010-11-22 13:00:43 +02:00
GreYFoXGTi b8fe169419 Added Mac Fixes by Allisone (Trust) 2010-11-22 11:09:27 +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
GreYFoXGTi 6a40aea054 Revert "added hackish challenge-response-alike compatible with 0.5.2 clients. against the slot blocking exploit."
This reverts commit 9f8cf21c33.

Conflicts:

	src/engine/shared/config_variables.h
this commit was replaced by "clients are now dropped if they don't act as normal clients (4383e10 4383e10933)"
2010-11-18 01:32:54 +02:00
oy c45dc374ff decreased the default value for maximum players with same IP a bit 2010-11-17 19:05:19 +01:00
GreYFoXGTi 5ee8796381 Removed sql from mac, people who need sql compile the Mac branch
the boost stuff made my working dir very messy and searching through it takes more time
2010-11-16 15:26:19 +02:00
btd 5f6e35b418 Finish sv_team 2010-11-07 01:54:35 +03:00
GreYFoXGTi 3756c98715 Total IP Scoring Annihilation ( doesn't make sense ), please test this, also delete the old records 2010-11-04 20:10:51 +02:00
GreYFoXGTi 5f47d105ae Removed unused config var 2010-11-01 12:37:09 +02:00
btd 728f4a8352 Merge 2010-10-31 23:31:11 +03:00
btd eae1d1e54b My special func ^_^ 2010-10-31 23:29:41 +03:00
GreYFoXGTi c704a4ee95 a gift for btd 2010-10-31 19:47:10 +02:00
btd b8dd4a32ca Merge https://github.com/GreYFoXGTi/DDRace into others 2010-10-26 23:35:55 +04:00
GreYFoXGTi c6162b6485 fix 2010-10-26 17:02:36 +02:00
GreYFoXGTi 2f3152691c Revert "ingame browser added (config: cl_serverbrowser, hotkey: ctrl+shift+b" because it's buggy and i never intended to pull it, but btd did
This reverts commit 5b5eb0b2c0.
2010-10-25 20:09:08 +02:00
fisted 9f8cf21c33 added hackish challenge-response-alike compatible with 0.5.2 clients. against the slot blocking exploit. 2010-10-25 20:00:16 +02:00
btd a62decbc91 Show others for ddrace clients.
Need to fix entities now.

Signed-off-by: btd <bardadymchik@gmail.com>
2010-10-24 14:47:25 +04:00
GreYFoXGTi 6505e21a0d Merge branch 'master' of http://github.com/btd/DDRace 2010-10-24 02:13:05 +02:00
btd 161e5dbb7e Forgot about client 2010-10-23 22:13:37 +04:00
btd 2bda9dc0c6 Added connection timeout and fix super team in gun. Thanks Mo(2) for report. 2010-10-23 22:11:42 +04:00
btd d4d519c3ef Fix teams show_others 2010-10-23 16:15:29 +04:00
heinrich5991 5b5eb0b2c0 ingame browser added (config: cl_serverbrowser, hotkey: ctrl+shift+b 2010-10-22 17:29:46 +02:00
heinrich5991 684e1788ed added strict gametype filtering 2010-10-19 17:18:32 +02:00
heinrich5991 0cd8390036 Revert "better spam protection. Closes #82. Feedback Please"
This reverts commit daac101024.
2010-10-14 08:42:29 +02:00
heinrich5991 9cf90fff77 added config for showing client ids in scoreboard 2010-10-13 22:47:28 +02:00
GreYFoXGTi e819f1140b Some Commands level 2010-10-12 17:15:54 +02:00
GreYFoXGTi daac101024 better spam protection. Closes #82. Feedback Please 2010-10-12 16:13:56 +02:00
GreYFoXGTi 602c697717 made broadcast update only when needed 2010-10-11 21:27:35 +02:00
GreYFoXGTi ed3299be05 more cleanup 2010-10-11 03:50:43 +02:00
GreYFoXGTi 040ba467bf Changed The lowest level to -1 ( has chat but no rcon )
made rcon for level 0 open by default users can use logout or login/auth or in normal consol rcon_auth to raise their level
2010-10-11 02:39:08 +02:00
GreYFoXGTi ef139eb73a Cleanup (Putting stuff back vanilla like) 2010-10-10 16:11:11 +02:00
GreYFoXGTi e7ab496262 Deleted old afk timer by noother, because it's replaced by a Vanilla feature
Note: we may need to tweak the vanilla features to suite DDRace needs in the future
2010-10-10 14:36:56 +02:00
GreYFoXGTi 99f044bf88 added kill delay config with default 3 2010-10-08 18:56:56 +02:00
GreYFoXGTi bd32632da2 added configurable suicide penalty with default 0, Closes #61. 2010-10-08 18:52:26 +02:00
GreYFoXGTi 7ecae53f6c Some People just don't know when they have to sleep xD
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-26 17:30:43 +03:00
GreYFoXGTi a91d6c0cc1 removed duplicate 2010-09-26 07:52:01 +03:00
GreYFoXGTi e9083caa1d some little stuff 2010-09-25 18:55:36 +03:00
GreYFoXGTi f4082adf50 Fixed rcon auth tries check
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-22 19:13:21 +03:00
GreYFoXGTi 2ba462158d Removed custom stuff that are now in vanilla tw by defaults
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-19 21:47:25 +03:00
GreYFoXGTi 67a5765c9f Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/game/client/components/camera.cpp
	src/game/client/components/camera.h
	src/game/editor/ed_editor.cpp
	src/game/editor/ed_layer_tiles.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-19 21:27:40 +03:00
GreYFoXGTi 82403b81f0 Added sv_vote_percentage
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 14:44:30 +03:00
GreYFoXGTi e061d84f20 Added Ability to Reconnect in the same place as your disconnect
Decided by sv_max_dc_restore

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 12:34:13 +03:00
Speedy Consoles 23c40f82c2 reordered server settings 2010-09-17 03:56:34 +02:00
Speedy Consoles 99e6ebc33a reworked server setting descriptions 2010-09-17 02:40:53 +02:00
GreYFoXGTi f4123cbf06 Removed sv_spamprotection and replaced it with more specific commands
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 01:38:39 +03:00
GreYFoXGTi cf1d6d5785 Added sv_info_change_delay
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 01:26:17 +03:00
GreYFoXGTi 3a968c45f6 changed sv_rcon_password_admin to sv_admin_pass...etc
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 01:20:58 +03:00
GreYFoXGTi 545171fe91 Added variable sv_emoticon_delay, Closes #37.
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-16 23:20:16 +03:00
oy 7714454829 added maximum number of tries for rcon authentication 2010-09-16 13:06:11 +02:00
btd 7ed685ee11 Merge 2010-09-11 13:42:35 +04:00
GreYFoXGTi 4984d1b64b fixed some mistakes, Closes #23.
finished some todos.

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-09 20:52:17 +02:00
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 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 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
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
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 091a1125a3 Uncomment things in file_score. Add config variables 2010-08-25 18:33: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
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 e3dffbb741 Making the Mod Cooler ( Pimp My Mod ) xD
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-22 06:28:14 +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 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 49cefa406b added lost logfile feature 2010-08-06 20:38:13 +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 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
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 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 5988b9d388 - show connecting players with rcon status command
- make it possible to limit the number of clients with the same ip that can connect to the server
2010-06-03 14:48:32 +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
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00