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
3155 commits 1 branch 429 tags 411 MiB
Commit graph

324 commits

Author SHA1 Message Date
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
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
GreYFoXGTi bf4ed7515c Forgot to parse the tiles from the Switch layer ^^ 2010-11-14 16:00:33 +02:00
GreYFoXGTi 670e90c7e3 Merge branch 'master' of http://github.com/btd/DDRace 
Conflicts:
	src/game/server/entities/door.cpp
 2010-11-14 03:32:00 +02:00
GreYFoXGTi 071fb6a5a3 new Switch System //TODO Rendering Rotation 2010-11-14 02:39:04 +02:00
btd 002cf9792f Fix project tile 2010-11-13 18:41:43 +03:00
btd e3fb77f444 Merge branch 'master' of github.com:btd/DDRace 2010-11-13 18:31:25 +03:00
btd 2c44c94c4e Move console staff 2010-11-13 18:31:13 +03:00
btd 325aa980e9 Fix door issue. Fix explosion-team issue. Fix null pointer bug. Fix predicion bug. Fix crash when character killed and snap in this moment 2010-11-13 00:54:33 +03:00
heinrich5991 c54b824a45 fixed 'cmdlist' rcon command for joining clients 2010-11-11 23:22:09 +01:00
btd cd59d111a8 Fix explosion issue. Dont pull, not tested. Can pull if test both commits=) 2010-11-11 12:12:03 +03:00
heinrich5991 e078d537c2 moved spam protection and re-added it for /rank and /me; some smaller fixes 2010-11-10 22:42:29 +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
GreYFoXGTi 27864ec70d Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-09 00:24:42 +02:00
GreYFoXGTi 86675f7dd7 Able to amend the mute to something less 2010-11-08 11:29:09 +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 678c94b344 removed the senseless parameters of CGameContext::CheatsAvailable 2010-11-07 13:21:25 +01:00
heinrich5991 b9875cefd8 fixed a bit ugly code 2010-11-07 12:03:26 +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 9feef5638e Merge branch 'master' of http://github.com/btd/DDRace 2010-11-04 21:18:55 +02:00
btd 32d80c22d1 score board 2010-11-04 21:33:51 +03:00
GreYFoXGTi 32429ebe31 /me is a number of word, parameter = r not s 2010-11-04 20:24:13 +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 d2e24f0318 added rcon commands 'move' and 'move_raw', re-implemented 'up', 'down', 'left', 'right' 2010-11-01 21:09:44 +01:00
heinrich5991 c9dd108e09 added CGameContext::MoveCharacter, fixed CGameContext::ModifyWeapons 2010-11-01 20:44:36 +01:00
GreYFoXGTi 46d66aa06e Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-01 20:07:57 +02:00
heinrich5991 7167cb827c re-implemented rcon weapon functions with the new function CGameContext::ModifyWeapons 2010-11-01 18:22:40 +01:00
heinrich5991 9a38340c57 added CGameContext::ModifyWeapons in order to generalize rcon<-> weapon system 2010-11-01 18:07:09 +01:00
GreYFoXGTi 96eeec6a39 Entities: Fisico 2010-11-01 17:29:09 +02:00
GreYFoXGTi a89da52480 credits update 2010-11-01 16:52:58 +02:00
GreYFoXGTi beb5712a79 i thought i added those like 10 years ago 2010-11-01 13:00:37 +02:00
GreYFoXGTi e43bcd80db Rotation 
FTW
 2010-11-01 03:51:17 +02:00
btd 62ef58329d Return DDRace stuff. No need in mistic compatibility 2010-10-31 23:50:40 +03:00
GreYFoXGTi 85df8a047d Fixed btd's last commit and ensured RaceClient Support(tested) 2010-10-30 21:44:46 +02:00
GreYFoXGTi 8640930779 Merge branch 'master' of http://github.com/btd/DDRace 2010-10-30 20:23:28 +02:00
GreYFoXGTi 8d88f5d541 Partially Revert "Refactoring" to keep DDRace compatible with SushiTee's Stuff 
This partially reverts commit 505a5b4172.
 2010-10-30 20:17:59 +02:00
btd 86365bedcd Add Race stuff but fully reworked. Still only need to make score board 2010-10-30 18:22:35 +04:00
GreYFoXGTi 505a5b4172 Refactoring 2010-10-29 23:29:07 +02:00
GreYFoXGTi d102267139 Moved stuff around 2010-10-27 12:14:26 +02:00
btd b8dd4a32ca Merge https://github.com/GreYFoXGTi/DDRace into others 2010-10-26 23:35:55 +04: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
oy 8ca6a28088 parse line on addvote and skip invalid ones 2010-10-25 18:30:35 +02:00
btd a62decbc91 Show others for ddrace clients. 
Need to fix entities now.

Signed-off-by: btd <bardadymchik@gmail.com>
 2010-10-24 14:47:25 +04:00
btd 61092f7baa Begin show_others 
Signed-off-by: btd <bardadymchik@gmail.com>
 2010-10-23 23:26:10 +04:00
GreYFoXGTi 339c93652e fixed kick vote bug 
thanks egoBlend.{626} => EIMER reported
 2010-10-20 18:07:44 +02:00
GreYFoXGTi a277c7672c Declared Alpha Testing Stage 2010-10-19 02:03:59 +02:00
GreYFoXGTi 8575edcf63 Re-Arranged Some Names due to in activity 2010-10-19 01:53:00 +02:00
GreYFoXGTi 7f437f7245 Merge branch 'master' of http://github.com/heinrich5991/DDRace 
Conflicts:
	src/game/server/gamecontext.cpp
 2010-10-16 22:02:34 +02:00
GreYFoXGTi ddf2883cb2 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/engine/shared/console.cpp
	src/game/server/gamecontext.cpp
 2010-10-16 21:59:59 +02:00
heinrich5991 14c0f77c45 added config command "clear votes" 2010-10-14 12:11:17 +02:00
heinrich5991 0cd8390036 Revert "better spam protection. Closes #82. Feedback Please" 
This reverts commit daac101024.
 2010-10-14 08:42:29 +02:00
oy fa768449e2 fixed issue with reason on forcevotekick 2010-10-13 20:31:21 +02:00
GreYFoXGTi daac101024 better spam protection. Closes #82. Feedback Please 2010-10-12 16:13:56 +02:00
GreYFoXGTi d1129b7fce *whistling*, the obvious cover up. 2010-10-12 11:48:45 +02:00
GreYFoXGTi e9523454f1 Enhanced CMDList but still this causes too weak connection (out of buffer) need to think of a better way 2010-10-12 10:44:24 +02:00
GreYFoXGTi 5cf469fa11 Re-Added Command CMDList 2010-10-12 10:25:48 +02:00
GreYFoXGTi dc12d59a00 registered server dummy commands for tab completion in the client 2010-10-12 10:02:46 +02:00