Commit graph

355 commits

Author SHA1 Message Date
def 8d4301b2e3 Next try to prevent DDRace problems 2014-01-02 02:15:19 +01:00
def d9764a7638 Remove useless broadcast messages 2013-12-31 06:23:40 +01:00
def 3607218f12 Merge ddrace64 from eeeeee 2013-12-31 06:13:57 +01:00
def da2cdf7acd Fix: Reset switches when team is locked 2013-12-30 22:30:07 +01:00
def 605bd0f81c Only show freeze indication once when still frozen 2013-12-26 19:46:44 +01:00
def 3eaad43b6b Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace
Conflicts:
	bam.lua
	data/languages/index.txt
	src/engine/server/server.cpp
	src/engine/shared/network_server.cpp
	src/game/client/components/chat.cpp
	src/game/client/components/menus_settings.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/version.h
2013-12-26 18:02:22 +01:00
def d0d8aaa56c Fix: Proper jetpack strength 2013-12-23 20:40:43 +01:00
def ec4a83eb1a Fix: Don't change tune parameters 2013-12-23 20:33:01 +01:00
def 72bc639a0c TeleOuts as pointer; Hopefully fixes Visual Studio crash 2013-12-12 14:35:01 +01:00
def bfc6558a32 Indicate when ninja ends 2013-12-09 13:53:26 +01:00
def d1a584b4af Add jetpack tile 2013-11-22 15:10:55 +01:00
def eba45c4f0a Add /lock 2013-11-16 00:44:49 +01:00
def 0b305471d2 Add jetpack 2013-11-13 13:25:26 +01:00
def a4296f4bb7 Fix: Super can always jump 2013-09-29 17:16:49 +02:00
def 1cc6977611 Fix jumping 2013-08-24 02:25:58 +02:00
def 6da8d2146c New mapping entity: Specify number of jumps 2013-08-24 01:03:45 +02:00
def 48d84b2784 More correct door reset 2013-08-22 06:07:31 +02:00
def 40ff09be29 Revert visual studio fix 2013-08-18 22:19:02 +02:00
BeaR ee6192900c fix previous commit 2013-08-14 19:56:55 +02:00
def af69765063 Revert "fix visual studio build"
This reverts commit 62409f740a.
2013-08-14 17:31:15 +02:00
BeaR 62409f740a fix visual studio build 2013-08-13 14:06:29 +02:00
def bf518df74d New teleport entities 2013-08-13 04:59:25 +02:00
def 4987b26b7b Fix prediction 2013-08-05 19:58:51 +02:00
def 111d5c7f10 Add entities to start and stop: Player collisions, Hooking, Infinite jump 2013-08-05 17:47:04 +02:00
def 02ac497531 Fix: No ninja in solo 2013-08-04 22:50:14 +02:00
def e4201940cd Fix: Don't reset doors for spectators 2013-08-04 04:46:26 +02:00
def 3cfe974092 Make ninja work only on team mebers 2013-08-02 21:10:43 +02:00
def 8f9a1c24fb Remove iostream 2013-08-01 22:28:11 +02:00
def 6935a9678b Fix: team 0 doesn't count players 2013-08-01 22:27:19 +02:00
def 796548ff65 Don't reset hook pos in red teleports, allow holding hook while going through tele 2013-07-22 18:03:32 +02:00
def 3a80c5f5fb Make evil (red) teleports work as normal (blue) teleports when weapons- or hook-through-teleport are activated 2013-07-22 17:37:14 +02:00
def 54b942fa7e Make hooks go through teleporters 2013-07-19 00:27:17 +02:00
def 9c145fcc35 Don't try to reset doors when there are none 2013-07-11 02:06:15 +02:00
def 5e83eff2ce Revert "Don't try to reset doors when there are none"
This reverts commit 7bf704a6ed.
2013-07-11 02:02:14 +02:00
def 7bf704a6ed Don't try to reset doors when there are none 2013-07-11 01:56:03 +02:00
def 6d33fcc5a6 Fix door opening cheat 2013-06-23 02:51:04 +02:00
XXLTomate 8521e088fd removed dbg_msg 2013-03-18 13:02:14 +01:00
XXLTomate f91f3e61f9 fixed checkpoints 2013-03-18 12:58:29 +01:00
oy 7eddbe0dc9 play only one weapon no ammo sound per second. #993 2013-02-24 18:02:57 +01:00
Shereef Marzouk b000c9e4e1 Fixed team blocking by disconnect (Closes #206) 2013-02-01 13:08:23 +02:00
aelio_ru b68840b30b Fixes inactive dragger after map change or server start, Fixes #181. 2012-08-26 09:23:11 +02:00
Ravomavain cd5046a1a9 Prevent laser draggers from dragging paused players. Fix XXLTomate#16
Reset velocity on resume to avoid other bugs.
2012-05-01 21:57:09 +02:00
GreYFoX cd4ba53bae Merge branch 'master' of git://github.com/teeworlds/teeworlds into DDRace
Conflicts:
	bam.lua
	scripts/build.py
	scripts/make_release.py
	src/engine/server.h
	src/game/client/gameclient.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/player.cpp
	src/game/version.h
2012-04-12 02:09:31 +02:00
Learath2 d5dcfa3c4f Fixed obligatory Teams (sv_team 2). 2012-04-11 16:16:30 +02:00
Learath2 50b2d85abb Fixed according the comment of GreYFoX. 2012-02-14 22:38:06 +02:00
Learath2 d64e1796aa Simplifys the usage of timer commands. Fixes new year happy spawn. 2012-02-14 20:25:34 +02:00
oy dfe91338f0 added pause command. Closes #15 2012-01-10 00:49:31 +01:00
Ravomavain ebf64758b1 Make spectators see the same thing as the player they spectate 2012-01-01 00:15:16 +02:00
Ravomavain 88be9657d2 Enhance pausing system (by @heinrich5991):
* enhance /pause (@heinrich5991)
 * add /spec command to pause without leaving the game (@heinrich5991)
 * if sv_pauseable is set to 0, /pause behave as /spec (@heinrich5991)
 * should fix #124 and #127 (@ravomavain)
2011-12-31 01:44:36 +02:00
GreYFoX 7d462b565d Fixed the bugs i know of with the last few commits 2011-12-30 16:51:08 +02:00