def
|
85b7475ae4
|
remove debug output
|
2014-08-09 18:13:21 +02:00 |
|
|
def
|
a39c46ea1d
|
Only extend timeout when code was entered
|
2014-08-09 18:08:00 +02:00 |
|
|
def
|
f04537dee5
|
Working great
|
2014-08-09 17:53:24 +02:00 |
|
|
def
|
f859f350ca
|
Kind of working with timeout code
|
2014-08-09 17:25:29 +02:00 |
|
|
def
|
459c25c656
|
Some renames
|
2014-08-09 16:30:12 +02:00 |
|
|
def
|
a8a247116d
|
Only on real timeouts
|
2014-08-09 15:37:10 +02:00 |
|
|
def
|
127dc1c196
|
Try timeout
|
2014-07-28 20:44:17 +02:00 |
|
|
def
|
3eaad43b6b
|
Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace
Conflicts:
bam.lua
data/languages/index.txt
src/engine/server/server.cpp
src/engine/shared/network_server.cpp
src/game/client/components/chat.cpp
src/game/client/components/menus_settings.cpp
src/game/server/entities/character.cpp
src/game/server/gamecontext.cpp
src/game/version.h
|
2013-12-26 18:02:22 +01:00 |
|
|
def
|
e871fbbaad
|
Try to prevent network spamming issues
|
2013-07-30 22:48:31 +02:00 |
|
oy
|
118d2ac837
|
show reason for closing a connection within a debug message. Closes #1061
|
2013-02-24 18:31:30 +01:00 |
|
|
oy
|
521eaf038b
|
fixed missing messages when net connection closes
|
2013-02-24 17:41:39 +01:00 |
|
|
oy
|
7be3c2e634
|
fixed resetting the error string of a net connection. Closes #954
|
2013-02-24 17:35:08 +01:00 |
|
|
oy
|
f1fc3337f5
|
prevent that the server uses close messages from clients. Closes #950
|
2013-02-24 17:32:48 +01:00 |
|
GreYFoX
|
0df6d0541f
|
Merge branch 'master' of git://github.com/oy/teeworlds into HEAD
Conflicts:
bam.lua
src/engine/console.h
src/engine/server.h
src/engine/server/server.cpp
src/engine/shared/config.h
src/engine/shared/config_variables.h
src/engine/shared/console.cpp
src/engine/shared/console.h
src/game/client/components/binds.cpp
src/game/client/components/chat.h
src/game/client/components/console.cpp
src/game/client/components/console.h
src/game/client/components/controls.cpp
src/game/client/components/emoticon.h
src/game/client/components/maplayers.cpp
src/game/client/components/menus.h
src/game/client/components/scoreboard.h
src/game/client/components/spectator.h
src/game/client/components/voting.h
src/game/client/gameclient.cpp
src/game/client/gameclient.h
src/game/client/render.h
src/game/collision.cpp
src/game/editor/ed_layer_tiles.cpp
src/game/gamecore.cpp
src/game/gamecore.h
src/game/layers.cpp
src/game/layers.h
src/game/mapitems.h
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/entities/laser.h
src/game/server/entities/pickup.cpp
src/game/server/entities/pickup.h
src/game/server/entities/projectile.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/server/gamecontroller.h
src/game/server/gameworld.cpp
src/game/server/gameworld.h
src/game/server/player.cpp
src/game/variables.h
|
2011-04-14 01:27:49 +02:00 |
|
|
oy
|
06115dd49d
|
added "Whitespace and line Endings cleanup" by GreYFoX
|
2011-04-13 20:37:12 +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
|
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 |
|
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 |
|
|
btd
|
2bda9dc0c6
|
Added connection timeout and fix super team in gun. Thanks Mo(2) for report.
|
2010-10-23 22:11:42 +04:00 |
|
|
Choupom
|
7aefbca742
|
made so we can add the reason for a kick/ban (fixes #123)
|
2010-10-11 00:31:14 +02:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|