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
8cdabb890f
fixed that the server crashes on too many snap items ( Closes #317 ), optimised snapshot hashing
2011-01-18 18:09:09 +01: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
oy
26f7c67895
fixed console parsing when using the exec command. Closes #381
2011-01-07 19:33:29 +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
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
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
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
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
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
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
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
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
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
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
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