Commit graph

1607 commits

Author SHA1 Message Date
def 32109b0f15 Missing buffer 2013-08-12 20:35:46 +02:00
def 72ca64501f New SQL, automatic reconnect 2013-08-12 20:13:12 +02:00
def 131a7a7ad7 Fix: Don't allow empty whispers 2013-08-10 04:30:59 +02:00
def ccc777f792 Max 4 commands per second 2013-08-10 04:21:20 +02:00
def a1e9cc5c51 Spam protect whisper 2013-08-10 03:40:59 +02:00
def b4f0b96acc Fix /whisper 2013-08-09 15:07:17 +02:00
def 7f4fe15e1c Add Whispering 2013-08-09 15:04:20 +02:00
def 33566a626c Try to fix memory leaks 2013-08-08 01:47:49 +02:00
def b567c32820 ddnet Info 2013-08-07 04:47:03 +02:00
def 987efe8604 Show everyone entire game 2013-08-07 04:08:28 +02:00
def f32d22b4fd Fix order in team top5 2013-08-06 20:03:14 +02:00
def 53d6fe3db8 use correct first name 2013-08-06 19:28:17 +02:00
def 6d272e91b5 SQL: clear strings first 2013-08-06 19:26:28 +02:00
def bd5fd4ec6e Prevent memory leaks 2013-08-06 05:14:53 +02:00
def 4987b26b7b Fix prediction 2013-08-05 19:58:51 +02:00
def 111d5c7f10 Add entities to start and stop: Player collisions, Hooking, Infinite jump 2013-08-05 17:47:04 +02:00
def 861267a06c Add sv_team_max_size 2013-08-05 03:43:58 +02:00
def 02ac497531 Fix: No ninja in solo 2013-08-04 22:50:14 +02:00
def e4201940cd Fix: Don't reset doors for spectators 2013-08-04 04:46:26 +02:00
def 7dc439e13f Fix: Delete points at correct position 2013-08-03 17:28:11 +02:00
def 6169c78a79 Close memory leaks 2013-08-03 17:22:50 +02:00
def cce5e262de Send an information about how many points were earned 2013-08-03 15:26:17 +02:00
def 3cfe974092 Make ninja work only on team mebers 2013-08-02 21:10:43 +02:00
def 8f9a1c24fb Remove iostream 2013-08-01 22:28:11 +02:00
def 6935a9678b Fix: team 0 doesn't count players 2013-08-01 22:27:19 +02:00
def 819c792f6c Show spectators the whole game 2013-08-01 16:03:07 +02:00
def 10a343d96b Fix: Only insert better team times, otherwise update 2013-08-01 00:58:00 +02:00
def fd757e1e19 Change name to DDRaceNetwork 2013-07-31 19:08:07 +02:00
def 8720186c75 Revert "Revert "Restrict rcon output (east)""
This reverts commit 35cf8832a9.
2013-07-31 01:31:53 +02:00
def 9ae9b53c7f Revert "Spam protect commands too"
This reverts commit 5de7f9a858.
2013-07-31 01:31:05 +02:00
def 35cf8832a9 Revert "Restrict rcon output (east)"
This reverts commit ba5b98dd1d.
2013-07-31 01:27:29 +02:00
def 5de7f9a858 Spam protect commands too 2013-07-30 23:31:52 +02:00
def ba5b98dd1d Restrict rcon output (east) 2013-07-30 23:26:30 +02:00
def 55743535c6 Don't allow voting "info" 2013-07-30 00:41:35 +02:00
def 7f3b86227c Don't allow voting "info" 2013-07-30 00:39:27 +02:00
def aad8b97dae Don't allow voting "info" 2013-07-30 00:36:21 +02:00
def f5c6db789b Add support to teleport others, not just yourself 2013-07-29 21:25:10 +02:00
def 5e537f24c6 Fix: When a player is spec-voted while being in pause he can't rejoin because he stays in pause 2013-07-28 23:43:27 +02:00
def cdf2818575 Add reload_points to reload the point map file 2013-07-28 17:53:07 +02:00
def 919f6d1cb2 Merge branch 'spec-vote' into DDRace 2013-07-28 17:06:35 +02:00
def 0fc8e0fdf7 Fix team rank 2013-07-28 16:18:33 +02:00
def d59a0c3135 Fix team rank 2013-07-28 15:32:23 +02:00
def e3db85b629 Remove sql requesting player output 2013-07-27 23:27:12 +02:00
def d85081851f Allow specmode switching more often 2013-07-25 23:36:19 +02:00
def dc240f7d55 Fix SQL score output 2013-07-25 23:36:00 +02:00
def 43ecc1c7a3 Add rcon: totele i 2013-07-23 23:37:00 +02:00
def c7fef524e6 Don't follow from-teles without a corresponding to-tele 2013-07-23 02:13:13 +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 796548ff65 Don't reset hook pos in red teleports, allow holding hook while going through tele 2013-07-22 18:03:32 +02:00
def 3a80c5f5fb Make evil (red) teleports work as normal (blue) teleports when weapons- or hook-through-teleport are activated 2013-07-22 17:37:14 +02:00
def 66776503c4 Correct name lengths in SQL queries 2013-07-22 14:34:17 +02:00
def a69f8c42f5 Rename error message 2013-07-22 13:07:49 +02:00
def 4a9d932438 Fix /points rank numbers 2013-07-22 00:03:48 +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 536fadd034 Rename commands 2013-07-21 13:35:01 +02:00
def 42a8783f00 Add /teamrank and /teamtop5 2013-07-21 08:46:52 +02:00
def 012de29d60 Fix brackets 2013-07-21 05:01:01 +02:00
def c42e9f1399 Add /points and /toppoints using points.cfg file 2013-07-21 04:52:23 +02:00
def e49960a34a Fix tele shooting 2013-07-20 14:16:45 +02:00
def d9d16369d1 Fix 2013-07-20 14:06:56 +02:00
def 38a0874b61 Laser through teleport can hit oneself 2013-07-20 14:04:12 +02:00
def c276ee1255 Fix shotgun pulling direction immediately after teleport 2013-07-19 02:04:50 +02:00
def 1b68bf65f2 Add server options for sv_teleport_hook and sv_teleport_weapons 2013-07-19 01:23:48 +02:00
def 6fb11efa40 Make lasers go through teleporters 2013-07-19 01:06:48 +02:00
def 54b942fa7e Make hooks go through teleporters 2013-07-19 00:27:17 +02:00
def 717219e1c2 Make projectiles shoot through teleporters 2013-07-19 00:27:08 +02:00
def fa3938d7a6 Fix: If a player just killed himself he could kick players from every
team in the time before he respawned.
2013-07-13 19:14:56 +02:00
def 0aade21960 Only allow voting team members to spectators to prevent abuse 2013-07-11 03:03:36 +02:00
def 9c145fcc35 Don't try to reset doors when there are none 2013-07-11 02:06:15 +02:00
def 5e83eff2ce Revert "Don't try to reset doors when there are none"
This reverts commit 7bf704a6ed.
2013-07-11 02:02:14 +02:00
def 7bf704a6ed Don't try to reset doors when there are none 2013-07-11 01:56:03 +02:00
def 6d33fcc5a6 Fix door opening cheat 2013-06-23 02:51:04 +02:00
Teetime 61671f3bcd Fixed a missing check if killer is alive in tdm 2013-04-07 14:41:53 +02:00
oy f0e09f50d9 improved chat msg spam protection 2013-04-01 20:30:58 +02:00
oy 75cdc0a769 drop game messages when client isn't ingame. Closes #1081 2013-03-23 15:59:27 +01:00
XXLTomate 8521e088fd removed dbg_msg 2013-03-18 13:02:14 +01:00
XXLTomate f91f3e61f9 fixed checkpoints 2013-03-18 12:58:29 +01:00
oy 0e92dd5603 fixed some merge problems 2013-02-24 18:55:55 +01:00
oy 7eddbe0dc9 play only one weapon no ammo sound per second. #993 2013-02-24 18:02:57 +01:00
Magnus Auvinen 1711be955b fixed all the errors that the clang static analayzer found 2013-02-24 17:58:34 +01:00
oy ffa93a007c fixed a bug with spectating a player 2013-02-24 17:24:12 +01:00
BeaR 6d74d52c22 Fix problem with show other players: (Closes DDRace/teeworlds#210)
sending packet on setting change
2013-02-03 20:23:44 +02:00
Shereef Marzouk 0081251628 Fixes not displaying the nick when /rank {nick} is used. (Closes #197) 2013-02-01 13:25:00 +02:00
eeeee 56ad4f3c73 prevent bullets from drifting 2013-02-01 13:12:33 +02:00
Shereef Marzouk b000c9e4e1 Fixed team blocking by disconnect (Closes #206) 2013-02-01 13:08:23 +02:00
Learath2 6f98bcfee0 Update src/game/server/gamecontext.cpp 2013-01-27 23:31:50 +02:00
Learath2 c55cae6492 Reduced length of new year event to 2 days. 2012-12-23 19:53:57 +02:00
eeeee 1c8c20c93e added sv_events 2012-12-23 19:47:47 +02:00
Shereef Marzouk 38aa2cac78 Player name when requesting another player's. closes #197.
Edited from github directly needs to be tested
2012-11-26 12:54:17 +02:00
Shereef Marzouk 7f7a46b497 Player name when requesting another player's
Edited from github directly needs to be tested
2012-11-26 12:47:41 +02:00
aelio_ru b68840b30b Fixes inactive dragger after map change or server start, Fixes #181. 2012-08-26 09:23:11 +02:00
Learath2 ec3c96abd6 Fixes records for maps in subfolder. Closes #46 2012-07-20 14:25:44 +02:00
Learath2 f98734e86e Made a log line more useful. 2012-05-01 21:58:40 +02:00
Ravomavain cd5046a1a9 Prevent laser draggers from dragging paused players. Fix XXLTomate#16
Reset velocity on resume to avoid other bugs.
2012-05-01 21:57:09 +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 d5dcfa3c4f Fixed obligatory Teams (sv_team 2). 2012-04-11 16:16:30 +02:00
Learath2 44d34b0033 Fixed paused players getting afk kicks. 2012-04-11 14:41:02 +02:00
Learath2 f053fd64a0 Forgot a return at can't pause while spectator or dead 2012-04-11 14:40:04 +02:00
Sebastian Wick 57d90a16eb fixes srv crash if typing '/top5 -999999' 2012-03-23 22:32:20 +01:00
Learath2 5e6d5a28f0 Follow up fix for pause and spec cant spec or pause in spectators. 2012-03-08 18:24:23 +02:00
Learath2 e06fd51ec1 Fixed a bug i experienced in a up to date server 2012-03-07 19:51:30 +02:00
Shereef Marzouk 65bbd53009 removed useless ve line 2012-03-02 00:53:19 +02:00
Learath2 50b2d85abb Fixed according the comment of GreYFoX. 2012-02-14 22:38:06 +02:00
Learath2 d64e1796aa Simplifys the usage of timer commands. Fixes new year happy spawn. 2012-02-14 20:25:34 +02:00
SushiTee 1e602bf31b fixed showing player spawn effect only to players who should see 2012-02-05 14:48:09 +01:00
SushiTee e359f82c69 init m_LockTeams with 0 to prevent locked teams on server start 2012-01-26 22:18:21 +01:00
SushiTee 4b2a34e1c5 force vote only if there is a vote 2012-01-26 22:17:26 +01:00
oy dfe91338f0 added pause command. Closes #15 2012-01-10 00:49:31 +01:00
oy 4fde2cf7f2 add tuning to demo. Closes #899 2012-01-09 00:49:20 +01:00
oy 3626286d0d skip inactive kick for debug dummies to avoid console spam 2012-01-08 15:26:37 +01:00
oy 57a975f38e added a server command to lock teams. Closes #831 2012-01-08 13:55:20 +01:00
Ravomavain ebf64758b1 Make spectators see the same thing as the player they spectate 2012-01-01 00:15:16 +02:00
Ravomavain 02372ac0b0 Don't allow kill if player is paused 2012-01-01 00:15:16 +02:00
Ravomavain c85d7bcc0f Make spectators hear the same thing as the player they spectate 2012-01-01 00:15:16 +02:00
Ravomavain af8fac1bac Little fix to allow 2 players to spectate each other 2012-01-01 00:15:15 +02: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
GreYFoX 250b3b9416 i was scared that @heinrich5991 may send people to kill me while i sleep for hard coding something into DDRace 2011-12-31 19:16:40 +02:00
oy c975390195 made vote ban check if the ip matches an authed player 2011-12-31 12:11:48 +01:00
Ravomavain 9de29f3775 Paused players can hear sounds. Fix #127. 2011-12-31 01:44:37 +02: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 21be03f3c6 fixed messages 2011-12-31 01:34:48 +02:00
GreYFoX 7820e48ec6 Minor changes 2011-12-31 01:33:11 +02:00
oy ccaec79567 made it possible to automatically swap teams between rounds 2011-12-30 22:47:26 +01:00
oy 11cc0e78d7 removed chat spam for the team commands 2011-12-30 22:30:28 +01:00
oy ed4158e837 fixed last commit 2011-12-30 22:17:51 +01:00
BeaR afb1d5e201 Swap and Shuffle Teams 2011-12-30 21:52:01 +01:00
GreYFoX 7d462b565d Fixed the bugs i know of with the last few commits 2011-12-30 16:51:08 +02:00
oy 353f5cc8d6 fixed that the flag grab sound is played several times in a server side demo. Closes #901 2011-12-29 13:56:24 +01:00
GreYFoX 2baa440866 Happy New Year, all tees are now born happy, Version v1.11 2011-12-29 14:39:51 +02:00
GreYFoX 9af4f1e172 Added race started check 2011-12-29 14:35:14 +02: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
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
GreYFoX 8b09813288 old useless todo 2011-12-26 11:56:12 +02:00
GreYFoX e96da00103 Fixed Some Todos in the code 2011-12-26 11:15:43 +02:00
GreYFoX cdab951296 Increasing the Readability on primitive editors of DDRace Specific files (All files that does not exist in oy/teeworlds) 2011-12-25 15:51:47 +02:00
GreYFoX bfed5bad1a Added License INfo to missing files and updated the old ones 2011-12-25 15:33:05 +02:00
GreYFoX 4da271df56 Deleted a useless state and added onTeamStateChanged Event 2011-12-25 15:19:03 +02:00
GreYFoX 8a7c0df1d5 Mini performance improvement 2011-12-25 15:00:47 +02:00
GreYFoX 28cd7afa24 You srsly REALLY can't join teams that fast! 2011-12-25 13:20:10 +02:00
Shereef Marzouk 1871207bfe Version and Credits 2011-12-14 17:05:48 +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
oy 99f04a7f87 let the server check if the input aims the center. Closes #889 2011-12-10 18:21:12 +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 8e0ce38e29 fixed sv_max_client usage 2011-12-04 16:51:33 +01:00
XXLTomate 9a59dd4158 victims at force_vote; cmd description updated 2011-11-08 22:08:37 +01:00
GreYFoX 323e63453b fixed team cheat. Closes #103 2011-11-08 15:21:03 +02:00
GreYFoX df0798a673 Fixed pickup sounds. Closes #111 2011-11-08 14:15:31 +02:00
GreYFoX 09232125b4 Ability to disable emotes. Closes #115 2011-11-08 14:09:42 +02:00
GreYFoX d6845f0502 Vote enforcer as command executer
Force pause doesn't need the client id to be positive
Fixed force pause parameter reading

partially helps #124
2011-11-08 13:56:08 +02:00
XXLTomate 137a447065 Victims without callback(s) 2011-11-08 12:30:54 +02:00
Ravomavain 24fc16543c Fix chat commands being too verbose if console_output_level is set on config file. Close #116 2011-10-31 19:16:43 +01:00
XXLTomate 771293a922 Fixing muteID 2011-10-12 21:31:33 +02:00
Shereef Marzouk b5f8738acd Merge pull request #118 from XXLTomate/ddracePullSqlFix
fixing sql score by @Laxa
unrevised untested @XXLTomate thanks but please test and maintain i didn't even see the changed code
2011-10-12 10:29:12 -07:00
XXLTomate a2cec1b990 fixing sql score by @Laxa 2011-10-12 19:17:48 +02:00
GreYFoX 1837c76a07 fixed a crash 2011-09-08 01:02:09 +02:00
GreYFoX d9f973b8da SQL Fix 2011-09-08 00:51:55 +02:00
GreYFoX 9f16db0969 Fixed tuning reset 2011-09-05 13:55:47 +02:00
Sergey b326fc245f Count change_map in sv_vote_map_delay too. 2011-09-04 22:24:40 +02:00
GreYFoX df5a63948a Fixed warning: src/game/server/teams.cpp:206: suggest parentheses around && within || 2011-09-03 01:10:08 +02:00
Ravomavain 7b8575f755 There is a variable for that, use it! :p 2011-09-03 01:08:37 +02:00
Ravomavain 04981004d5 Improve Checkpoint-teleporters: if no matching destination is found for the current checkpoint, check previous ones 2011-09-03 01:08:37 +02:00
GreYFoX fe5e9f4ad7 Removed redundant command from console 2011-09-03 00:28:56 +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
GreYFoX 8c103b8c13 * Added a new tile to facilitate solo parts ( works with teams )
* Can now put tiles with the same indexes as in tele or switch layer i game layer but it will drawn to the correct image
* Adjusted Masking to account for Solo players
2011-09-02 20:04:18 +02:00
Ravomavain 5b44fae0ce Remove unneeded variables 2011-09-02 12:05:14 +02:00
Ravomavain b24b67518a Allow chat commands to be used in remote console 2011-09-02 12:05:14 +02:00
GreYFoX 5035506825 Fixed team collision and 0.6 trunk, 1.094a 2011-09-01 20:29:08 +02:00
GreYFoX d960765552 fixed warning: src/game/server/entities/laser.cpp:93: 'f' may be used uninitialized in this function 2011-09-01 02:14:05 +02:00
GreYFoX f845f271ad Fixed warning: src/game/server/ddracechat.cpp:267: unused variable 'pSelf' 2011-09-01 00:30:37 +02:00
GreYFoX b7e3bbb824 added fix for #82 by BeaR 2011-08-31 23:36:41 +02:00
Ravomavain 7d1a392f03 Fix chat command and close #81 2011-08-31 22:58:48 +02:00
GreYFoX ff696bad6c Mac Loves Cyclic Includes 2011-08-31 13:56:04 +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 f2e34075b8 Fixed the /cmd crash Fixes #76
deleted the chat console on destruction
2011-08-31 02:39:08 +02:00
eeeee cfde5a20ec allow usage of eyeemotes in freeze 2011-08-31 02:36:47 +02:00
GreYFoX 03bd3823ec Fixed SQL Compilation 2011-08-27 23:32:40 +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
eeeee 2d4c965c7e prevent excess draggers snapping to save loads of traffic 2011-08-27 14:09:06 +02:00
eeeee 9f8ba5cf45 it was possible to avoid being kicked by afk stuff by opening chat 2011-08-27 14:09:06 +02:00
GreYFoX 9fe96f6b04 Test Commands check and feedback on command not executed 2011-08-26 23:24:46 +02:00
GreYFoX 94c0088c1b Set the AccessLevel at login 2011-08-26 20:23:47 +02:00
GreYFoX b75a26eed9 Fixed the console 2011-08-26 20:03:30 +02:00
Ravomavain e8229f537f Fix loading of old maps 2011-08-26 16:34:25 +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 5912395554 Clarify this if statement. 2011-08-26 16:28:14 +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
oy 709c05bb37 improved description for restart command. Closes #796 2011-08-05 19:52:32 +02:00
Shereef Marzouk 8877cf2293 Refactored some pointers 2011-08-02 12:35:14 +02:00
Johannes Loher e2664c1b00 Added server sided automatic demo recording 2011-07-30 18:23:59 +02:00
oy 7db6d1e056 fixed problem with player collision. Closes #722 2011-07-30 18:08:24 +02:00
GreYFoX 74462d4611 enumerated laser types, made it possible to choose which weapon to disable using switch layer delay variable 2011-07-25 22:16:20 +02:00
GreYFoX 831aea796e Saving hitting status on pause 2011-07-25 21:15:51 +02:00
Choupom b7aa8af7aa thats why magic values sux 2011-07-23 18:42:51 +02:00
GreYFoX 344944c9d4 --b * 2 2011-07-22 16:23:03 +02:00
GreYFoX d965eb7453 utter noobness 2011-07-22 16:15:39 +02:00
GreYFoX cdbbf9e74b Removed a useless line
ps. commiting from the car while driving via iPhone xD
2011-07-22 16:02:56 +02:00
GreYFoX dd015c33c0 Fixing the sound for the laser when a player DCs after shooting it 2011-07-22 15:03:15 +02:00
GreYFoX 8f927a6033 Fixed a crash 2011-07-22 14:52:28 +02:00
GreYFoX 2964919bf2 Some logic fixes 2011-07-22 14:29:27 +02:00
GreYFoX b0420e66ee used Teams() instead of ((CGameControllerDDRace*)GameServer()->m_pController)->m_Teams 2011-07-22 00:01:12 +02:00
GreYFoX 3d07ffdbdd Added the Missing Single Tee No Hitting Logic 2011-07-21 03:13:59 +02:00
GreYFoX 959b11b13d Admin protection closes #59 2011-07-20 03:18:03 +02:00
GreYFoX 1dfd2882d2 Added Hit as a tile
Entities are in the previous commit
2011-07-19 23:33:12 +02:00
oy 571dff6216 made rcon auto completion serverside. Closes #97 2011-07-14 22:07:21 +02:00
Romain Labolle a6dc6f34b6 Display a message when an admin forces a vote. Closes #759 2011-07-11 11:28:04 +02:00
oy ab1f7d6f95 clamped information flow when moving as spectator in free-view. Closes #551 2011-07-05 22:58:54 +02:00
oy b153003b0b fixed dm wincheck 2011-07-04 18:30:24 +02:00
oy 08b6ffd52c fixed possible server stressing 2011-06-27 17:20:46 +02:00
Johannes Loher f80c46e24d fixed so you can use whatever time you want on set_team and so that it uses minutes 2011-06-27 17:07:51 +02:00
Johannes Loher 14f98a9ded Added possibility to deny changing of team after a set_team for a certain amount of time. Added server setting to do this automatically for spec votes. fixes #640. 2011-06-27 17:07:23 +02:00
nsinreal 66a8000620 Fixed ninja: always set last active weapon after ninja's end 2011-06-27 16:28:49 +02:00
oy c10c7d9ac3 improved sudden death in ctf. Closes #617 2011-06-19 17:32:00 +02:00
oy 957b81af07 made it possible to restrict player information in spectator mode 2011-06-19 11:28:39 +02:00
oy 4dc79a9ec1 fixed spawn bug. Closes #634 2011-06-15 01:03:14 +02:00
Choupom c1ebda73e3 fixed #687 Bug with the ctf score when the round starts, fixed so you can't grab the flag if the game is over 2011-06-11 18:34:05 +02:00
Choupom 558b110504 fixed #633 Correct sound effects in following spectactor mode 2011-06-11 18:33:30 +02:00
oy 348806d993 abort "move to spectator"-vote when the player disconnects 2011-06-09 22:31:55 +02:00
oy 2cc10fd6f0 fixed that the player keeps action when activating chat. Closes #719 2011-06-09 22:30:03 +02:00
GreYFoX 9c4b1c9892 fixed a crash, closes #56 2011-06-07 17:21:47 +02:00
GreYFoX 457fee998d Refactored a variable 2011-06-07 17:05:19 +02:00
GreYFoX e6189d05c4 On name change relaod scores, fixes %55 2011-06-07 17:05:07 +02:00
Romain Labolle 3f2dc36151 Fixing Force-pause:
* sv_vote_pause_time : maximum 15s, default 10s
* Removing sv_vote_pause_auto (so afk stay in pause)
* force_pause require config level
* force_unpause set force-pause timer to 0
2011-06-07 16:49:36 +02:00
Romain Labolle bb971bdcf0 Adding vote to force-pause players (instead of just moving them to spectators).
* Add the following config variables :
  * sv_vote_pause: Allow voting to pause players (instead of moving to spectators) (default: 1)
  * sv_vote_pause_time: The time (in seconds) players have to wait in pause when paused by vote (default: 60)
  * sv_vote_pause_auto: Automatically unpaused players after the force-pause delay or not (default: 0)
* Add the following functions :
  * force_pause v?i : Force v to pause for i seconds
  * force_unpause v : Force v to unpause
2011-06-07 16:48:49 +02:00
Romain Labolle 0ae0b0bb83 Adding pause specific message when players use /pause (instead of joined the game/spectators). 2011-06-07 16:48:48 +02:00
Romain Labolle c17d3cdeda Reworking teams to allow pausing in team
* Adding wrappers functions to modify character or pause data if player are in game or paused.
* Moved OnFinish() function to teams.cpp so it can also be called on paused players.
* Pause is now enabled for team players.
* Adding bool CPlayer::IsPlaying() function that return true if the player is either in game or in pause. (false if spectator/dead).
2011-06-07 16:48:48 +02:00
GreYFoX 413bf4a39e Credits and version 1.08a 2011-06-07 16:48:01 +02:00
GreYFoX c3df972fe3 Optimized checkpoint code 2011-06-05 13:56:04 +02:00
GreYFoX c1962bff25 Removed sv_broadcAst
this commit is funny cause it was made from my iPhone and it only took 8 minutes
2011-06-03 21:55:57 +02:00
GreYFoX bee10fda8f Merge branch 'master' of git://github.com/oy/teeworlds
Conflicts:
	src/game/server/gamecontext.cpp
2011-06-02 19:13:40 +02:00
Choupom deff0ce7c4 fixed netevent struct names 2011-06-02 17:40:08 +02:00
Choupom 1a02017094 fixed some strings 2011-06-02 17:39:05 +02:00
Romain Labolle 38f1db1c4f Adding a checkpoint system for teleporters :
* Player go through a Checkpoint tile (29 in tele layer)
* He fall in a Check-Teleporter tile (31 in tele layer)
* Player is teleported to the check-TO (30 in tele layer) that have the same number as the last Checkpoint.
Thus players are teleported to the last checkpoint he passed, regardless of whether he made ​​the map in the right direction or not.

Tele tileset may need some improvement.
Closes Pull Request #52
2011-06-01 17:03:04 +02:00
Romain Labolle 813f689957 Tune reset clean up (fix #50)
* Removing old unused DDRaceTunesReset() function.
* Adding ResetTuning() function to reset tunes.
* Adding ResetTuning() and some settings reset (sv_hit/sv_endless_drag/sv_old_laser) to CGameContext::OnInit() which is loaded on each map load.
GreYFoX:
Repositioned the new Functions
2011-06-01 16:43:20 +02:00
GreYFoX a232cdc90a Unified SetTeam Time with Pause time fixing a CRTITCAL cheat reported by TbMa P.S. He is NOT a Rogue ;-), Thanks very much Mr.TbMa 2011-06-01 16:12:35 +02:00
Romain Labolle 5fad119b5f nethash.c moved to nethash.cpp fix GreYFox/DDRace#48 2011-05-09 23:59:58 +02:00
GreYFoX 2ab15cc752 fixed 1 line merge mistake. fixes #45 2011-05-09 18:45:35 +02:00
GreYFoX ee97bfcad3 fixed last merge 2011-05-09 18:40:14 +02:00
GreYFoX cc63cf2553 Merge branch 'master' of git://github.com/oy/teeworlds
Conflicts:
	src/engine/external/pnglite/pnglite.c
	src/engine/external/pnglite/pnglite.h
	src/engine/shared/config_variables.h
	src/game/client/components/menus_browser.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/version.h
2011-05-09 18:36:13 +02:00
eeeee a58996b6bf return from afk handling code immediately if player got kicked, as player struct is zeroed out
closes #47
2011-05-09 18:22:05 +02:00
oy 8d5badc260 skip player input if the chat is active to prevent abusing the linked emoticon. Closes #678 2011-05-05 02:13:32 +02:00
oy 15e1d4f1d6 distinguish [chat] and [teamchat] in console messages. Closes #643 2011-05-05 02:08:39 +02:00
oy 5fbf6d0bfd fixed compiler warnings. Closes #679 2011-05-05 01:43:27 +02:00
Choupom 4dfcfc6913 fixed a variable name 2011-05-03 18:46:18 +02:00
GreYFoX aba78d9e2e Fixed and refactored 2nd afk warning thanks to @ravomavain for noticing it 2011-04-23 19:59:25 +02:00
GreYFoX fae976c98b Sending Scores in negative to clients. closes #36 2011-04-20 22:40:56 +02:00
Romain Labolle f4ca6d9ad5 Some Clean up: closes #28
* m_VoteEnforcer variable is never used.
* pController variable is not used in OnMessage scoop.
* CNetObj_ClientInfo have now only 4 m_Name ints, so change it to 4 in ghost.cpp
2011-04-20 18:07:38 +02:00
GreYFoX 9221bce3f4 Rechecked and fixed the afk kicking system. fixes #27 2011-04-20 16:34:03 +02:00
GreYFoX 9e5336a13d fixed plasma snapping 2011-04-20 16:05:05 +02:00
GreYFoX 0584f2b7a2 Added Plasma Gun tweaking
made the default 3 plasmas per second more cpu friendly
2011-04-20 15:59:40 +02:00
GreYFoX dca0057bc1 Fixed a possible crash 2011-04-19 21:44:02 +02:00
GreYFoX 83318d0583 Refactored some stuff in CLight and fixed CLight::Snap 2011-04-19 15:34:59 +02:00
GreYFoX f5d38a84f9 formatting 2011-04-19 15:15:40 +02:00
GreYFoX 2fff744724 fixed laser snapping 2011-04-19 15:15:21 +02:00
GreYFoX 95408a8fd8 fixed a crash on toooooooo many draggers 2011-04-18 00:05:56 +02:00
GreYFoX 561ce64666 Renamed cheats to testing commands sv_test_cmds
Since these are testing commands, anyone can use them and only on their selves no login needed
Revised some rcon commands
cleanup some unwanted codes
2011-04-15 06:04:21 +02:00
GreYFoX 14e4557dfc Made EMOTICON_WTF eye action EMOTE_SURPRISE 2011-04-15 04:38:48 +02:00
GreYFoX 9397c4a55f some make release changes for adding sql server files
Servers are no longer build with SQL by default.
fixed compilation on Mac OS X 10.5
2011-04-15 04:32:53 +02:00
GreYFoX c5d992dc2c nothing 2011-04-14 04:42:09 +02:00
GreYFoX 7c6d405e2a Fixed vote abortion by admin login 2011-04-14 04:26:13 +02:00
GreYFoX c37bad0be8 fixed a crash 2011-04-14 04:00:22 +02:00
GreYFoX dc886b7b2e New emoticons eye actions 2011-04-14 01:36:51 +02: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
GreYFoX f7892d3f00 Administrator privacy, re-enabled disabled functions 2011-04-14 00:53:33 +02:00
heinrich5991 c83c7b1a19 reworked IConsole::PrintResponse to IResult::Print (and obviously CConsole::PrintResponse to CResult::Print) 2011-04-14 00:34:10 +02:00
oy 06115dd49d added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
GreYFoX dd70b687ed Better ICons + Mac Icons
Disabled Emotional tees until reworked
2011-04-13 01:34:39 +02:00
GreYFoX 4a46168631 Temporarily removed crash features til it's fixed, made version 1.071a
changed some names for the build bot to work
2011-04-12 03:52:01 +02:00
GreYFoX 0ee65685be Fixed Crazy shotgun bullets 2011-04-12 00:28:00 +02:00
GreYFoX 03095b5ecf Nothing 2011-04-12 00:27:52 +02:00
GreYFoX b4f05a6772 removed comments from voting - no longer needed 2011-04-10 15:32:56 +02:00
GreYFoX b2c67df7e7 fixed hammer hit 2011-04-10 15:07:36 +02:00
GreYFoX 32a85dabe3 Fixed some merge mistakes, NOTE: This will be be buggy to say the least 2011-04-09 23:01:10 +02:00
GreYFoX f7f6058a92 Merged Oy, Cleaned up, removed some useless features and code parts
Added Icon by landil
alot more...
2011-04-09 22:32:17 +02:00
SushiTee dce5222f78 removed unused function 2011-04-07 19:52:44 +02:00
oy 9b97eb282a prevent that you can add votes with an empty description 2011-04-05 20:06:41 +02:00
oy 0046825953 fixed server crash on remove vote 2011-04-04 16:58:53 +02:00
oy d7b6c3543b fixed a compiler warning. Closes #565 2011-04-01 17:46:20 +02:00
heinrich5991 b6fa69cedb the server shows the disconnect reason of clients now 2011-04-01 00:05:35 +02:00
oy 32876b9ba7 changed the output level of a console message 2011-03-31 21:46:01 +02:00
oy f9288eb5b1 fixed that spectators go to free view if the followed player joins spectators and prevent that you can follow spectators 2011-03-28 23:45:47 +02:00
oy 34a9ca20a7 added ipv6 support from the old lua branch 2011-03-28 20:11:28 +02:00
oy d4f2b8de87 fixed skin colour of spectators 2011-03-27 11:52:16 +02:00
oy 722644008f added a respawn delay command for tdm 2011-03-26 22:38:05 +01:00
oy 5b328e5484 added a limit for the number of votes that can be added to the server and send options as lists when a client joins. Closes #459 2011-03-26 22:06:29 +01:00
oy fbeace5272 cleaned up some voting code 2011-03-26 17:44:34 +01:00
oy b8f144ba81 added a vote that allows to move a player to spectators. Closes #58 2011-03-26 16:56:59 +01:00
oy 0e207fba6f fixed problem with force_vote command 2011-03-26 16:24:12 +01:00
oy 6ece07ee74 added force_vote command 2011-03-25 12:06:45 +01:00
oy 359b806e95 added remove_vote command. Closes #47 2011-03-25 11:49:35 +01:00
oy a4580d451f added reasons to vote in general and show reason in vote hud. Closes #219 2011-03-25 10:26:59 +01:00
oy 8ad3def65e added aliases for votes. Closes #144 2011-03-25 09:49:21 +01:00
GreYFoX 741de082fc fixed linux compilation 2011-03-22 21:56:52 +02: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
GreYFoX 1172a79693 fixed compilation 2011-03-22 21:15:15 +02:00
Sebastian Wojtowicz 500605cbee Server utf8 Conversion 2011-03-22 21:04:27 +02: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
GreYFoX 5b4d7a4658 Refactored + fixed sv_hit 0 + laser through others 2011-03-19 22:21:42 +02:00
GreYFoX ed5c9c1d92 sv_show_other the ability to use the command showothers 2011-03-19 11:22:03 +02:00
GreYFoX 974f429957 Added git revision to several places 2011-03-18 01:21:07 +02:00
GreYFoX 45f3cf042a Fixed a login with cheats
Renamed a constant
2011-03-18 00:17:01 +02:00
GreYFoX c74cda68e0 Fixed tuned server behavior 2011-03-17 19:20:44 +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 2dc557d77b Fixed Rifle and Shotgun not affecting tees after Passing through owner when sv_old_laser = 1 2011-03-16 13:59:36 +02:00
GreYFoX ca447b7aa4 http://bugs.mysql.com/bug.php?id=50046 2011-03-16 13:59:17 +02: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 83e83947cf give ninja players the momentum they had before slicing, after slicing. Closes #120 2011-03-13 19:00:00 +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 1f10c1e8bf fixed problem with ctf if there're no flags 2011-03-10 10:14:41 +01:00
oy ee2f625754 added extended spectator mode. Closes #28 2011-03-10 10:08:14 +01:00
oy 0640acb27e added a command to set a minimum player limit that is needed to start a kick vote 2011-03-04 17:35:50 +01:00
oy 9811c2396b made network clip flags. Closes #131 2011-03-04 17:08:10 +01:00
oy 4bede550be only update the ping if the scoreboard is active. Closes #27 2011-03-01 18:31:20 +01:00
GreYFoX 709f0cd0f9 Removed Spam checks from ConRank
Moved CGameContext::ProcessSpamProtection(int ClientID) away from vanilla functions
Made Muted text shown to sender
Corrected a + to *
Added FileScore ShowRank to Spam protection
changed SendChatTarget to SendChat in SQLScore and added it into the Spam protection
2011-02-27 10:07:57 +02:00
EliteKuchen 55144629dc wrong names 2011-02-26 20:49:29 +02:00
heinrich5991 652443f068 fixed rewritten mutes 2011-02-26 20:45:02 +02:00
GreYFoX 355dd98bfa lol i missed this 2011-02-26 15:48:15 +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
GreYFoX bef7a1fbbd Emote normal
lol
2011-02-23 21:53:15 +02:00
GreYFoX b3da5344c1 Fixed banning Higher level players
Fixed abort vote on login
removed ComparePlayers (useless i think)
Refactored last_mapvote
2011-02-23 16:27:11 +02:00
GreYFoX 9e54b25740 Fixed 2 Teams bugs
Added comments so that remembering what CGameTeams::SetForceCharacterTeam does won't be hard
Raised the version so that bug tracking is easier
2011-02-23 14:14:56 +02:00
GreYFoX 6d181a2daa Fixed a merge mistake 2011-02-23 09:43:05 +02:00
GreYFoX 48b29bebd4 Possibly Fixed a Teams bug 2011-02-23 08:18:38 +02:00
Romain Labolle 0209ef4126 The first parameter of set_team is the victim (cf. line 1190) 2011-02-23 08:02:55 +02:00
GreYFoX e6643607f4 Reset Team from Super to normal on death 2011-02-23 07:31:39 +02:00
Romain Labolle 7ac12219ea move/move_raw/up/down/left/right commands may apply on Victim not on player who typed the command 2011-02-21 21:40:13 +02:00
oy 45eee0c8c2 fixed spawning on crappy maps 2011-02-21 12:35:14 +01:00
GreYFoXGTi 4e9e60524e Fixed last commit 2011-02-21 00:41:15 +02:00
GreYFoXGTi 2e1094f15d Welcome Trust o_0 Aeeeh ?! 2011-02-20 20:17:38 +02:00
Sebastian Wojtowicz c3739e0e4d fixed a bug that prevented records to be saved in files 2011-02-20 19:11:04 +02:00
Sebastian Wojtowicz 968762b144 Fixed a casting error 2011-02-19 20:10:03 +02:00
Sebastian Wojtowicz 84196b1ef3 some little cleanup
If /times is entered with no params it now shows last 5 times of server in general
2011-02-19 19:53:15 +02:00
GreYFoXGTi 417b18963f windows compiling 2011-02-16 19:56:20 +02:00
GreYFoXGTi 793ea4a499 Don't holdup spawning if tees are there
fixed cl_ddrace_scoreboard
2011-02-16 19:04:41 +02: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
GreYFoXGTi 335a8f69c2 Morning Cleanup 2011-02-16 10:21:23 +02:00
Sebastian Wojtowicz 6963a233a4 Added a new command /last5times (for sql scores only)
Added index to name in race sql table, so search is faster
2011-02-15 02:27:20 +02:00
Sebastian Wojtowicz 60de0da1c3 Added timestamp into MySQL ranking, and function to have ago time web2.0 like printed on asking for /rank 2011-02-15 02:27:19 +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
GreYFoXGTi 29c9bf531d Fixed merge errors 2011-02-14 09:43:44 +02:00
GreYFoXGTi 40a218b5ee Fixed Braces in /yes and /no 2011-02-13 22:21:17 +02:00