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

444 commits

Author SHA1 Message Date
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
GreYFoX 799f4de2b3 Added the following settings to Close #123. 
sv_time_in_broadcast, 1, 0, 1, CFGFLAG_SERVER, "Whether to display time in broadcast every interval or not by default, later the choice can be changed by players via chat commands"
sv_time_in_broadcast_interval, 1, 0, 60, CFGFLAG_SERVER, "How often to update the broadcast time"
sv_time_in_gametimer, 0, 0, 1, CFGFLAG_SERVER, "Whether to display time in the round/game timer or not by default, later the choice can be changed by players via chat commands"
Added the following Chat commands to give the player the choice over their settings:
"saytime", "", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSayTime, this, "Privately messages you your current time in this current running race"
"saytimeall", "", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSayTimeAll, this, "Publicly messages everyone your current time in this current running race"
"time", "", CFGFLAG_CHAT|CFGFLAG_SERVER, ConTime, this, "Privately shows you your current time in this current running race in the broadcast message"
"broadcasttime", "?s", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSetBroadcastTime, this, "Personal Setting of showing time in the broadcast, broadcasttime s, where s = on for on, off for off, toggle for toggle and nothing to show current status"
"servergametime", "?s", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSetServerGameTime, this, "Personal Setting of showing time in the round/game timer, servergametime s, where s = on for on off for off, toggle for toggle and nothing to show current status"
Fixed Chat Command "eyeemote" and made it a set + toggle instead of just toggle for better bin techneques
Moved some vars from CCharacter to CPlayer to keep their status evern after death but not after disconnect.
So now players have the choice to see which timer they wanna see if any.

Note: These changes are all untested Stay away from this update on your main server until they are tested, i don't even know if they will compile propperly
 2011-12-29 14:17:34 +02:00
Shereef Marzouk c496bf3c4e Merge branch 'master' of https://github.com/oy/teeworlds into DDRace 
Conflicts:
	bam.lua
	scripts/make_release.py
 2011-12-14 17:01:47 +02:00
oy 99f04a7f87 let the server check if the input aims the center. Closes #889 2011-12-10 18:21:12 +01:00
Ravomavain 7b8575f755 There is a variable for that, use it! :p 2011-09-03 01:08:37 +02:00
Ravomavain 04981004d5 Improve Checkpoint-teleporters: if no matching destination is found for the current checkpoint, check previous ones 2011-09-03 01:08:37 +02:00
GreYFoX 8c103b8c13 * Added a new tile to facilitate solo parts ( works with teams ) 
* Can now put tiles with the same indexes as in tele or switch layer i game layer but it will drawn to the correct image
* Adjusted Masking to account for Solo players
 2011-09-02 20:04:18 +02:00
GreYFoX 5035506825 Fixed team collision and 0.6 trunk, 1.094a 2011-09-01 20:29:08 +02:00
GreYFoX b7e3bbb824 added fix for #82 by BeaR 2011-08-31 23:36:41 +02:00
eeeee cfde5a20ec allow usage of eyeemotes in freeze 2011-08-31 02:36:47 +02:00
GreYFoX 4ca0681689 Added chat commands for only chat and available to all users 
Thanks @heinrich5991 for this idea of a separate console object to handle it
 2011-08-27 17:11:39 +02:00
GreYFoX 5b27758650 Removed level stuff 
Removed client ID stuff
Removed console stuff
Resolved merge conflicts
Upgraded Banmaster
Cleaned up
 2011-08-13 02:11:06 +02:00
GreYFoX 35d16bd58c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 
Conflicts:
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/menus_browser.cpp
	src/game/client/gameclient.cpp
	src/game/editor/editor.cpp
	src/game/editor/editor.h
	src/game/editor/io.cpp
	src/game/editor/layer_tiles.cpp
	src/game/editor/popups.cpp
	src/game/gamecore.cpp
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gamemodes/ctf.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2011-08-13 02:01:40 +02:00
oy 7db6d1e056 fixed problem with player collision. Closes #722 2011-07-30 18:08:24 +02:00
GreYFoX 74462d4611 enumerated laser types, made it possible to choose which weapon to disable using switch layer delay variable 2011-07-25 22:16:20 +02:00
GreYFoX 2964919bf2 Some logic fixes 2011-07-22 14:29:27 +02:00
GreYFoX b0420e66ee used Teams() instead of ((CGameControllerDDRace*)GameServer()->m_pController)->m_Teams 2011-07-22 00:01:12 +02:00
GreYFoX 3d07ffdbdd Added the Missing Single Tee No Hitting Logic 2011-07-21 03:13:59 +02:00
GreYFoX 1dfd2882d2 Added Hit as a tile 
Entities are in the previous commit
 2011-07-19 23:33:12 +02:00
nsinreal 66a8000620 Fixed ninja: always set last active weapon after ninja's end 2011-06-27 16:28:49 +02:00
oy 957b81af07 made it possible to restrict player information in spectator mode 2011-06-19 11:28:39 +02:00
Choupom 558b110504 fixed #633 Correct sound effects in following spectactor mode 2011-06-11 18:33:30 +02:00
oy 2cc10fd6f0 fixed that the player keeps action when activating chat. Closes #719 2011-06-09 22:30:03 +02:00
Romain Labolle c17d3cdeda Reworking teams to allow pausing in team 
* Adding wrappers functions to modify character or pause data if player are in game or paused.
* Moved OnFinish() function to teams.cpp so it can also be called on paused players.
* Pause is now enabled for team players.
* Adding bool CPlayer::IsPlaying() function that return true if the player is either in game or in pause. (false if spectator/dead).
 2011-06-07 16:48:48 +02:00
GreYFoX c3df972fe3 Optimized checkpoint code 2011-06-05 13:56:04 +02:00
GreYFoX c1962bff25 Removed sv_broadcAst 
this commit is funny cause it was made from my iPhone and it only took 8 minutes
 2011-06-03 21:55:57 +02:00
Romain Labolle 38f1db1c4f Adding a checkpoint system for teleporters : 
* Player go through a Checkpoint tile (29 in tele layer)
* He fall in a Check-Teleporter tile (31 in tele layer)
* Player is teleported to the check-TO (30 in tele layer) that have the same number as the last Checkpoint.
Thus players are teleported to the last checkpoint he passed, regardless of whether he made ​​the map in the right direction or not.

Tele tileset may need some improvement.
Closes Pull Request #52
 2011-06-01 17:03:04 +02:00
GreYFoX cc63cf2553 Merge branch 'master' of git://github.com/oy/teeworlds 
Conflicts:
	src/engine/external/pnglite/pnglite.c
	src/engine/external/pnglite/pnglite.h
	src/engine/shared/config_variables.h
	src/game/client/components/menus_browser.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/version.h
 2011-05-09 18:36:13 +02:00
oy 5fbf6d0bfd fixed compiler warnings. Closes #679 2011-05-05 01:43:27 +02:00
GreYFoX 561ce64666 Renamed cheats to testing commands sv_test_cmds 
Since these are testing commands, anyone can use them and only on their selves no login needed
Revised some rcon commands
cleanup some unwanted codes
 2011-04-15 06:04:21 +02:00
GreYFoX 0df6d0541f Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 
Conflicts:
	bam.lua
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config.h
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/game/client/components/binds.cpp
	src/game/client/components/chat.h
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/controls.cpp
	src/game/client/components/emoticon.h
	src/game/client/components/maplayers.cpp
	src/game/client/components/menus.h
	src/game/client/components/scoreboard.h
	src/game/client/components/spectator.h
	src/game/client/components/voting.h
	src/game/client/gameclient.cpp
	src/game/client/gameclient.h
	src/game/client/render.h
	src/game/collision.cpp
	src/game/editor/ed_layer_tiles.cpp
	src/game/gamecore.cpp
	src/game/gamecore.h
	src/game/layers.cpp
	src/game/layers.h
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/entities/laser.h
	src/game/server/entities/pickup.cpp
	src/game/server/entities/pickup.h
	src/game/server/entities/projectile.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gameworld.cpp
	src/game/server/gameworld.h
	src/game/server/player.cpp
	src/game/variables.h
 2011-04-14 01:27:49 +02:00
oy 06115dd49d added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
GreYFoX b2c67df7e7 fixed hammer hit 2011-04-10 15:07:36 +02:00
GreYFoX f7f6058a92 Merged Oy, Cleaned up, removed some useless features and code parts 
Added Icon by landil
alot more...
 2011-04-09 22:32:17 +02:00
oy 722644008f added a respawn delay command for tdm 2011-03-26 22:38:05 +01:00
GreYFoX 16c074741f To have Cheats you must set a password and sv_register 0 
http://ddrace.info/forum/showthread.php?t=528
or modify the server and change the game type to something other than DDRace thank you
 2011-03-16 15:41:26 +02:00
GreYFoX cccfb09e32 Reverted Team to it's old state without leader or Strict until it's reworked 2011-03-16 15:14:25 +02:00
oy 83e83947cf give ninja players the momentum they had before slicing, after slicing. Closes #120 2011-03-13 19:00:00 +01:00
oy ee2f625754 added extended spectator mode. Closes #28 2011-03-10 10:08:14 +01:00
oy 4bede550be only update the ping if the scoreboard is active. Closes #27 2011-03-01 18:31:20 +01:00
Sebastian Wojtowicz c3739e0e4d fixed a bug that prevented records to be saved in files 2011-02-20 19:11:04 +02:00
GreYFoXGTi cd998a2a93 sv_reset_pickups 1 to remove weapons on start tiles 2011-02-16 13:08:14 +02:00
Sebastian Wojtowicz 6963a233a4 Added a new command /last5times (for sql scores only) 
Added index to name in race sql table, so search is faster
 2011-02-15 02:27:20 +02:00
Sebastian Wojtowicz 60de0da1c3 Added timestamp into MySQL ranking, and function to have ago time web2.0 like printed on asking for /rank 2011-02-15 02:27:19 +02:00
GreYFoXGTi 604ae5286f Several Fixes and some more on the way 2011-02-14 23:34:46 +02:00
GreYFoXGTi d68e853ca7 StickyTeams, TeamStrict Logic and fixed some team bugs 2011-02-14 20:44:02 +02:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
GreYFoXGTi c1ebccd8a2 Fixed infinite Loop 
Don't tell Oy to add this, he will just say we don't support mods
 2011-02-09 01:03:42 +02:00
GreYFoXGTi e5bff28375 Fixed a Stopper bug 
1 still remains
 2011-02-07 04:22:13 +02:00
GreYFoXGTi 6c3698469b Fixed some bugs 
fixed a mistake
Official Noobness
 2011-02-06 20:38:24 +02:00
GreYFoXGTi 89889fa1d1 Fixed double jump sound 
how did i miss this!
 2011-02-05 06:33:11 +02:00
GreYFoXGTi f901fc65fa Removed DeepFreeze Messages 
Removed some curl brackets
 2011-02-05 06:18:32 +02:00
GreYFoXGTi 693ad89c00 DeepFreeze = EMOTE_PAIN, freeze stays EMOTE_BLINK (eyes closed) 2011-02-05 04:28:05 +02:00
GreYFoXGTi ff839af9ba Fixed a collision error 2011-02-04 18:49:36 +02:00
GreYFoXGTi 3223a9d4c5 Few Improvements 2011-01-30 20:07:02 +02:00
GreYFoXGTi 5961edf6ce Better Performance, Fixed a mistake and added check for next tiles (Left, Right, Bottom and Above). 2011-01-30 01:58:47 +02:00
GreYFoXGTi 57c8739bb9 Show join a team message without spam 2011-01-29 16:31:50 +02:00
GreYFoXGTi 832bad08e6 Cleanup and Added All Left Masks 2011-01-29 16:18:36 +02:00
GreYFoXGTi b59e130037 DeathMask 2011-01-26 23:03:20 +02:00
GreYFoXGTi 4e32aee417 Commented some dbg_msgs 
may need them in the future
 2011-01-26 22:59:55 +02:00
GreYFoXGTi 3356455007 Fixed double hook sounds 2011-01-26 22:57:23 +02:00
GreYFoXGTi 5b51295185 Added Deep freeze/unfreeze to switch layer so that it can be controlled with switches 
fixed the freeze command

Added Freeze Tile to switch layer to set freeze tile custom delay

Added sv_freeze_delay to control default freeze time delay
 2011-01-25 12:05:53 +02:00
GreYFoXGTi 4e36d2f069 Merge branch 'greyfox' of https://github.com/JulianAssange/DDRaceExtra 2011-01-24 21:25:17 +02:00
GreYFoXGTi f1a8b6b7ad Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/shared/config.h
	src/engine/shared/config_variables.h
	src/game/client/gameclient.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
 2011-01-24 14:06:55 +02:00
DemonulPierdut/-/Julian /[Assange/] 2f45abdc40 fixed the sv_team 1 message.. lol it never told u too join a team :D 2011-01-24 22:36:05 +11:00
DemonulPierdut/-/Julian /[Assange/] 8ff2b1a95f for some reason hooking wasnt masked propley. 2011-01-24 06:23:04 +11:00
DemonulPierdut/-/Julian /[Assange/] 422b6c7c0d added more team mask's.. The sounds were fucking annoying lol 2011-01-24 05:56:20 +11:00
oy 83fc81092f fixed position of the hammer damage effect. Closes #448 2011-01-23 17:58:28 +01:00
GreYFoXGTi e0bb8731a7 minor changes 2011-01-21 19:59:52 +02:00
GreYFoXGTi 1276bebfe1 Fixed Speedup Tiles ( made them skip-able ) 2011-01-21 11:53:58 +02:00
GreYFoXGTi a1fc979867 fixed grammar mistake, thanks fisted 2011-01-20 22:30:22 +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 1701241636 added hammerhit simplification by fisted. Closes #443 2011-01-19 22:41:44 +01:00
oy 19a9462fe8 removed double entity list in gameworld and cleaned up connected stuff 2011-01-19 18:27:50 +01:00
Floff Floffsson 645f31141d deepfreeze tiles 2011-01-17 00:38:24 +02:00
GreYFoXGTi 9c66a2d54c Endless Hook Tile for ingameplay by Floff aka LemonFace 2011-01-17 00:13:21 +02:00
GreYFoXGTi 2ec0e0eec4 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/shared/console.cpp
	src/game/client/components/hud.cpp
	src/game/client/components/scoreboard.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
 2011-01-12 11:08:17 +02:00
Patafix a9f7f3a3ea just formatting 2011-01-09 23:29:56 +01:00
oy df47aedbfe reset flags and projectiles when leaving the game layer too much. Closes #385 2011-01-08 11:34:19 +01:00
fisted 2a4bb8e631 fixed /emote reset 2011-01-07 23:26:28 +01:00
GreYFoXGTi babe838cab Added /ShowOthers 2011-01-06 07:08:12 +02: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 08a2f47ee8 Added Ability to Restart the race in a team after you have finished <br/> 
<b>Testers: Please check if this can be abused</b>
 2010-12-19 05:48:16 +02:00
GreYFoXGTi e803f30f52 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/server/entities/character.cpp
	src/game/server/entities/flag.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2010-12-16 06:06:23 +02:00
oy 0121f27311 fixed server crash on too many snap items. Closes #317 2010-12-16 03:29:08 +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 fb5a264e9e Allowing speedup tile skipping 2010-12-02 23:05:10 +02:00
GreYFoXGTi c149b17617 FinishTime Difference 2010-11-30 05:04:21 +02:00
GreYFoXGTi af44a79b03 New Broadcast/Timer System 2010-11-30 04:24:15 +02:00
GreYFoXGTi 7f24d0f144 Fixed ID 0 Bug 2010-11-26 20:01:55 +02:00
GreYFoXGTi 4737588827 New Delayed Switches 2010-11-22 23:10:12 +02:00
GreYFoXGTi b8fe169419 Added Mac Fixes by Allisone (Trust) 2010-11-22 11:09:27 +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
Sworddragon fc9211c777 Updated copyrights 2010-11-20 21:26:06 +01:00
GreYFoXGTi bf4ed7515c Forgot to parse the tiles from the Switch layer ^^ 2010-11-14 16:00:33 +02:00
GreYFoXGTi bb0d4a5671 Some Fixes 2010-11-14 13:14:18 +02:00
GreYFoXGTi 79226352af revert teleport useless change 2010-11-14 11:04:13 +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 7fcd245611 Fixes 2010-11-13 00:50:51 +03:00
GreYFoXGTi 50b16e7821 added high sensitivity for Begin and End tiles 2010-11-09 02:51:49 +02:00
GreYFoXGTi 27864ec70d Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-09 00:24:42 +02: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
heinrich5991 dcb0b0ee1d fixed "you were worse" message after finishing the first time, prevented that you get this message if your time is equal to your record 2010-11-06 09:38:39 +01:00
GreYFoXGTi 6735dce1af Applied Patch by Mo(2) Hammer-fly out of the freeze 2010-11-05 01:52:37 +02:00
GreYFoXGTi 9feef5638e Merge branch 'master' of http://github.com/btd/DDRace 2010-11-04 21:18:55 +02:00
btd 4e5ffed2b5 Cheaters have no timer now 2010-11-04 22:06:47 +03:00
GreYFoXGTi 970822f0f0 bad time, better luck next time 2010-11-04 20:20:45 +02:00
GreYFoXGTi 8ac101d60e revised all usages of sv_hide_score in the code 2010-11-04 19:32:54 +02:00