Commit graph

1088 commits

Author SHA1 Message Date
oy f38fc81d78 fixed a possible client crash on map change 2011-04-07 18:23:03 +02:00
oy c27a634089 fixed and show error message if the crc doesn't match on map load 2011-04-07 18:07:22 +02:00
oy 3fc6e2d2eb prevent empty nicknames. Closes #616 2011-04-06 17:53:05 +02:00
oy caf6e98ccb fixed server crash on "bans" command 2011-04-06 17:30:50 +02:00
oy 4ad6d2f01e fixed problem with sv_bindaddr on the server 2011-04-04 18:20:05 +02:00
oy 9cb2f07b80 fixed clients search for maps within subfolders 2011-04-04 16:53:02 +02:00
oy ab810cab25 fixed that player options just show players as friends not clans 2011-04-02 19:51:05 +02:00
m!nus 3ebdc2a4ce added downward compatibility to mastersrv for 0.5 (and earlier) 2011-04-02 17:35:50 +02:00
oy 04a3b7be00 fixed problem with recorded demo files. Closes #570 2011-04-02 11:55:37 +02:00
heinrich5991 b6fa69cedb the server shows the disconnect reason of clients now 2011-04-01 00:05:35 +02:00
oy 85e9fb1e63 made it possible to add just a clan as friend 2011-03-31 21:30:28 +02:00
oy b3ae1a088e make the "show friends"-filter just list servers with friends on them 2011-03-31 21:22:12 +02:00
oy 98eaaf2e23 fixed 2 compiler warnings 2011-03-31 19:07:21 +02:00
oy 2a72c0b38b added a mechanism to check for a valid standard map. Closes #132 2011-03-31 15:13:49 +02:00
oy 59d56cd332 finished IPv6 support (master servers aren't compatible with 0.5 and older). Closes #233 2011-03-30 12:08:33 +02:00
oy 9d930e15f8 fixed some compiler warnings 2011-03-28 22:08:52 +02:00
oy 34a9ca20a7 added ipv6 support from the old lua branch 2011-03-28 20:11:28 +02:00
oy 7bd79f9f43 added remove_favorite command by Choupom 2011-03-27 18:05:11 +02:00
oy a583633cde added renaming of srvbrowse so it matches with the interface filename by Choupom 2011-03-27 18:00:54 +02:00
oy ae325c873f added friends feature. Closes #24 2011-03-23 13:06:35 +01:00
GreYFoX 61dcc7b848 Re-Added noother's afk kick
Disabled vanilla afk kick by default
enumerated variables.h
2011-03-22 21:49:12 +02:00
Sebastian Wojtowicz 55ce870597 Client utf8 converting (servernames,playernames) in Internet tab and (playernames,playermessage) in chat and hud 2011-03-22 21:11:10 +02:00
Sebastian Wojtowicz 500605cbee Server utf8 Conversion 2011-03-22 21:04:27 +02:00
oy eaef2ce48a added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115 2011-03-22 00:31:42 +01:00
oy 192d6a0b13 fixed that spectator filter updates the server browser 2011-03-20 16:09:44 +01:00
oy 96808a1145 made it possible to just show the number of player slots of a server (instead of client ones). Closes #68 2011-03-20 15:33:49 +01:00
oy 79aa9d640e fixed that server browser shows the correct country flag 2011-03-20 11:15:24 +01:00
GreYFoX ed5c9c1d92 sv_show_other the ability to use the command showothers 2011-03-19 11:22:03 +02:00
oy a8bf857c68 improved server browser list resorting and made search work on IP addresses. Closes #482 2011-03-18 19:03:13 +01:00
oy f8ae9f7732 made server browser show clan name and country code for players 2011-03-18 17:59:48 +01:00
GreYFoX 45f3cf042a Fixed a login with cheats
Renamed a constant
2011-03-18 00:17:01 +02:00
oy 1628118de3 fixed a bug that messes up demos recorded by the server 2011-03-17 17:58:10 +01:00
oy b939d38228 made the client check for valid address on connectionless packets from master/version server 2011-03-17 17:41:57 +01:00
GreYFoX 87cde802b1 Added a new entities_clear
Fixed cl_ddrace_cheats not controlling cl_show_entities
attempted to make cl_show_entities show other layers than the game layer
2011-03-16 19:48:16 +02:00
GreYFoX 3bae74f21d Added Ability to predict old hook through tiles from DDMax
fixed a warning
2011-03-16 17:36:54 +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
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
GreYFoX cccfb09e32 Reverted Team to it's old state without leader or Strict until it's reworked 2011-03-16 15:14:25 +02:00
GreYFoX ee178d5a48 Client Cheat showing entities in game 2011-03-16 14:48:16 +02:00
oy 7412fabb9c made serverinfo use clan name and country code for players 2011-03-16 12:37:41 +01:00
oy 30d9c9f4d9 made network support clan name and country code for players 2011-03-15 11:23:49 +01:00
oy 27e5a6af0d made clients sending startinfo a requirement to prevent empty player infos 2011-03-15 09:58:57 +01:00
oy 09dc08859d added a function to set the text outline colour and increased readability of nameplates on bright backgrounds. Closes #205 2011-03-13 12:55:00 +01:00
oy d1e8707c6c fixed demo length info and let the demo recorder search within sub folders for maps 2011-03-13 11:07:21 +01:00
oy be8f669333 added extended demo infos in the demo browser 2011-03-13 10:41:10 +01:00
oy 5c723f5d2f added info about the actual recorded demo length in the notification box 2011-03-12 18:34:16 +01:00
oy b834426548 fixed several problems with spectator view in game and demo player. Closes #83 2011-03-12 18:07:57 +01:00
oy 50b266086b made dbg_dumpmem and dbg_lognetwork work again 2011-03-05 11:46:24 +01:00
oy fc692d85c8 decreased server info timeouts for now 2011-03-04 18:32:12 +01:00
oy 0ae19e1339 removed support for old server infos 2011-03-04 18:14:08 +01:00
oy 0bc13c91eb made cl_threadsoundloading work again 2011-02-27 17:56:03 +01:00
oy d9ce720387 made engine an interface 2011-02-27 15:03:57 +01:00
heinrich5991 d506be71ea added standard 'me' for victim console argument 2011-02-26 20:45:01 +02:00
heinrich5991 3d0aab503f rewritten mutes 2011-02-23 23:45:31 +02:00
GreYFoX 90d93ba7b2 Client showothers 2011-02-23 22:22:05 +02:00
heinrich5991 9e15232e20 increased the version number of flags 2011-02-23 17:26:39 +02:00
oy 088ec3e2f3 made the client's map search work with sub folders. Closes #254 2011-02-21 11:23:30 +01:00
oy 4f91026a01 added an editor function to show tile informations (index, flip/rotate status) 2011-02-18 11:41:27 +01:00
oy 169efb129f enabled debug rendering in the editor 2011-02-18 11:25:55 +01:00
oy 6a6e7b702e removed double utf8 decoding in text rendering 2011-02-18 11:08:38 +01:00
oy d939b84125 removed no longer needed progression browse info 2011-02-16 12:31:47 +01:00
GreYFoXGTi cd998a2a93 sv_reset_pickups 1 to remove weapons on start tiles 2011-02-16 13:08:14 +02:00
oy b63dbfede5 fixed problems with map downloading if the map changes during download. Closes #236 2011-02-16 12:07:54 +01:00
GreYFoXGTi 78ee6148f8 SortHash
Loading String
2011-02-16 12:22:55 +02:00
GreYFoXGTi 6904956a14 Added some DDRace Menu Items
Enforced cl_ddrace_cheats on zoom
2011-02-16 11:20:27 +02:00
XXLTomate f0201597c6 DDRace Settings-tab
Checkbox for DDRace Scoreboard
2011-02-15 02:36:22 +02:00
GreYFoXGTi 604ae5286f Several Fixes and some more on the way 2011-02-14 23:34:46 +02:00
GreYFoXGTi d68e853ca7 StickyTeams, TeamStrict Logic and fixed some team bugs 2011-02-14 20:44:02 +02:00
heinrich5991 fabf0bc65f made 0xF3F3F71 0x703F3F71, because 0xF3F3F71 isnt backward-compatible 2011-02-13 21:17:20 +02:00
GreYFoXGTi 718d697707 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/collision.cpp
	src/game/collision.h
	src/game/gamecore.cpp
	src/game/server/gamecontext.cpp
2011-02-13 19:36:53 +02:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
oy 818cf464e3 added missing disconnect for stress testing 2011-02-13 17:59:51 +01:00
heinrich5991 825eca4bab added saving of the banreason. 2011-02-13 13:31:58 +01:00
GreYFoXGTi cd574d10a7 Added sv_vote_majority, 1 like vanilla, 0 Consider number of yes against Number of Yes + No 2011-02-12 22:31:42 +02:00
GreYFoXGTi 1b2703aaba Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
GreYFoXGTi 4e2ccdbeb9 fixed compiler warnings
made 0xF03F3F71 0xF3F3F71 because 0xF03F3F71 = 4026531840 needs unsigned screwed the whole enum
2011-02-10 04:39:45 +02:00
GreYFoXGTi 65f4882113 Merge branch 'master' of git://github.com/heinrich5991/DDRace 2011-02-10 00:31:42 +02:00
heinrich5991 88c0d6cfa8 filter all "no-ddrace-flags server" when a flag is required or forbidden, strictly use the flag version, fixed flag version handling 2011-02-09 23:06:14 +01:00
GreYFoXGTi 09068d91a4 Compiler warnings 2011-02-08 18:58:36 +02:00
GreYFoXGTi ae06076d10 Mute By Fisted 2011-02-08 14:44:59 +02:00
GreYFoXGTi 750b20f544 fixed banmaster.cfg run level 2011-02-07 08:53:41 +02:00
GreYFoXGTi d7e4153ec4 Added banmaster by heinrich5991 2011-02-07 08:25:38 +02:00
GreYFoXGTi 4ca79188dc DDRace Flags Finalized 2011-02-05 06:13:32 +02:00
GreYFoXGTi 9db333dfee Re-enabled flag sending 2011-02-05 03:14:17 +02:00
GreYFoXGTi 24a688b2c3 Added AutoDemoRecord and ghost made by Race mod team, implemented to DDRace by noother 2011-02-04 22:15:02 +02:00
GreYFoXGTi 3da1860654 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/dutch.txt
2011-02-04 18:54:54 +02:00
GreYFoXGTi 30f010593c Teams with leaders
this maybe buggy but i will fix the bugs when they are reported
2011-02-04 18:49:37 +02:00
GreYFoXGTi e32b52b57a don't send the DDRace flags until i change them to their final look 2011-02-01 00:45:25 +02:00
GreYFoXGTi 0aa3e8f546 Forgot to do this with the other DDRace Flags 2011-01-30 21:11:32 +02:00
GreYFoXGTi f1b002e7fa DDRace flags for the server browser (client-sided).
Some fixes in the server sided part.
One task left, Adding the flags to SortHash(), added Todo in the code.
2011-01-30 18:21:41 +02:00
oy be68a4f516 added fix by CarmineZ about missing tool tips in the editor 2011-01-29 18:48:55 +01:00
heinrich5991 0288655395 Merge branch 'master' of git://github.com/GreYFoXGTi/DDRace 2011-01-26 20:11:49 +01:00
GreYFoXGTi 5b51295185 Added Deep freeze/unfreeze to switch layer so that it can be controlled with switches
fixed the freeze command

Added Freeze Tile to switch layer to set freeze tile custom delay

Added sv_freeze_delay to control default freeze time delay
2011-01-25 12:05:53 +02:00
GreYFoXGTi f1a8b6b7ad Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/shared/config.h
	src/engine/shared/config_variables.h
	src/game/client/gameclient.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
2011-01-24 14:06:55 +02:00
m!nus 05d274444a Add banning to mastersrv: any packet from a banned IP (and optionally a fixed port) will be dropped (also affects clients. Put your bans into master.cfg: "ban 127.0.0.1" or "ban 127.0.0.1:8303". It's reloaded every 5 minutes. This change also adds IStorage, IConsole and IKernel to mastersrv. 2011-01-23 17:54:27 +01:00
Floff Floffsson 8c32c01653 added unmute + some minor fix 2011-01-20 22:27:54 +02:00
GreYFoXGTi 9891ab8a10 Added timer to reduce join-spam when loading a new map by Floff aka LemonFace
removed an extra line
2011-01-20 22:25:09 +02:00
oy 7ed5a820c6 increased default value for br_max_requests. Closes #446 2011-01-20 21:22:10 +01:00
oy ce42fa68ff fixed possible CRLF line ending problem in the linereader 2011-01-20 21:17:11 +01:00
GreYFoXGTi 2151883b43 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/gamecore.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/entities/pickup.cpp
	src/game/server/entities/projectile.cpp
	src/game/server/entity.h
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/variables.h
2011-01-20 16:10:32 +02:00
oy 82749dedf0 fixed beginning of gametime margin graph 2011-01-19 19:29:10 +01:00
oy 7ca7c95bc0 limit the latency within server browser entries to a maximum of 999 2011-01-19 15:54:50 +01:00
oy 7a20c313ee made some output just show up on debug 2011-01-19 15:39:04 +01:00
oy 8cdabb890f fixed that the server crashes on too many snap items (Closes #317), optimised snapshot hashing 2011-01-18 18:09:09 +01:00
Floff Floffsson e0c02eb691 functioncall not needed, dunno why its there anyway 2011-01-17 14:59:21 +01:00
Floff Floffsson 3e530ac02d SetClientAuthed() moved 2011-01-17 14:59:12 +01:00
oy bf6fcc20f4 added an error popup on startup when the sound couldn't be initialised. Closes #425 2011-01-17 13:28:15 +01:00
oy 40f6740742 fixed few spelling mistakes and disabled an unused command 2011-01-17 12:56:49 +01:00
oy 216967c3bf release gameclient components when opening the editor. Closes #429 2011-01-17 12:28:37 +01:00
GreYFoXGTi b502e6fd28 Fixed warnings and some white spaces 2011-01-12 11:10:57 +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
heinrich5991 dd474fec3b Merge branch 'master' of git://github.com/GreYFoXGTi/DDRace 2011-01-10 20:25:46 +01:00
GreYFoXGTi 959b05d557 Merge branch 'master' of http://github.com/oy/teeworlds 2011-01-10 00:45:58 +02:00
oy 91f642fac2 fixed cut off broadcast. Closes #398 2011-01-09 23:25:07 +01:00
heinrich5991 6064096847 (hopefully) fixed /cmdlist for windows 2011-01-09 15:38:26 +01:00
oy 26f7c67895 fixed console parsing when using the exec command. Closes #381 2011-01-07 19:33:29 +01:00
oy 41b8022aa1 record a new demo when a game ends. Closes #358 2011-01-06 23:21:51 +01:00
oy f8b1edca64 show error message for all content that could not be loaded. Closes #257 2011-01-06 22:18:19 +01:00
GreYFoXGTi ddc5dd7ab3 Cleaned up & Re-arranged stuff 2011-01-06 05:46:10 +02:00
GreYFoXGTi 1719ad554e Moved a var 2011-01-06 01:51:22 +02:00
GreYFoXGTi 1d9190fd5b Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/russian.txt
	readme.txt
	src/game/variables.h
2011-01-06 01:49:58 +02:00
m!nus 7b46d386dd requesting serverinfo now uses gie2 instead of the legacy gief. 2011-01-05 12:22:45 +01:00
oy aad2438882 fixed outlines for larger font sizes 2011-01-05 12:12:23 +01:00
GreYFoXGTi c5648311ed Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/german.txt
	src/game/client/components/scoreboard.cpp
	src/game/editor/ed_layer_tiles.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/variables.h
2011-01-04 22:37:09 +02:00
oy 1928a757c6 added fix for rendering big fonts on large resolutions by RushPL 2011-01-04 12:30:40 +01:00
oy 5dbe75fd7b removed duplicate stuff 2011-01-04 12:00:34 +01:00
GreYFoXGTi 5e841fcfae Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-12-19 15:22:31 +02:00
heinrich5991 bf62514088 added some DDRace flags for the server browser (server-sided), client-sided still needed 2010-12-19 14:11:14 +01:00
GreYFoXGTi 63961ecf1a fixed mute evasion + kick 2010-12-19 07:25:01 +02:00
floff 4008a1dc95 spectator votes configurable 2010-12-16 10:06:24 +01:00
floff 4a93c28eb8 added configurable time between pauses, to reduce spam 2010-12-16 10:05:20 +01:00
GreYFoXGTi e803f30f52 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/server/entities/character.cpp
	src/game/server/entities/flag.cpp
	src/game/server/player.cpp
	src/game/variables.h
2010-12-16 06:06:23 +02:00
oy 0121f27311 fixed server crash on too many snap items. Closes #317 2010-12-16 03:29:08 +01:00
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 c08ed41a7e Merge branch 'master' into DDRace 2010-12-12 00:43:56 +02:00
oy 49bea07df7 show the path of $CURRENTDIR. Closes #323 2010-12-11 23:10:13 +01:00
GreYFoXGTi 157aafd4dd Merge branch 'master' into DDRace
Conflicts:
	src/engine/server/server.cpp
	src/game/variables.h
2010-12-11 23:57:41 +02:00
oy 48cd937234 fixed wrong $DATADIR path. Closes #316 2010-12-11 22:48:37 +01:00
oy ecd7afd9ff added cleaner exit on quit event by Choupom 2010-12-11 22:04:50 +01:00
Choupom cdd8184f89 fixed "Kicked by console (Kicked by vote)" drop message 2010-12-11 21:57:34 +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 4510ced422 Merge branch 'DDRace' of github.com:GreYFoXGTi/teeworlds into DDRace 2010-12-10 21:20:34 +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 4756c031c5 save auto recorded demos in a separate folder and added an option to enable/disable it in the settings menu 2010-12-08 01:55:13 +01:00
oy 0fe8cabe78 added auto recording support by Batchyx 2010-12-08 01:42:32 +01:00
oy 974a40913d added CDemoRecorder::TickCount() to get demo length by Batchyx 2010-12-08 00:48:02 +01:00
oy db9dd6b8c9 added an optional time stamp to a demo record by Batchyx 2010-12-08 00:42:32 +01:00
oy 665934ee09 cleaned up several uses of timestamps for filenames 2010-12-08 00:32:50 +01:00
oy 7c26dcbadd moved function to remove files 2010-12-08 00:13:59 +01:00
oy d30dd9da8f added Storage function to move/rename files by Batchyx 2010-12-08 00:09:18 +01:00
oy bd9850cae2 added single function to stop recording by Batchyx 2010-12-08 00:02:24 +01:00
GreYFoXGTi 9bed6aca8c Fixed Compiler warnings 2010-12-07 20:27:04 +02:00
GreYFoXGTi cebbecf632 Some Code Improvements and Compiler warnings 2010-12-07 19:44:23 +02:00
GreYFoXGTi 122c7954d9 Announcement Randomness 2010-12-06 04:27:35 +02:00
GreYFoXGTi 881fd901a6 added Vote comments starting with # and also made announcement comments start with # 2010-12-06 00:38:29 +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 326c46551c Resseted sv_old_laser to 0 2010-12-02 01:16:09 +02:00
GreYFoXGTi 0a29aae473 added old Laser Behavior Configuration 2010-12-02 00:07:33 +02:00
GreYFoXGTi b22f6e0036 Added Announcement Comments 2010-11-29 06:21:04 +02:00
GreYFoXGTi 7f24d0f144 Fixed ID 0 Bug 2010-11-26 20:01:55 +02:00
GreYFoXGTi 4f777211a5 Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-25 00:22:02 +02:00
heinrich5991 73ca31d168 changed rcon command "cmdlist" nearly completly 2010-11-24 22:09:31 +01:00
GreYFoXGTi ae4aebd365 Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-24 02:28:01 +02:00
Batchyx c3966413e9 Storage: fix RemoveFile and CreateFolder ret value
Removefile returns remove() and CreateFolder returns fs_makedir(),
but they returns 0 on success and non-zero on error. Fix that,
RemoveFile and CreateFolder should return true on success.
(they return false when the type argument is invalid).

note: bug has remained unoticed because noone uses CreateFolder, and the
user of RemoveFile (the demo browser's remove button) doesn't
check the return value.
2010-11-24 01:15:18 +01:00
GreYFoXGTi 20b70ac24b fixed http://ddrace.info/forum/showthread.php?291-passwords-doesn-t-work 2010-11-24 01:28:16 +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 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
oy e7e2501d1b close map-download-file if the map changes during downloading 2010-11-21 01:10:25 +01: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
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
Choupom 4383e10933 clients are now dropped if they don't act as normal clients (fixes #235) 2010-11-17 19:11:28 +01:00
oy c45dc374ff decreased the default value for maximum players with same IP a bit 2010-11-17 19:05:19 +01:00
oy 3d3572f845 fixed some compiler warnings 2010-11-17 18:36:19 +01:00
oy f1ce0d1949 improved loading progression in the server browser 2010-11-17 12:43:24 +01:00
Choupom a7f37446b6 added loading progression in server browser 2010-11-17 12:31:44 +01:00
GreYFoXGTi ae591407c9 Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-17 13:11:40 +02:00
oy fd3d01ef14 removed no longer needed data-dir override param - mods system should be used instead. Closes #267 2010-11-17 01:02:29 +01:00
GreYFoXGTi b17e19ff57 Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-16 17:28:42 +02:00
heinrich5991 daeb395e25 rcon victim system: replaced constants by enums 2010-11-16 16:07:45 +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
heinrich5991 89ef2a0928 fixed CServer::ConKick because of the new victim system, fixed the victim system for cases with at least one parameter after the victim 2010-11-15 18:58:44 +01:00
heinrich5991 797be2817c reverted needless check of "helpers can use me commands" 2010-11-15 18:14:31 +01:00
GreYFoXGTi d7aced0708 Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-14 03:25:39 +02:00
Choupom 0cfcb1c0c2 fixed demo.h header guard 2010-11-14 00:45:47 +01:00
oy e306cc45d5 show real $USERDIR and $DATADIR path on startup 2010-11-13 23:54:34 +01:00
oy 4dce645ba8 removed unimportant debug message. Closes #264 2010-11-13 14:29:02 +01:00
GreYFoXGTi 5837b71a73 added pdb to gitignore
Helpers can now use me as victim as well
2010-11-13 11:55:17 +02:00
heinrich5991 051172838b fixed commit with the fix of cmdlist 2010-11-12 17:56:31 +01:00
heinrich5991 c54b824a45 fixed 'cmdlist' rcon command for joining clients 2010-11-11 23:22:09 +01:00
heinrich5991 c36eb3d359 fixed a bug with "me" as victim, fixed kick function due to new victim system 2010-11-10 23:24:33 +01:00
GreYFoXGTi 17cb8a6ffb Merge branch 'develop' of http://github.com/heinrich5991/DDRace
Conflicts:
	src/game/server/gamecontext.cpp
2010-11-09 17:30:30 +02:00
heinrich5991 50b8d93d6d finished system to generalize rcon commands, sorry for last commit's description 2010-11-07 17:35:11 +01:00