edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-21 18:14:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
3622 commits 1 branch 424 tags 417 MiB
Commit graph

382 commits

Author SHA1 Message Date
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
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
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 45f3cf042a Fixed a login with cheats 
Renamed a constant
 2011-03-18 00:17:01 +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
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 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
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
heinrich5991 3d0aab503f rewritten mutes 2011-02-23 23:45:31 +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 6d181a2daa Fixed a merge mistake 2011-02-23 09:43:05 +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
oy d939b84125 removed no longer needed progression browse info 2011-02-16 12:31:47 +01:00
Romain Labolle 806a1babc1 Mute may not affect chat commands (like /pause) 2011-02-13 19:48:54 +02:00
GreYFoXGTi 718d697707 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/collision.cpp
	src/game/collision.h
	src/game/gamecore.cpp
	src/game/server/gamecontext.cpp
 2011-02-13 19:36:53 +02:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
oy 3c7adc6a7f fixed nethash 2011-02-13 13:06:19 +01:00
GreYFoXGTi 68a1a29db8 Reverted 1 Letter Refactoring or Edited it to a full name. 2011-02-13 12:57:10 +01:00
GreYFoXGTi cd574d10a7 Added sv_vote_majority, 1 like vanilla, 0 Consider number of yes against Number of Yes + No 2011-02-12 22:31:42 +02:00
GreYFoXGTi 1b2703aaba Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
GreYFoXGTi ae06076d10 Mute By Fisted 2011-02-08 14:44:59 +02:00
fisted addbf8e3d6 automatic mute on spam 2011-02-03 14:39:00 +01:00
fisted 00f47c18c4 player muting by ip 2011-02-03 13:02:32 +01:00
GreYFoXGTi 9d98ce7e72 Version 1.03a 2011-01-30 23:51:14 +02:00
GreYFoXGTi 832bad08e6 Cleanup and Added All Left Masks 2011-01-29 16:18:36 +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
heinrich5991 43b67aaa57 added server command to clear the votes. this fixes #47 partially 2011-01-23 17:53:53 +01:00
GreYFoXGTi 0a08e1ca06 blocked voting invalid votes, by Floff aka LemonFace 2011-01-21 15:40:39 +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
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 19a9462fe8 removed double entity list in gameworld and cleaned up connected stuff 2011-01-19 18:27:50 +01:00
Floff Floffsson 2edeeadce0 Team messages fixed 2011-01-17 14:59:28 +01:00
GreYFoXGTi 6889adc0bb Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	.gitignore
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h & Cleaned it up
 2011-01-06 23:32:19 +02:00
oy 1306b62ce2 added command to move all players to a team. Closes #384 2011-01-06 13:37:28 +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 a72848e780 added constants for teams by Choupom 2011-01-03 12:50:38 +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
floff 4008a1dc95 spectator votes configurable 2010-12-16 10:06:24 +01: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 dd849d3915 Merge branch 'master' of http://github.com/heinrich5991/DDRace into DDRace 2010-12-04 23:54:06 +02:00
heinrich5991 311d92cf47 removed response message after typing "kill" in chat 2010-12-04 20:52:23 +01:00
GreYFoXGTi 83cea23373 Reworked some stuff 2010-12-03 14:58:38 +02:00
GreYFoXGTi 8542181d9a Added include recommended by SushiTee to fix the following mac compiling Errors 
#1 c++ src/game/server/gamecontext.cpp
In file included from src/base/tl/range.h:6,
                 from src/base/tl/algorithm.h:6,
                 from src/base/tl/sorted_array.h:6,
                 from src/game/server/score/file_score.h:6,
                 from src/game/server/gamecontext.cpp:18:
src/base/tl/base.h:8: error: expected `)' before ‘(’ token
bam: 'objs/game/server/gamecontext.o' error 256
 2010-12-02 20:51:21 +02:00
GreYFoXGTi 388ca1288f Fixed Tile Parsing Error and Added dbg Messages to show map tiles 2010-12-02 01:33:02 +02:00
GreYFoXGTi af6f96bc7e Added Tile for the new Map Config 2010-12-02 00:45:36 +02:00
GreYFoXGTi b4fd1aaca9 Fixed Announcement System 2010-11-29 05:39:47 +02:00
GreYFoXGTi 94d5351108 Just to be sure this doesn't make an infinite loop 2010-11-29 05:25:27 +02:00
GreYFoXGTi 4f777211a5 Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-25 00:22:02 +02:00
heinrich5991 5204bbe6b7 fixed rcon command "set_team" 2010-11-24 23:17:56 +01:00
heinrich5991 73ca31d168 changed rcon command "cmdlist" nearly completly 2010-11-24 22:09:31 +01:00
GreYFoXGTi a3d29d5447 Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-23 03:57:48 +02:00
heinrich5991 077b8bd84d fixed sv_vote_percentage 2010-11-22 22:30:50 +01:00
GreYFoXGTi 4737588827 New Delayed Switches 2010-11-22 23:10:12 +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 3ceebe2ef4 Forgot to make the map.cfg level 4 2010-11-22 10:32:00 +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
Choupom c64d3817cf fixed so we can't add a vote option multiple times by oy 2010-11-20 21:41:18 +01:00
Sworddragon fc9211c777 Updated copyrights 2010-11-20 21:26:06 +01:00
GreYFoXGTi d414579247 Added ### after *** to indicate a /me message, and avoid messages that look like the server sent it 2010-11-19 18:57:53 +02:00
GreYFoXGTi ac341b5390 fixed mac compilation 2010-11-18 01:19:44 +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
oy 994a44f6e1 simplified change_map command so that it switches to the next map in the maprotation when called without param 2010-11-17 12:50:01 +01:00
GreYFoXGTi 4cbcbae508 Fixed sv_vote_percentage 2010-11-16 16:59:17 +02:00
GreYFoXGTi 0c6767dd9d Added option to have DDRace Compiled without SQL 2010-11-16 15:44:16 +02:00