Commit graph

3820 commits

Author SHA1 Message Date
GreYFoX 2ab15cc752 fixed 1 line merge mistake. fixes #45 2011-05-09 18:45:35 +02:00
GreYFoX ee97bfcad3 fixed last merge 2011-05-09 18:40:14 +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
Romain Labolle b626027af2 Fix banmaster for DDRace. closes #44 2011-05-09 18:23:01 +02:00
eeeee a58996b6bf return from afk handling code immediately if player got kicked, as player struct is zeroed out
closes #47
2011-05-09 18:22:05 +02:00
oy e4c85b00db fixed that some demos show a negative length in the demo browser. Closes #660 2011-05-09 17:55:12 +02:00
oy cd2114c758 fixed problem with the file dialog in the editor 2011-05-09 17:37:04 +02:00
Sworddragon baa2e650a5 Set the root directory of teeworlds as the main directory for scripts 2011-05-09 17:29:40 +02:00
Sworddragon 1850851a47 Fixed directory changing 2011-05-09 17:29:37 +02:00
Isadora Queiroz 019eb146a7 update of portuguese translation 2011-05-09 17:26:02 +02:00
oy 8d5badc260 skip player input if the chat is active to prevent abusing the linked emoticon. Closes #678 2011-05-05 02:13:32 +02:00
oy 15e1d4f1d6 distinguish [chat] and [teamchat] in console messages. Closes #643 2011-05-05 02:08:39 +02:00
oy 8ad6f3d7fc show flags in spectator menu. Closes #636 2011-05-05 02:00:43 +02:00
oy 5b2f5f0778 fixed problem with connecting on double click in the server browser. Closes #662 2011-05-05 01:56:31 +02:00
oy 193fb192c5 added maximum zoom level in the editor. Closes #664 2011-05-05 01:53:12 +02:00
oy ca6e129da6 fixed size of characters in editor's tileselection screen on zoom. Closes #665 2011-05-05 01:50:23 +02:00
oy 5fbf6d0bfd fixed compiler warnings. Closes #679 2011-05-05 01:43:27 +02:00
oy 41ebc9bc9d fixed cursor marker position in console 2011-05-03 23:30:50 +02:00
oy ed7af20dab added German translation update by andi103 2011-05-03 23:25:20 +02:00
Choupom f8d21b48af fixed a l10n bug for some languages 2011-05-03 23:10:20 +02:00
Choupom 7f15b3ac57 fixed several stuffs 2011-05-03 19:25:11 +02:00
Choupom c2f75b0017 structs are structs, classes are classes 2011-05-03 19:23:33 +02:00
Choupom 4dfcfc6913 fixed a variable name 2011-05-03 18:46:18 +02:00
Choupom 0c6f187e3b renamed editor files 2011-05-03 18:45:42 +02:00
Choupom 694be7dfb5 fixed the pnglite fix 2011-05-03 18:44:55 +02:00
Choupom f1df704d78 fixed pnglite requiring a std header include 2011-05-03 18:44:46 +02:00
Choupom bbd7a75849 fixed a pnglite crash on save if the image is too small 2011-05-03 18:43:26 +02:00
Choupom 8e773a55ad show tee pos and vel in tiles in debug hud 2011-05-03 18:13:12 +02:00
Choupom 7b87cfa68a made envelopes synchronized with other clients 2011-05-03 18:12:32 +02:00
oy e85c4cb5db updated language files 2011-05-02 19:31:20 +02:00
heinrich5991 9fb36fd802 added strict game type filter 2011-05-02 19:25:38 +02:00
oy 80173447ff Merge pull request #683 from heinrich5991/feature_detachthread.
adding thread_detach to system.h and system.c
2011-05-02 10:18:30 -07:00
oy 96f94a3155 added German translation update by andi103 2011-05-02 19:12:27 +02:00
oy a4e5228725 added Russian translation update by BotanEgg 2011-05-02 19:07:35 +02:00
oy 26d014ad4f cleaned up last commit 2011-05-02 18:31:44 +02:00
Learath2 d2cbcbfcf4 Added turkish translation 2011-05-02 18:29:22 +02:00
oy dd05015321 added "minor fix and update of portuguese translation" by Slinack 2011-05-02 18:24:12 +02:00
oy 1bdc68318a added "Italian translation review" by Otacon 2011-05-02 18:21:08 +02:00
oy 25c2af4fa4 added "updated dutch language file" by Vijfhoek 2011-05-02 18:09:31 +02:00
oy d5e065b6c7 added tileset bugfixes by Crises 2011-05-02 18:00:02 +02:00
oy 6e9a799089 Merge branch 'master' of github.com:oy/teeworlds 2011-05-02 17:48:53 +02:00
heinrich5991 0ea5641df4 adding thread_detach to system.h and system.c 2011-05-01 15:48:09 +02:00
minus7 b60dc13fbb Merged pull request #670 from heinrich5991/fix_netaddrstrmissingport.
made net_addr_str give a string without port if it is = 0
2011-04-28 14:54:25 -07:00
GreYFoX 2e2ca96d89 fixed ipban size in banmaster.cpp 2011-04-26 19:22:07 +02:00
GreYFoX 0d61c87fa1 Added 0.6.0 banmaster by @heinrich5991 #31 2011-04-26 11:51:02 +02:00
GreYFoX aba78d9e2e Fixed and refactored 2nd afk warning thanks to @ravomavain for noticing it 2011-04-23 19:59:25 +02:00
heinrich5991 e50e103529 made net_addr_str give a string without port if it is = 0 2011-04-22 19:52:27 +02:00
GreYFoX 96cec72681 Version 1.075a 2011-04-20 22:42:13 +02:00
GreYFoX fae976c98b Sending Scores in negative to clients. closes #36 2011-04-20 22:40:56 +02:00
GreYFoX 8b5135c359 Removed Text from evil teleporter
people should check the documentation to know what it does
p.s. @Speedy-Consoles please update the Documentation to say it also cuts the hook of the hookers
2011-04-20 21:37:53 +02:00