edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-11 02:28:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
10069 commits 1 branch 429 tags 411 MiB
Commit graph

760 commits

Author SHA1 Message Date
heinrich5991 e954e55533 Removed *_dump and *_reset from the list of game commands 2015-08-27 13:00:43 +02:00
heinrich5991 d13ebf93a2 Add config_store and config_retrieve tool 2015-08-27 12:55:35 +02:00
heinrich5991 bf1f7d6ccd (Safely) execute settings embedded in maps 2015-08-27 12:55:34 +02:00
heinrich5991 6a17d2700d Fix saving the config into the map 2015-08-27 12:51:24 +02:00
SushiTee 7bd0f276d4 saving server settings within the map and loading them on init 2015-08-27 12:51:24 +02:00
heinrich5991 a3246ed099 Save the config into the map when the server loads the map 2015-08-27 12:51:24 +02:00
def 9d5459d731 Check IDs in a more reasonable order 2015-08-12 15:54:03 +02:00
def 8401c43edb Remove a message to prevent server log spamming 2015-08-05 22:43:57 +02:00
def a04578b3ba Add switch_open to set the initial state of a switch to open 2015-07-22 23:32:39 +02:00
def 0cd9b0006b Another known bot client 2015-07-13 00:18:59 +02:00
def 17b8a5219b Show a nice message to known bot clients 2015-07-13 00:02:57 +02:00
def 1ef03e7387 Only disallow team changing and killing when calling kick/spec votes 2015-07-09 19:07:33 +02:00
def 6e8ada1ac8 Fix whitespaces a bit 2015-07-09 02:12:35 +02:00
def acf18f98fc Clearer message on veto 2015-07-08 18:09:52 +02:00
def b6133e7ece Fix typo... 2015-07-08 17:05:49 +02:00
def c79b4d3112 Add veto right for players with high time to stop map change votes 2015-07-08 17:03:22 +02:00
def 1f2b09303f Vote caller never counts as afk 2015-07-08 16:04:54 +02:00
def b3592380d1 Re-enable broadcast for old DDNet client version 2015-07-04 14:12:49 +02:00
def 45b7706439 Don't ignore timeout codes because of spam protection (might fix issue with timeout code being ignored) 2015-06-26 03:59:38 +02:00
def 49c0bedb62 Go back to forbiding cl_startinfo 2015-06-18 17:47:07 +02:00
def 981b6d0013 Fix potential server crash 2015-06-02 11:55:16 +02:00
def 0f5a4f8428 Fix start info spam protection 2015-05-19 17:47:41 +02:00
def 14b5766b30 Disallow spectators to participate in kick votes 
Fixes #186
 2015-04-19 14:15:59 +02:00
def a77cd039a6 Get rid of all Clang warnings 2015-04-18 22:29:28 +02:00
def 2b32b4a18a Add fire delay tunings 2015-02-12 15:20:22 +01:00
def 79aeb5ea38 Add hook duration tune 2014-12-27 12:05:02 +01:00
def 023f926e89 Fix Compilation 2014-12-20 16:35:47 +01:00
def d3837038eb Fix stack underflow 2014-12-02 12:35:52 +01:00
def 21472046df Remove magic number: 256 -> NUM_TUNINGZONES 2014-11-25 22:47:25 +01:00
def bba82712e0 Add sv_solo_server for easier solo servers (also working for tunezones finally) 2014-11-25 22:42:05 +01:00
def bc9d632103 Clean up whitespace detection a bit and add BRAILLE PATTERN BLANK (U+2800) 2014-11-08 20:14:12 +01:00
def 929d59454c Text change 2014-10-28 21:37:46 +01:00
east 40e7de63e9 config var renamed 2014-10-27 13:39:33 +01:00
east a6d70e83f6 support for remove_vote added 2014-10-27 13:34:29 +01:00
east 630fd4fa07 sending vote options balanced 2014-10-26 19:39:42 +01:00
def f81d2af6d3 text messag 2014-10-11 22:47:30 +02:00
def 2fa361fe4d Fix previous commits 2014-10-11 01:10:53 +02:00
def 9c0bb7d02b Vote random map with defined nr of stars 2014-10-11 01:01:32 +02:00
def dcc64f1902 Vote random unfinished map with defined nr of stars 2014-10-11 00:41:56 +02:00
def 8c45d885d5 Allow 4 spectator mode changes per second 2014-10-03 21:41:18 +02:00
def 3804c16f02 Fix a bunch of crashes on server demo recording 2014-09-26 03:20:47 +02:00
def c78cea9046 Add sv_demo_chat (0 by default to disable recording chat) 2014-09-26 02:40:58 +02:00
def 2aedf8e64a Grammar 2014-09-22 18:57:56 +02:00
savander 1278538a84 Fix encoding 2014-09-22 16:16:47 +02:00
savander 0ecbf36de4 Kill Protection: prevent joining to spectators 2014-09-22 16:12:01 +02:00
def 741cf8f8c7 Cleanup & Halloween event 2014-09-18 12:14:00 +02:00
def ca99f3f518 Change 2 more messages 2014-09-12 20:29:02 +02:00
def ff4779e214 admin -> moderator in force-vote messages 2014-09-06 21:19:44 +02:00
def 05dd0b4af7 Fix crash in kill protection 2014-08-25 11:35:55 +02:00
def d51328f7d7 Kill protection cleanup 2014-08-25 00:18:51 +02:00
savander 1577201364 Kill protection 2014-08-24 23:24:33 +02:00
def 2cff296c25 Protect from IP spoofing of rcon commands 2014-08-22 13:54:13 +02:00
def c9d70ed81b Try to fix crash related to bad connection and reconnecting 2014-08-18 23:50:24 +02:00
def 07aa08703d Remove (probably buggy) implicit timeout protection 2014-08-16 14:43:22 +02:00
def 75538e32cc make sv_vote_max_total only work for kick and spec votes 2014-08-12 13:41:57 +02:00
def 1d08bffbbb Map configs don't have to be in data directory 2014-08-11 20:37:47 +02:00
def 85b7475ae4 remove debug output 2014-08-09 18:13:21 +02:00
def 4af575654b Kind of working 2014-08-09 14:50:51 +02:00
def 127dc1c196 Try timeout 2014-07-28 20:44:17 +02:00
def 145f0434f5 Add /save by the glorious HMH 2014-07-26 14:46:31 +02:00
def e08e00817c Fix that mod can call any vote 2014-07-19 19:06:25 +02:00
def 4245fae16f Small cleanup 2014-06-26 17:37:06 +02:00
def d03caaeeac Fix random unfinished map vote 2014-06-22 15:23:07 +02:00
def a7329d0a14 Add random_unfinished_map 2014-06-20 22:40:23 +02:00
def be2bed2fe2 Fix typo 2014-05-20 17:25:47 +02:00
def e8e6b71db4 Add variable sv_vote_time 2014-05-19 02:23:01 +02:00
def d5dd94d633 Allow players to change their vote (every 3 seconds) 2014-05-19 02:17:18 +02:00
def 4c87cedd4d Better make sure that something exists before using it 2014-05-19 01:57:52 +02:00
def 54609b3fab New feature: Players can choose spectator mode while playing 2014-05-17 16:40:02 +02:00
def 1129ea28f4 Make sv_vote_delay work 2014-05-04 11:10:42 +02:00
def 5eb7a74558 Fix: Tunings and Tunezones with dummies 2014-04-29 03:34:23 +02:00
def d2486ab84a Fix: Spam protection for converse 2014-04-24 00:43:49 +02:00
def 4b70e195c1 Multiline broadcasts 2014-04-19 00:40:21 +02:00
HMH 91547852dc correct tunings on client enter 2014-04-18 14:43:33 +02:00
def 9d123cb95f Fix: Work for pure vanilla servers 2014-04-15 21:22:12 +02:00
def 38b16ee5c0 Jetpack prediction (Thanks to v) 2014-04-14 01:34:50 +02:00
def 6e33858cab Code cleanup 2014-04-13 16:49:58 +02:00
def 83201c9003 More extended tunings 2014-04-13 16:41:02 +02:00
def 7ae973af0d Make jetpack strength a tuning 2014-04-12 11:12:29 +02:00
def 327aa4e196 Fake tunings for NPC and NPH and tuning cleanup 2014-04-06 12:22:27 +02:00
def 8be0091d07 Add sv_teleport_hold_hook 2014-04-05 00:35:18 +02:00
HMH 6943711be3 better tune-updating 2014-03-29 18:04:37 +01:00
def bbb6572d5f Fix: Send vote to newly joined players 2014-03-28 12:52:03 +01:00
def c98ad5bf22 Merge branch 'new' into DDRace64 
Conflicts:
	src/game/editor/layer_tiles.cpp
 2014-03-23 23:18:43 +01:00
def fb4c83cf3e More cleanup 2014-03-23 19:31:28 +01:00
def 63f642c478 Fix array sizes and array accesses 2014-03-23 18:56:07 +01:00
def ef579f55e2 Typo 2014-03-23 18:02:04 +01:00
HMH 85b069193f set proper standard tunings for zones 2014-03-23 17:10:49 +01:00
HMH 330fc92c8c added a list out of CTuningParams for the different tunezones, added a list for messages to display on switching between zones, put rcon commands for adjusting theses lists, edited SendTuningParams to make it possible to send zonespecific tunings 2014-03-23 17:10:49 +01:00
def 6ead8f0531 Add sv_vote_max_total 2014-03-22 19:53:43 +01:00
def 73663f2919 Vote delay for /map 2014-03-04 02:48:58 +01:00
def b72df908a1 Add faketunings for 0 jumps 2014-03-01 14:29:14 +01:00
def 6406e77e9c Disable faketuning for freeze for now because it looks really weird in some situations 2014-02-23 01:10:43 +01:00
def 65f0455f64 Fake tunings: Don't fake hook as people are annoyed by shorter hook 2014-02-20 18:51:46 +01:00
def b1d577af30 Huge fix with fake tunings 2014-02-20 01:36:39 +01:00
def e9db91e953 Add solo fake tunes 2014-02-19 22:30:57 +01:00
def 40651924bf Make Fake Tunings a bit nicer and less resource intensive 2014-02-19 22:30:34 +01:00
def 92e0b5fe3c Add fake tunings so that freeze prediction is correct (by HMH) 2014-02-19 21:55:37 +01:00
def a5f3de6827 Add /map (for votes) and /mapinfo (instead of /mappoints) 2014-02-19 21:22:36 +01:00
def 4a2eaaf1cc Less strict spam filtering 2014-02-14 00:26:05 +01:00
def caa1f15d12 Fix possible crashes 2014-01-30 16:54:58 +01:00
def d8533eea67 Proper Client Version numbers and more visible whispers 2014-01-30 16:49:15 +01:00
def 69df267bb1 Don't allow random_map when no maps are available in votes 2014-01-29 02:04:02 +01:00
def beb74082b3 Send initial team state 2014-01-22 00:35:02 +01:00
def aa64e86f12 Fix: Send proper votes to 64/16 player clients 2014-01-11 22:22:45 +01:00
def f5cab53aa4 Send all votes to ddnet clients 2014-01-08 02:57:18 +01:00
def 5c2794fcea Remove unused variable 2014-01-04 03:50:56 +01:00
def bdc14849f7 Fix vote window 2014-01-03 13:51:18 +01:00
def e44456c08e Fix: Proper vote status for non-64-player-clients 2014-01-02 21:23:27 +01:00
def 8d4301b2e3 Next try to prevent DDRace problems 2014-01-02 02:15:19 +01:00
def b919538663 Revert "DDRace clients don't work well with teams on 64 player servers" 
This reverts commit 314c5cb275.
 2014-01-02 02:13:10 +01:00
def 314c5cb275 DDRace clients don't work well with teams on 64 player servers 2014-01-02 02:10:27 +01:00
def a98458a9f3 Fix switches for 64 teams 2014-01-01 22:34:10 +01:00
def 39ba649849 Less restrictive spam protection 2014-01-01 22:06:46 +01:00
def 08eb38230f Reverse Translation for DDRace64 2013-12-31 18:25:40 +01:00
def 3607218f12 Merge ddrace64 from eeeeee 2013-12-31 06:13:57 +01:00
def 5453c0c80f Allow longer messages 2013-12-27 04:09:45 +01: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 ec4a83eb1a Fix: Don't change tune parameters 2013-12-23 20:33:01 +01:00
def 70a0774453 Add /dnd 2013-12-22 18:30:13 +01:00
def 7237fe2a31 Add random_map 2013-12-07 00:15:56 +01:00
def 7af88ed004 Reset extended teleports 2013-11-24 19:23:58 +01:00
def 3dda7569e6 Display saved scores 2013-11-14 16:08:04 +01:00
def 0b305471d2 Add jetpack 2013-11-13 13:25:26 +01:00
def fe44c5a569 add sv_show_others_default 2013-10-20 23:22:49 +02:00
def 34e568f41b Add converse command 2013-10-18 11:42:35 +02:00
def 185f132a24 Don't send "Muted text" 2013-09-02 21:30:00 +02:00
def 58039066f4 Add local time screen at top 2013-08-23 00:45:48 +02:00
def a2c7feda17 Add afk vote timer 2013-08-18 03:27:30 +02:00
def a837b251ab Whisper case-insensitive 2013-08-16 00:53:24 +02:00
def 8acea035bd DDRaceNetwork -> DDraceNetwork 2013-08-13 18:32:33 +02:00
def 0d6acbda16 Fix spec voting 2013-08-13 18:14:03 +02:00
def ed02dbed33 Whisper: Make chars with spaces work even without "" 2013-08-12 23:02:39 +02:00
def 0a5433178d ddnet.no-ip.info -> ddnet.tw 2013-08-12 21:55:04 +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 b567c32820 ddnet Info 2013-08-07 04:47:03 +02:00
def 6169c78a79 Close memory leaks 2013-08-03 17:22:50 +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 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 919f6d1cb2 Merge branch 'spec-vote' into DDRace 2013-07-28 17:06:35 +02:00
def d85081851f Allow specmode switching more often 2013-07-25 23:36:19 +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 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
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
Magnus Auvinen 1711be955b fixed all the errors that the clang static analayzer found 2013-02-24 17:58:34 +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
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
Learath2 f98734e86e Made a log line more useful. 2012-05-01 21:58:40 +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
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 57a975f38e added a server command to lock teams. Closes #831 2012-01-08 13:55:20 +01:00
Ravomavain 02372ac0b0 Don't allow kill if player is paused 2012-01-01 00:15:16 +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 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 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
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 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 e96da00103 Fixed Some Todos in the code 2011-12-26 11:15:43 +02: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
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
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
GreYFoX 1837c76a07 fixed a crash 2011-09-08 01:02:09 +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 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 ff696bad6c Mac Loves Cyclic Includes 2011-08-31 13:56:04 +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
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 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
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 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
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 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
oy 348806d993 abort "move to spectator"-vote when the player disconnects 2011-06-09 22:31:55 +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
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 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
GreYFoX 2ab15cc752 fixed 1 line merge mistake. fixes #45 2011-05-09 18:45:35 +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
oy 15e1d4f1d6 distinguish [chat] and [teamchat] in console messages. Closes #643 2011-05-05 02:08:39 +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 dca0057bc1 Fixed a possible crash 2011-04-19 21:44:02 +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 b4f05a6772 removed comments from voting - no longer needed 2011-04-10 15:32:56 +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
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 722644008f added a respawn delay command for tdm 2011-03-26 22:38:05 +01:00