Commit graph

18649 commits

Author SHA1 Message Date
GreYFoXGTi 229106a2bf Made BrushDraw always put the editor variables. Closes #32.
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-15 12:06:02 +03:00
GreYFoXGTi 5d4f50e2d5 Fixed when copying empty tiles in special game layers
editor variables were set to 0 ( like force in speedup )

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-15 12:00:11 +03:00
GreYFoXGTi bfd7d11a99 Changed the way Layers are rendered. Closes #31.
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-15 11:47:45 +03:00
GreYFoXGTi 8e066517ad Merge branch 'master' of http://github.com/btd/DDRace
Conflicts:
	src/game/server/gamecontext.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-15 05:57:34 +03:00
btd d195d5c7bc Fixes for super player. Still dont work collision 2010-09-15 00:36:48 +04:00
btd a75ab04d21 Add Team for super players. They can collide with all players. Not tested 2010-09-14 22:28:50 +04:00
btd 12202f0e08 Kill character if he was not in team 0 but want to join team 0 2010-09-14 21:05:18 +04:00
btd 3a5dca96bc More safe 2010-09-14 20:58:18 +04:00
btd c4fa5c6128 Ugly command invis_me ^_^ seems very funny 2010-09-14 20:56:28 +04:00
btd 3cd72cfb87 Move Sending info to GameContext. Now Teams is finished. Need to test it all 2010-09-14 20:32:17 +04:00
btd 0221f68d35 Disable /show_others (for DDRace-Client instead use menu). Fix sending all teams information to new joiners 2010-09-14 15:38:46 +04:00
GreYFoXGTi 3ffbd91fca revert the score board
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-13 07:50:00 +03:00
GreYFoXGTi fa379a806a Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/server/server.cpp
	src/game/client/components/scoreboard.cpp
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
2010-09-13 07:49:01 +03:00
btd 83e384892c Fix silly mistake 2010-09-12 23:09:19 +04:00
btd 0e063cbc07 Fix hammer hit ShowOthers and ShowOthers when it unabled 2010-09-12 22:11:25 +04:00
oy c52ee7baa9 unbind a key with right mouse button in the controls menu. Closes #67 2010-09-12 17:15:09 +02:00
Choupom 901427809f fixed so "reset tunning due to pure server" appears after "x changed to y" 2010-09-12 16:58:10 +02:00
oy fe9e3f47a8 fixed last commit 2010-09-12 16:56:13 +02:00
Choupom 006fd711b4 made versions system for demos 2010-09-12 16:40:39 +02:00
oy 0c1261620f prevent self kick/ban in the console. Closes #50
and fixed line endings
2010-09-12 13:52:25 +02:00
oy 5437513a0d use escape key to abort binding a control key in the menu 2010-09-12 13:40:24 +02:00
oy 64c9b5c4ab added quotes around player names in the other server messages too and changed it to ' for consistency 2010-09-12 13:34:30 +02:00
oy a3337a68e7 fixed that player name and ping overlap in the scoreboard. Closes #106 2010-09-12 13:26:38 +02:00
oy 9ab3e7e121 fixed overlapping voting. Closes #100 2010-09-12 13:18:11 +02:00
oy daab7fdcd4 fixed that score overlaps in the scoreboard. Closes #161 2010-09-12 13:06:55 +02:00
oy fa9c8ee77f don't show player specific debug info when the debug graphs are shown to prevent overlapping 2010-09-12 12:55:37 +02:00
oy 16657faf55 end vote on 50% no 2010-09-12 12:51:07 +02:00
oy e226b47212 close the emote selector, chat history and the scoreboard when closing the chat, console or ingame menu. Closes #111 2010-09-12 12:43:03 +02:00
oy d913af1ab2 renamed demorec files to demo 2010-09-12 12:16:51 +02:00
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