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
heinrich5991
470e2773ba
added system to generalize rcon commands
2010-11-07 17:08:09 +01:00
heinrich5991
6f35687e03
added system to generalize rcon commands
2010-11-07 16:29:55 +01:00
btd
5f6e35b418
Finish sv_team
2010-11-07 01:54:35 +03:00
GreYFoXGTi
96e67724f1
Merge branch 'rm_clientdummies' of https://github.com/heinrich5991/DDRace
...
Conflicts:
src/game/server/gamecontext.cpp
moved and edited src/game/ddracecommands.h
2010-11-05 01:59:37 +02: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
heinrich5991
60d7639c9b
moved ddrace-specific rcon cmds from 'game/server/gamecontext.cpp' to 'game/server/ddracecommands.h' in order to remove renundancy with client-side server dummies for tab-completion
2010-11-02 17:07:45 +01:00
heinrich5991
133fbfcb13
fixed levels of client dummies added by the previous commit
2010-11-01 23:08:23 +01:00
heinrich5991
32dd89d97f
added client dummies for 'move', 'move_raw', 'addweapon', 'removeweapon'
2010-11-01 23:04:16 +01:00
GreYFoXGTi
beb5712a79
i thought i added those like 10 years ago
2010-11-01 13:00:37 +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
fc433afd49
Merge branch 'master' of http://github.com/oy/teeworlds
2010-10-31 20:32:35 +02:00
oy
039de7e1ac
fixed infinite loop when playing empty demo. Closes #248
2010-10-31 18:51:05 +01:00
GreYFoXGTi
c704a4ee95
a gift for btd
2010-10-31 19:47:10 +02:00
oy
9e39239ce2
skip start params when parsing argv in console
2010-10-31 17:53:00 +01:00
GreYFoXGTi
6dc504b995
Fixed VoteKick
2010-10-31 05:35:01 +02:00
GreYFoXGTi
d6b898c84a
Merge branch 'master' of http://github.com/oy/teeworlds
2010-10-30 00:48:17 +02:00
oy
f1bc96ad09
fixed crashes with the font. closes #178
2010-10-29 23:49:33 +02:00
oy
9490b6f28d
fixed key handling for unicodes > 255
2010-10-29 23:01:50 +02:00
m!nus
523c15e0e7
added a null pointer check in huffman decompression code. it was possible to crash a masterserver by sending it a packet that had the compression flag (but not the connection-less flag) set because the huffman look up table is not initialized in the masterserver and thus resulted in a null-pointer-node. clients and servers (with initialized look up tables were not affected. it was also not possible to use this to inject code.
2010-10-29 01:46:10 +02:00
oy
b343ef7f55
fixed mac compiling. Closes #238
2010-10-28 23:32:01 +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
4d204d642f
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/engine/console.h
src/engine/shared/console.cpp
src/engine/shared/console.h
2010-10-26 00:25: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