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

2220 commits

This branch
This branch
All branches
Author SHA1 Message Date
oy abf74f47f7 fixed wrong output in the ban command and added feedback to the kick command 2010-09-12 12:07:10 +02:00
btd 81beda6260 Merge branch 'master' of git://github.com/GreYFoXGTi/DDRace 2010-09-12 00:57:44 +04:00
btd da36e27b57 Every time i forgot this 2010-09-12 00:57:30 +04:00
btd c117f48741 Remove rubbish 2010-09-12 00:46:30 +04:00
btd edbef086c1 git add src/*git add src/*! Fix character collision bug with additional protocol message, begin to finish ShowOthers 2010-09-12 00:45:56 +04:00
GreYFoXGTi 97d1acd89a revert for a fix (sendto) implemented in commits: 
Commit:7f42b6225be9d0cc107f838695ba19de0e1b53d8
Commit:9c052398f4e4b185da6a59c25e678711af804d92
which is not needed in trunk tw
 2010-09-11 18:10:46 +02:00
btd 7ed685ee11 Merge 2010-09-11 13:42:35 +04:00
btd bbe66c5f20 Revert last not working fix 2010-09-11 13:31:36 +04:00
GreYFoXGTi 72e05efc53 Added Evil Teleporter, 
Added Speed Setters to speedup layer
Added Unfreeze Plasma
Supposedly Fixed Crazy Shotgun (needs Testing)

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-11 02:01:15 +02:00
GreYFoXGTi c7a38950c5 Reported vote enforcing in chat, Closes #25. 
Note: cant use chat from CServer so i won't do the kick/ban report.
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-09 22:20:15 +02:00
GreYFoXGTi 4984d1b64b fixed some mistakes, Closes #23. 
finished some todos.

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-09 20:52:17 +02:00
GreYFoXGTi d67a2893ea Merge branch 'master' of http://github.com/Speedy-Consoles/DDRace 2010-09-09 20:14:54 +02:00
Speedy Consoles 73ef7ef2c6 reworked the chat commands 2010-09-09 15:32:14 +02:00
GreYFoXGTi 363cc10d28 /* .. 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-09 15:25:23 +02:00
GreYFoXGTi 1119432e60 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into teams2 2010-09-09 05:37:45 +02:00
GreYFoXGTi 0b1b949a3c Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/server/entities/flag.cpp
	src/game/server/entities/flag.h
	src/game/server/gamemodes/ctf.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-09 05:37:08 +02:00
GreYFoXGTi ddb4c2e370 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into teams2 
Conflicts:
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamemodes/DDRace.h
	src/engine/shared/config_variables.h

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-08 22:22:08 +02:00
btd fec294caee Fix linux compilation. Revert last changes. Add /show_other option (in menu now working) 2010-09-08 20:22:11 +04:00
oy e191b2c59e when hooking a player don't use predicted values for rendering the hook. Closes #9 2010-09-08 02:54:03 +02:00
oy e31b125a0d use the numpad enter key as well. Closes #166 2010-09-08 02:32:41 +02:00
oy d4b145a8ee fixed Gui lock while deleting/reading demos. Closes #167 2010-09-08 02:27:48 +02:00
oy cbf07ffa57 added fix for don't show cursor while playing demo by Choupom. Closes #128 2010-09-08 02:07:36 +02:00
Choupom 71109a98fb fixed chat message with missing name (#110) 2010-09-08 00:20:59 +02:00
GreYFoXGTi d1b3e01892 Merge branch 'master' of http://github.com/oy/teeworlds 2010-09-07 21:49:12 +02:00
Choupom 532ea85aeb separated CFlag from ctf 2010-09-07 20:02:46 +02:00
oy 6299f6518a disable emote selector and chat window in the demo player. Closes #126 2010-09-07 20:01:51 +02:00
ghost 3baf522330 added the option to hide the console window on the client, too. Fixes #48 2010-09-07 19:32:33 +02:00
oy eecdff0cf5 fixed overlapping in last commit 2010-09-07 19:31:20 +02:00
ghost 56c4081da4 Demo name is now showed while playing a demo file 2010-09-07 19:12:11 +02:00
oy ea25972e21 added rec notification by ghost91-. Closes #82 2010-09-07 19:03:59 +02:00
GreYFoXGTi 9dda4a5a81 merging conflict mistake 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 08:09:35 +02:00
GreYFoXGTi 0c0c231f13 Merge branch 'master' of http://github.com/GreYFoXGTi/teeworlds into master3 
Conflicts:
	src/game/client/components/maplayers.cpp
	src/game/variables.h

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 07:59:51 +02:00
GreYFoXGTi 616498e7b1 Merge branch 'master' of http://github.com/oy/teeworlds into master 
Conflicts:
	src/engine/client/input.h
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/engine/shared/network_server.cpp
	src/engine/storage.h
	src/game/client/components/chat.cpp
	src/game/client/gameclient.cpp
	src/game/client/gameclient.h
	src/game/collision.cpp
	src/game/editor/ed_editor.cpp
	src/game/editor/ed_editor.h
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamemodes/ctf.cpp
	src/game/server/player.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 07:57:38 +02:00
GreYFoXGTi 02d643b599 updated some stuff 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 07:51:14 +02:00
GreYFoXGTi d62b2917ca Changed /Emote commands 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 07:51:04 +02:00
GreYFoXGTi f19bcdfa50 Modified Checkpoint behavior 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 07:50:53 +02:00
GreYFoXGTi 3df855df00 Moved Switch layer Initialization from CGameContext to GameControllerDDRace 
i Quote btd "gamecontext as a global rubbish" xD

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 07:48:20 +02:00
GreYFoXGTi 1fe93f4592 Reworked the Crazy Shotgun, and fixed a bug ( still needs testing ) 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 07:47:10 +02:00
GreYFoXGTi b808d636d5 Revert "Doors can no longer close on Tees" 
i quote Tsin Said "Total Cheat" xD

This reverts commit 0f1d20c5d4.

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 07:36:48 +02:00
GreYFoXGTi 0f1d20c5d4 Doors can no longer close on Tees 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 07:35:30 +02:00
GreYFoXGTi 08040f5487 Added an Option to Disable Eye Emotes 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 07:15:24 +02:00
GreYFoXGTi 9499e04fd7 Removed gfx clear from settings file. Closes #15. 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 06:45:36 +02:00
GreYFoXGTi db3a97c771 Small Mistake. Closes #19 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 06:45:36 +02:00
GreYFoXGTi 15576f123a Something i forgot to do while merging from Oy 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 06:45:36 +02:00
GreYFoXGTi 91d65a5e69 Added /kill 
but i couldn't make the clients have a suicide penalty for some trivial reason since i am ill.. -.-"

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 06:45:35 +02:00
GreYFoXGTi 290c453a83 Removed useless config variables 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 06:45:35 +02:00
GreYFoXGTi ea6e41036d Fixed Stoppers being ignored when on another tile 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 06:45:35 +02:00
GreYFoXGTi ebb5636fa3 /pause no longer pauses you time by default 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 06:42:42 +02:00
GreYFoXGTi 87b7c20b79 Stuff i don't want to lose 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 06:41:56 +02:00
GreYFoXGTi fe20420666 Better Stoppers System 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 06:41:56 +02:00