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

2097 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ghost 5e1b3c74ef Git does this one automatically, I guess it fixes lineendings. 2010-09-07 02:11:52 +02:00
oy 5ff7836638 fixed problems with the tilelayer dumping. Closes #86. Closes #149 2010-09-07 02:06:11 +02:00
oy 3857096a20 Put quotes around player names in leave message. 2010-09-07 01:18:06 +02:00
Fujnky 69adb4800e Put quotes around player names in server messages. 2010-09-07 01:11:20 +02:00
oy 0cfd1de760 fixed line endings 2010-09-05 19:06:27 +02:00
oy 995d63d7f4 added the possibility to rotate tiles in the editor by SushiTee 2010-09-05 19:01:01 +02:00
oy 5588e1ec8c fixed selected index when deleting a demo and added a popup to confirm the deletion 2010-09-05 17:53:31 +02:00
Choupom fcfaa8389f added Remove button in demos browser (#66) 2010-09-05 17:40:51 +02:00
oy 2800832e12 add maps from maps folder to the demo as well and prevent that 0.5 demo players read the new demos 2010-09-05 17:39:55 +02:00
Choupom 0198e51fa3 made demo readable for custom map that user doesn't have (#5) 2010-09-05 16:34:39 +02:00
Choupom 3dd1ea0d8f fixed header and swap sizes in datafiles (may fixes #14) 2010-09-05 14:30:44 +02:00
oy 62fe7cd5b2 link selected item in the demo list to the first entry (if available) on startup and browse 2010-09-05 14:28:08 +02:00
Choupom 8f3e98208e fixed demo browser (#61) 2010-09-05 14:13:42 +02:00
Choupom 885d695f92 show map name without his folder in server info 2010-09-05 14:11:56 +02:00
oy 18632b7f5f fixed last commit 2010-09-05 14:09:55 +02:00
Choupom 44cf6acc3a fixed so png files are closed after loading 2010-09-05 14:07:07 +02:00
oy 8522cab449 fixed variable types 2010-09-05 14:04:50 +02:00
Choupom 25be8b1be3 fixed so clicking 3 times doesn't generate 2 double-clicks 2010-09-05 13:50:10 +02:00
GreYFoXGTi f9f780ff28 Fixed lags and crashes on kp0 in-game. Closes #149 
Closes #86

Added dbg_layers which is 0 by default to prevent Debug files output when when ingame and pressing kp0

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-05 05:29:27 +02:00
Fujnky 4123f28bba Improved demo player another bit. 
* Replaced the reset button by more common stop button
* Made the demo player automatically reset after demo ended
 2010-09-04 16:23:20 +02:00
btd 5a916948b0 This is better 2010-09-01 14:22:15 +04:00
btd fb2149115c Fix EvalTick in CDoor 2010-09-01 13:50:42 +04:00
btd 4eadf3029b Finish doors. Door hits all characters, check on activating team and send in snapshot only needed information 2010-09-01 12:52:59 +04:00