edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-21 18:14:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
4663 commits 1 branch 424 tags 417 MiB
Commit graph

1345 commits

Author SHA1 Message Date
def 60865b7dbf More advanced netlimit 2013-08-04 17:50:12 +02:00
def a83c5702ff Reduce netlimit to 10kb/s 2013-08-04 05:20:12 +02:00
def edd742177f Fix: kb/s instead of b/s 2013-08-04 04:48:38 +02:00
def a5f974bbe9 More settings for netlimit 2013-08-04 04:37:15 +02:00
def 84e7bb5658 Merge branch 'netlimit' into DDRace 2013-08-04 04:32:44 +02:00
def b51cc77189 Add sv_netlimit 2013-08-04 04:32:04 +02:00
def da778f4e66 Don't write over memory limit... 2013-08-04 04:24:33 +02:00
def 7b2578b517 Only record when we're actually recording 2013-08-04 04:24:21 +02:00
def 71ba923133 Move netlimit over to regular server 2013-08-04 04:24:03 +02:00
def 6169c78a79 Close memory leaks 2013-08-03 17:22:50 +02:00
def 82f3734dd7 Try to implement netlimit (level too high, map downloads might fail) 2013-07-31 05:36:52 +02:00
def 8720186c75 Revert "Revert "Restrict rcon output (east)"" 
This reverts commit 35cf8832a9.
 2013-07-31 01:31:53 +02:00
def 35cf8832a9 Revert "Restrict rcon output (east)" 
This reverts commit ba5b98dd1d.
 2013-07-31 01:27:29 +02:00
def ba5b98dd1d Restrict rcon output (east) 2013-07-30 23:26:30 +02:00
def e871fbbaad Try to prevent network spamming issues 2013-07-30 22:48:31 +02:00
def 764a73e997 Fix: Allow fifo to be created 2013-07-30 03:16:02 +02:00
def 5cd69f29ac Add Fifo console for easier automation 2013-07-29 21:03:59 +02:00
def abb362b3bb Allow announcement interval from 1 to 300 2013-07-26 22:17:55 +02:00
def 1cee48f6c1 Can only set sv_test_cmds at start, then it stays, and determines whether gametype is DDRace (no cheats) or TestDDRace (cheats) 2013-07-23 00:15:50 +02:00
def d4c0f31b32 Make client compile 2013-07-22 17:20:34 +02:00
def 7a29b07d4e Add support for a reset file to execute on map change or reload 2013-07-21 23:42:08 +02:00
def c42e9f1399 Add /points and /toppoints using points.cfg file 2013-07-21 04:52:23 +02:00
def 6d26e07e1f Single config variable for background color without quads 2013-07-11 17:13:45 +02:00
def 6105f60a89 Make RGB values of background colors independent 2013-06-23 20:56:05 +02:00
def 8421903897 Grey background colors when quads disabled 2013-06-23 13:41:13 +02:00
def 413429871f Add quad disable function 2013-06-23 02:58:46 +02:00
BeaR 9b81779ae3 Using MemoryBarrier() for CPUs not supporting SSE2 2013-04-26 16:44:59 +02:00
oy f0e09f50d9 improved chat msg spam protection 2013-04-01 20:30:58 +02:00
oy 678863fa7e increased minimum required connect time for clients to 1 second. #1070 2013-03-20 22:47:48 +01:00
PsychoGod 471d479300 one more centering window in graphics 2013-03-03 13:42:25 +02:00
oy 5e090fbfed made the demoplayer support 0.6.1 based demos 2013-02-26 00:00:38 +01:00
PsychoGod ebdd1af7a3 window center position when windowed on Windows :3 2013-02-25 13:48:31 +02:00
oy 718653ff85 set default values for threaded graphics and async renderer to 0 2013-02-24 19:18:13 +01:00
oy ea2898e94a prevent quick join/quit flood. #1070 2013-02-24 19:13:45 +01:00
oy 313a0949b0 make sure clients are authed for map downloads 2013-02-24 18:57:23 +01:00
oy 0e92dd5603 fixed some merge problems 2013-02-24 18:55:55 +01:00
oy 118d2ac837 show reason for closing a connection within a debug message. Closes #1061 2013-02-24 18:31:30 +01:00
oy 07c97822bb increased sleep time when tw is minimized and made it adjustable via cputhrottle otherwise 2013-02-24 18:31:23 +01:00
oy 73386fdf0f fixed last commit 2013-02-24 18:29:41 +01:00
BeaR 68390fe04a Bug: Losing render-commands if commandbuffer is full(gfx) 
Problem:
If there is a new draw call, it is checked if there is enough free memory for the vertices in the databuffer but not if we have enough free space in the commandbuffer to add the command
So we lose some commands during a frame cuz the commandbuffer is full

This fixes the 2nd part of issue 1004
 2013-02-24 18:29:27 +01:00
BeaR d58afefaae Some graphic batching: 
Speed up for displaying debugtext and envelopepreview
(This reduces the performance hit especially for the 'Show Info' mode in the editor)

Conflicts:

	src/engine/client/client.cpp
	src/game/editor/editor.cpp
	src/game/editor/editor.h
 2013-02-24 18:23:06 +01:00
oy df5ab998c2 readded texture resampling 2013-02-24 18:08:10 +01:00
oy 71af97a5e3 fixed texture memory usage calculation in graphics threaded 
Conflicts:

	src/engine/client/graphics_threaded.cpp
 2013-02-24 18:07:35 +01:00
oy 2948d2392b fixed last commit 2013-02-24 18:02:37 +01:00
BeaR 1cfbfda6fa Missed a file.. 2013-02-24 18:02:09 +01:00
BeaR c3dd09cebf Readded Texturecompression-support 2013-02-24 18:01:58 +01:00
Johannes Loher 678b6faceb Fixed threaded gfx and building on Mac OS X 2013-02-24 18:01:23 +01:00
Magnus Auvinen 1711be955b fixed all the errors that the clang static analayzer found 2013-02-24 17:58:34 +01:00
Magnus Auvinen 98042012a6 cleaned up warnings that clang spits out. some bugs found with it. 
Conflicts:

	src/game/server/gamemodes/ctf.cpp
	src/game/server/gamemodes/ctf.h
 2013-02-24 17:54:29 +01:00
oy 8ca7933653 Show user authlevel on status command. Closes #985 2013-02-24 17:46:05 +01:00
oy 521eaf038b fixed missing messages when net connection closes 2013-02-24 17:41:39 +01:00
oy 865d0f7365 limit characters within player names to ascii range to prevent utf8 impersonating 2013-02-24 17:40:41 +01:00
BeaR 0adaf8a752 #913 
Fix Input Handling
 2013-02-24 17:39:31 +01:00
heinrich5991 86fe9757c5 Removed useless enum 2013-02-24 17:38:29 +01:00
heinrich5991 7b545f3ed9 Added borderless window functionality 
This might become handy for users with multiple monitors,
	might resolve other issues aswell
 2013-02-24 17:38:19 +01:00
oy b7e5bb54ad fixed semaphore on macosx 2013-02-24 17:35:51 +01:00
oy 7be3c2e634 fixed resetting the error string of a net connection. Closes #954 2013-02-24 17:35:08 +01:00
oy 86cd0cefd7 fixed wrapping problems when rendering console input 2013-02-24 17:34:51 +01:00
oy 14cd83de10 fixed ban range check to make sure the whole ip matches and not just rely on the hash. Closes #946 2013-02-24 17:34:22 +01:00
oy f1fc3337f5 prevent that the server uses close messages from clients. Closes #950 2013-02-24 17:32:48 +01:00
oy 0e40ab434a fixed a check 2013-02-24 17:31:57 +01:00
oy 13d06e45ac fixed used nettype in server browser and try to use ipv4 and ipv6 socket when using a bindaddr. Closes #940 2013-02-24 17:26:59 +01:00
oy ffd89938d7 fixed registering of ban commands. Closes #942 2013-02-24 17:26:30 +01:00
oy fa85cede53 reset rcon AuthTries on logout. Closes #941 2013-02-24 17:26:10 +01:00
oy 2a4af1573b auto adjust the screen resolution on first start. Closes #921 2013-02-24 17:25:55 +01:00
oy 38256d0d45 skip screenshot when window isn't active. Closes #931 2013-02-24 17:25:14 +01:00
Teetime b4ed006f83 fix for saving bans in a file 2013-02-24 17:03:48 +01:00
heinrich5991 921f5f9239 fixed map downloading auth check 2013-02-16 14:37:53 +02:00
Learath2 c843d62ec7 Defaults to gfx_threaded 0. Partially fixes #213 2013-02-13 18:34:46 +02:00
oy 6295b33965 set default value for asynchronous rendering to disabled for now. #1001 2013-02-01 11:38:09 +02:00
oy a7574f75d2 fixed last commit 2013-02-01 11:38:09 +02:00
BeaR c86ebb34df Bug: Losing render-commands if commandbuffer is full(gfx) 
Problem:
If there is a new draw call, it is checked if there is enough free memory for the vertices in the databuffer but not if we have enough free space in the commandbuffer to add the command
So we lose some commands during a frame cuz the commandbuffer is full

This fixes the 2nd part of issue 1004
 2013-02-01 11:38:09 +02:00
eeeee 1c8c20c93e added sv_events 2012-12-23 19:47:47 +02:00
eeeee ee2647de41 turns out that Drop was needed after all :S 2012-12-23 20:10:31 +03:00
Learath2 3ececbd5f7 Fixes the last commit 2012-11-19 19:52:23 +02:00
Learath2 17140fc755 Added a config variable to control the map window.Closes #172 2012-11-14 20:34:23 +02:00
eeeee cae8c68d87 send ahead window for maps downloading. works with vanilla client. 2012-11-12 21:50:46 +02:00
BeaR 50b722b2b4 Closes #153. 
Fix Input Handling
 2012-11-12 20:39:36 +02:00
oy 2db2f51bf5 fixed ban range check to make sure the whole ip matches and not just rely on the hash. Closes #946 2012-07-04 16:55:16 +03:00
oy 2a92f369fc fixed registering of ban commands. Closes #942 2012-07-04 16:54:09 +03:00
Ravomavain 52ba9eea04 remove other banmaster related code 2012-05-02 01:18:11 +02:00
GreYFoX cd4ba53bae Merge branch 'master' of git://github.com/teeworlds/teeworlds into DDRace 
Conflicts:
	bam.lua
	scripts/build.py
	scripts/make_release.py
	src/engine/server.h
	src/game/client/gameclient.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/player.cpp
	src/game/version.h
 2012-04-12 02:09:31 +02:00
Learath2 d64e1796aa Simplifys the usage of timer commands. Fixes new year happy spawn. 2012-02-14 20:25:34 +02:00
Teetime ec8dd34a5a fix for saving bans in a file 2012-02-13 23:22:40 +01:00
oy 27daa26b99 fixed stuck mouse cursor when loosing fullscreen focus on windows 2012-02-05 13:28:35 +01:00
oy 0c05b3bfa1 fixed compiling with vs2008 (#932) 2012-02-05 13:22:39 +01:00
XXLTomate dce5e8434b This fixes mute. Thanks to @heinrich5991 @Learath2 Mo2, the whole #DDRace and my dog. 2012-02-03 00:16:22 +01:00
fisted 00f580cb91 tell what port might be in use, if we cannot bind 2012-01-28 23:54:04 +01:00
XXLTomate f9e4547b31 fixing the console (2) 2012-01-28 11:14:31 +01:00
east 28410c00a7 Econ bufferoverflow fix 2012-01-12 19:59:27 +01:00
oy fa81141110 added demo markers by Choupom. Closes #837 2012-01-10 23:13:19 +01:00
oy 590dbac239 put the game version constants all together in one file. Closes #870 2012-01-09 02:02:02 +01:00
oy 4073520214 cleaned up content folder creation. Closes #845 2012-01-09 01:38:45 +01:00
oy de8c9b23eb added command to toggle config values. Closes #888 2012-01-09 01:25:18 +01:00
oy 4fde2cf7f2 add tuning to demo. Closes #899 2012-01-09 00:49:20 +01:00
oy e960cbdff3 added a config to display the code string of a country flag instead of the image. Closes #897 2012-01-08 18:16:38 +01:00
oy 672b70e9b9 fixed some line endings 2012-01-08 13:57:40 +01:00
oy bafd22ebe7 show path in the editor file dialog. Closes #786 2012-01-08 13:14:02 +01:00
oy be37147342 fixed border rendering in the editor's image preview. Closes #908 2012-01-08 01:47:53 +01:00
oy 45302957f1 removed some unused zlib stuff. Closes #907 2012-01-07 23:50:47 +01:00
GreYFoX 420447dc51 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 
Conflicts:
	readme.txt
 2012-01-07 19:16:20 +02:00
oy 2785293469 don't start playing the music again if we're quitting 2012-01-06 20:03:57 +01:00
oy 6ad6d59b6f fixed memory corruption with snd_buffer_size config 2012-01-06 19:27:18 +01:00
oy 29738552a6 made bindaddr config work for client and master too. Closes #909 2012-01-06 19:17:14 +01:00
oy 78bb0e3d8c fixed compiling for macosx 2012-01-06 16:35:48 +01:00
oy 71dd0c5aab made gfx_finish work again 2012-01-06 14:12:49 +01:00
oy 12f76e7f8d made the editor work again. Closes #914 2012-01-06 12:55:19 +01:00
GreYFoX c46f3e06e7 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 2012-01-04 20:10:07 +02:00
oy f14c0e2359 fixed linking for older gcc versions 2012-01-04 01:19:54 +01:00
oy cc94472f04 fixed mac osx 2012-01-04 00:52:24 +01:00
oy 213b88835e fixed compiling on windows 2012-01-04 00:48:04 +01:00
oy 7328098f8d Merge pull request #912 from matricks/threadedflip 
Threadedflip
 2012-01-03 15:40:30 -08:00
Magnus Auvinen 7393151b6d fixed the osx opengl make current thingie.. I think... 2012-01-03 22:53:24 +01:00
Magnus Auvinen 666401e309 added osx implementation. not tested, not even compiled once. hope it works 2012-01-03 22:49:31 +01:00
Magnus Auvinen 2991f4071e fixed kicking of command buffer if it's full when rendering. fixed compile error on windows 2012-01-03 22:01:37 +01:00
Magnus Auvinen 50d872531a cleaned up the code. fixed so that SDL is inited on main thread and then transfers the gl context to the render thread 2012-01-03 21:39:10 +01:00
Magnus Auvinen c31c82a584 added support for video modes 2012-01-01 14:30:45 +01:00
Magnus Auvinen d7fe3ddaab fixed shutdown and screenshot functionallity 2012-01-01 14:15:35 +01:00
Magnus Auvinen c1942ca6cb fixed the render frame time and cleaned up some more code 2012-01-01 13:38:46 +01:00
GreYFoX ee670118a5 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 
Conflicts:
	src/engine/console.h
	src/engine/server/server.cpp
	src/engine/server/server.h
	src/engine/shared/config.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
@heinrich5991 todo
 2012-01-01 00:11:56 +02:00
Magnus Auvinen 8b76105cfa cleaned up some of the code 2011-12-31 14:00:49 +01:00
oy c975390195 made vote ban check if the ip matches an authed player 2011-12-31 12:11:48 +01:00
Magnus Auvinen 6e57620c2c added flags for mipmap generation on textures. fixes missing texts 2011-12-31 11:18:55 +01:00
Magnus Auvinen b31abc4053 fixed so that you can select graphics backend via gfx_threaded 2011-12-31 10:29:25 +01:00
Magnus Auvinen 7a36a103ae fixed so that the rendering can be done async from the input, network and update 2011-12-31 10:04:46 +01:00
Magnus Auvinen 8a91bfa1dd fixed texture upload support. removed raw gl calls from the text render 2011-12-31 09:40:11 +01:00
Magnus Auvinen 50e75da333 fixed so that the resolusion is set correctly on init 2011-12-31 01:23:04 +01:00
Magnus Auvinen 09b785a290 splitted out the graphics threaded into a separate header 2011-12-31 01:11:24 +01:00
Magnus Auvinen 8e56885795 initial commit of the threaded graphics. can start game and render the gui. no textures at the moment. still waits for the swap for now 2011-12-31 01:06:04 +01:00
Ravomavain 88be9657d2 Enhance pausing system (by @heinrich5991): 
* enhance /pause (@heinrich5991)
 * add /spec command to pause without leaving the game (@heinrich5991)
 * if sv_pauseable is set to 0, /pause behave as /spec (@heinrich5991)
 * should fix #124 and #127 (@ravomavain)
 2011-12-31 01:44:36 +02:00
GreYFoX 7820e48ec6 Minor changes 2011-12-31 01:33:11 +02:00
oy 8052ddf0ff fixed compiling 2011-12-30 19:35:57 +01:00
oy de3e94d901 clean up temp commands on logout in the client 2011-12-30 19:21:00 +01:00
oy ec4bb94537 added logout command for econ 2011-12-30 19:12:31 +01:00
Magnus Auvinen 8ffe582615 ugly incomplete hack to put the rendering into another thread so we don't have to wait for the flip 2011-12-30 16:02:22 +01:00
oy 1bb64d7534 fixed last commit 2011-12-30 00:07:17 +01:00
Learath2 81e6cf6f83 Added logout command. Closes #903 2011-12-29 23:53:07 +01:00
oy b44ee3d975 reworked ban system 2011-12-29 23:36:53 +01:00
oy 80835d2c11 added version files for pnglite and wavepack(both up-to-date). Closes #900 2011-12-29 14:00:28 +01:00
oy 4c73eab869 fixed empty player names based on utf8 characters. Closes #904 2011-12-29 13:34:13 +01:00
GreYFoX 799f4de2b3 Added the following settings to Close #123. 
sv_time_in_broadcast, 1, 0, 1, CFGFLAG_SERVER, "Whether to display time in broadcast every interval or not by default, later the choice can be changed by players via chat commands"
sv_time_in_broadcast_interval, 1, 0, 60, CFGFLAG_SERVER, "How often to update the broadcast time"
sv_time_in_gametimer, 0, 0, 1, CFGFLAG_SERVER, "Whether to display time in the round/game timer or not by default, later the choice can be changed by players via chat commands"
Added the following Chat commands to give the player the choice over their settings:
"saytime", "", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSayTime, this, "Privately messages you your current time in this current running race"
"saytimeall", "", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSayTimeAll, this, "Publicly messages everyone your current time in this current running race"
"time", "", CFGFLAG_CHAT|CFGFLAG_SERVER, ConTime, this, "Privately shows you your current time in this current running race in the broadcast message"
"broadcasttime", "?s", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSetBroadcastTime, this, "Personal Setting of showing time in the broadcast, broadcasttime s, where s = on for on, off for off, toggle for toggle and nothing to show current status"
"servergametime", "?s", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSetServerGameTime, this, "Personal Setting of showing time in the round/game timer, servergametime s, where s = on for on off for off, toggle for toggle and nothing to show current status"
Fixed Chat Command "eyeemote" and made it a set + toggle instead of just toggle for better bin techneques
Moved some vars from CCharacter to CPlayer to keep their status evern after death but not after disconnect.
So now players have the choice to see which timer they wanna see if any.

Note: These changes are all untested Stay away from this update on your main server until they are tested, i don't even know if they will compile propperly
 2011-12-29 14:17:34 +02:00
oy 988b1c22cf fixed that the server browser list gets sorted twice on a new entry 2011-12-29 13:06:53 +01:00
oy af9775f400 fixed texture increasing in the text renderer 2011-12-29 13:03:06 +01:00
GreYFoX ff6b9609f3 sv_nameless_score default 0 Whether nameless tee has a score or not. Closes #100. 2011-12-29 11:39:01 +02:00
GreYFoX 66c321c547 Added sv_eye_emote_change_delay default to 1 to Close #94. 2011-12-27 12:20:12 +02:00
Shereef Marzouk f5f706ca6d Merge branch 'DDRace' of github.com:GreYFoX/teeworlds into DDRace 2011-12-14 17:02:45 +02:00
Shereef Marzouk c496bf3c4e Merge branch 'master' of https://github.com/oy/teeworlds into DDRace 
Conflicts:
	bam.lua
	scripts/make_release.py
 2011-12-14 17:01:47 +02:00
eeeee 385be8a716 updating existing bans' expiration would break ordering in bans sorted list 2011-12-14 13:48:41 +01:00
eeeee 0c16a58563 enforce upper limit on minutes to prevent unix timestamp from overflowing 2011-12-14 13:47:49 +01:00
eeeee 8f5f45c18f keep lifebans at the tail of bans list. Fixes #131 2011-12-14 13:47:23 +01:00
oy 6e20c32859 removed some resource loading spam. Closes #894 2011-12-10 18:23:29 +01:00
GreYFoX 1446d0980b Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 
* Version 1.098a
Conflicts:
	bam.lua
	src/game/client/gameclient.h
	src/game/mapitems.h
 2011-12-05 11:32:01 +02:00
oy 55fe59fa8a updated zlib to 1.2.5 2011-12-04 17:50:52 +01:00
oy 8e0ce38e29 fixed sv_max_client usage 2011-12-04 16:51:33 +01:00
Choupom b2a825652d added a command to unban all 2011-12-04 14:22:59 +01:00
oy 0fdc9c1b8e cleaned up few things 2011-12-04 14:17:05 +01:00
GreYFoX 5ebf60891c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 2011-12-01 19:48:09 +02:00
oy 05f77f64af added caching for the play command. Closes #891 2011-11-30 01:41:00 +01:00
oy 48d367db20 added faster way of inverting the sorted serverlist by KillaBilla. Closes #885 2011-11-29 22:34:47 +01:00
oy 8238853b8c added a todo note 2011-11-29 22:18:40 +01:00
eeeee 1452b6811c Replaced sorting implementation with stable one to prevent annoying flickering on server browser update. 2011-11-29 22:16:41 +01:00
XXLTomate 17e633f00e Remove two unused config lines 2011-11-08 22:39:36 +01:00
GreYFoX 09232125b4 Ability to disable emotes. Closes #115 2011-11-08 14:09:42 +02:00
XXLTomate 137a447065 Victims without callback(s) 2011-11-08 12:30:54 +02:00
GreYFoX 6c99ea2104 CMDList 2011-09-02 22:25:16 +02:00
GreYFoX abfd5555b0 DDRace tuning vars reset every map, but default Teeworlds tuning vars don't 2011-09-02 20:37:03 +02:00
Ravomavain 7d1a392f03 Fix chat command and close #81 2011-08-31 22:58:48 +02:00
GreYFoX 3ad8284716 Fixed #77. top5 2011-08-31 12:30:18 +02:00
GreYFoX 7e24be5d83 Version 1.091a 2011-08-31 12:10:15 +02:00
GreYFoX bf5374adbf Reverted a change 2011-08-31 02:48:58 +02:00
GreYFoX 4ca0681689 Added chat commands for only chat and available to all users 
Thanks @heinrich5991 for this idea of a separate console object to handle it
 2011-08-27 17:11:39 +02:00
GreYFoX 7e6f6465b7 typo 2011-08-27 14:12:13 +02:00
GreYFoX c7d9b289e7 Added a command to check user status commands 2011-08-26 23:37:10 +02:00
GreYFoX 9fe96f6b04 Test Commands check and feedback on command not executed 2011-08-26 23:24:46 +02:00
GreYFoX b75a26eed9 Fixed the console 2011-08-26 20:03:30 +02:00
Ravomavain 15d0a40825 Add user level access and use this level for /cmds if player is not authed. 2011-08-26 16:28:14 +02:00
Ravomavain 47a1e2b230 Fix banmaster compilation. Fix some sign-compare warnings 2011-08-26 16:28:13 +02:00
GreYFoX de4a95c5d2 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 2011-08-20 06:50:06 +02:00
GreYFoX 5b27758650 Removed level stuff 
Removed client ID stuff
Removed console stuff
Resolved merge conflicts
Upgraded Banmaster
Cleaned up
 2011-08-13 02:11:06 +02:00
GreYFoX 35d16bd58c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 
Conflicts:
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/menus_browser.cpp
	src/game/client/gameclient.cpp
	src/game/editor/editor.cpp
	src/game/editor/editor.h
	src/game/editor/io.cpp
	src/game/editor/layer_tiles.cpp
	src/game/editor/popups.cpp
	src/game/gamecore.cpp
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gamemodes/ctf.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2011-08-13 02:01:40 +02:00
Shereef Marzouk c6fd4a2cc5 General whitespace and tab cleanup 2011-08-11 10:59:14 +02:00
oy 2aee50d5b1 fixed a nasty noise problem. Closes #812 2011-08-05 18:37:59 +02:00
oy dfd9e142d5 Merge pull request #801 from fisted/fix_srs 
here is clevar solution for serious design flaw
 2011-08-03 13:54:48 -07:00
oy 435639636e Merge pull request #808 from SushiTee/master 
fixed a warning
 2011-08-03 13:53:18 -07:00
Shereef Marzouk c1b23535ff fixed typo 2011-08-02 12:14:23 +02:00
SushiTee 370b93d8e1 fixed a warning 2011-08-01 12:11:10 +02:00
oy b25fc26c1c zero out client memory on startup to prevent more bad surprises 2011-07-31 18:39:48 +02:00
oy 9cf4facd05 fixed a client crash in debug. Closes #806 2011-07-31 17:07:10 +02:00
oy 3209aec45f fixed compiling error on osx 2011-07-31 13:17:38 +02:00
oy 9418802150 protected econ authentication against brute force 2011-07-31 13:05:12 +02:00
oy 1705c90e14 fixed ban for life on the server 2011-07-31 12:43:35 +02:00
oy aabac3dcfc send notification to enter a password when a client connects to econ. Closes #803 2011-07-31 02:25:55 +02:00
oy 9349af0085 clean up econ sockets on shutdown. Closes #804 2011-07-31 02:20:46 +02:00
oy 8d0cc2a825 reduced stack memory usage of CDataFileWriter 2011-07-31 01:40:28 +02:00
oy 34132ce244 fixed client crash in debug 2011-07-31 01:38:45 +02:00
oy 94bdd95957 added missing newlines at end of 2 files 2011-07-30 18:29:40 +02:00
Johannes Loher e2664c1b00 Added server sided automatic demo recording 2011-07-30 18:23:59 +02:00
oy 0f11cf014c increased length for help string of temporary commands 2011-07-30 18:19:15 +02:00
oy b3e8506f20 create client on heap. Closes #744 2011-07-30 13:50:22 +02:00
oy a0a62bcd70 fixed econ feature and tcp 2011-07-30 13:40:01 +02:00