Commit graph

2889 commits

Author SHA1 Message Date
GreYFoXGTi ccbd057255 Revert merge branch 14.11 converter merged by noother 2010-12-19 04:02:59 +02:00
GreYFoXGTi fc323326ec fixed mute evasion 2010-12-17 13:05:55 +02:00
GreYFoXGTi 0bbdabae97 Merge branch 'master' of https://github.com/noother/DDRace 2010-12-17 01:20:41 +02:00
GreYFoXGTi a4fa4d2fee Credits update. 2010-12-17 01:20:26 +02:00
floff 4008a1dc95 spectator votes configurable 2010-12-16 10:06:24 +01:00
floff 4a93c28eb8 added configurable time between pauses, to reduce spam 2010-12-16 10:05:20 +01:00
GreYFoXGTi 5b56598056 Edited build.py for DDRace 2010-12-16 06:36:18 +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 a3797482da removed 360 degree rotation in the editor. Closes #352 2010-12-16 04:27:00 +01:00
oy 8aeb3e7ada enable "Always show nameplats disregarding of distance" on default. Closes #343 2010-12-16 04:22:14 +01:00
oy ec09fbf23b let the chat lines disappear gradually. Closes #342 2010-12-16 04:20:50 +01:00
oy 0121f27311 fixed server crash on too many snap items. Closes #317 2010-12-16 03:29:08 +01:00
oy 54f138f894 made broadcast text a bit smaller and cut it off if it's bigger than the screen. Closes #313 2010-12-16 03:17:16 +01:00
GreYFoXGTi 3956c34b6d Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/dutch.txt
	data/languages/french.txt
	data/languages/russian.txt
2010-12-16 04:15:05 +02:00
oy c6848cd229 fixed build.py on windows 2010-12-16 03:14:31 +01:00
GreYFoXGTi 73dbc159bc Merge branch 'master' of github.com:GreYFoXGTi/DDRace 2010-12-16 04:11:02 +02:00
Sworddragon 9852ec658c Updated build.py 2010-12-16 03:08:45 +01:00
oy 6063b4c14d added auto completion of nicknames and highlighted nicknames in chat. Closes #218 2010-12-16 02:31:12 +01:00
oy 1d7df01e9a added map download progress by kaddyd 2010-12-16 01:52:29 +01:00
GreYFoXGTi 2f5f332cbb Merge branch 'master' into DDRace
Conflicts:
	src/engine/client/client.cpp
	src/engine/shared/config_variables.h
2010-12-13 03:43:22 +02:00
GreYFoXGTi cf33700597 Merge branch 'master' of http://github.com/oy/teeworlds 2010-12-13 03:41:36 +02:00
oy c0530b0d09 added language popup on first start. Closes #336 2010-12-12 19:20:30 +01:00
oy c75a75b64f made it possible to automatically take game over screenshots. Closes #339 2010-12-12 16:48:13 +01:00
GreYFoXGTi bed657d805 Merge branch 'master' into DDRace 2010-12-12 04:32:40 +02:00
GreYFoXGTi c3b43ee5ba Merge branch 'master' of http://github.com/oy/teeworlds 2010-12-12 04:32:32 +02:00
GreYFoXGTi 88b1fba6b5 Converted Command kill another player of the server from kill to kill_pl to fix call confusion thanks to josh aka flaminflash aka DemonulPerduit with ping 400 2010-12-12 04:26:40 +02:00
GreYFoXGTi ade61b33b1 removed useless dbg_msg 2010-12-12 04:06:01 +02:00
GreYFoXGTi 22192c1047 Applied Oy's Changes to bam.lua on the parts i modified in DDRace 2010-12-12 03:42:50 +02:00
GreYFoXGTi 0c9b1937ff Merge branch 'master' into DDRace
Conflicts:
	bam.lua
2010-12-12 03:39:13 +02:00
GreYFoXGTi 6290738025 Merge branch 'master' of http://github.com/oy/teeworlds 2010-12-12 03:34:29 +02:00
oy b4c007778c fixed that IntersectCharacter picks the character which is closest to the start point and within the radius 2010-12-12 01:55:36 +01:00
oy 369e22cd4e fixed mac building 2010-12-12 01:08:58 +01:00
GreYFoXGTi c97105a113 fixed missing tile from Fisico 2010-12-12 01:16:39 +02:00
GreYFoXGTi a25bbce836 New Entities by Fisico, I split them and reworked into separate files 2010-12-12 01:05:11 +02:00
GreYFoXGTi c08ed41a7e Merge branch 'master' into DDRace 2010-12-12 00:43:56 +02:00
GreYFoXGTi d3ea4dfb57 Merge branch 'master' of http://github.com/oy/teeworlds 2010-12-12 00:43:43 +02:00
oy 49bea07df7 show the path of $CURRENTDIR. Closes #323 2010-12-11 23:10:13 +01:00
GreYFoXGTi 157aafd4dd Merge branch 'master' into DDRace
Conflicts:
	src/engine/server/server.cpp
	src/game/variables.h
2010-12-11 23:57:41 +02:00
GreYFoXGTi 1247319a5e Merge branch 'master' of http://github.com/oy/teeworlds 2010-12-11 23:54:55 +02:00
oy 48cd937234 fixed wrong $DATADIR path. Closes #316 2010-12-11 22:48:37 +01:00
oy 3d54cf0585 nameplates on by default. Closes #322 2010-12-11 22:41:58 +01:00
oy ecd7afd9ff added cleaner exit on quit event by Choupom 2010-12-11 22:04:50 +01:00
Choupom eb569e60bd fixed clipping on old maps (fixes #325) 2010-12-11 21:57:43 +01:00
Choupom cdd8184f89 fixed "Kicked by console (Kicked by vote)" drop message 2010-12-11 21:57:34 +01:00
oy 32806bf057 added Ukrainian translation by .ua and Ivan. Closes #338 2010-12-11 21:53:46 +01:00
GreYFoXGTi 6b981e1b47 Merge branch 'master' into DDRace 2010-12-11 21:40:17 +02:00
GreYFoXGTi 7da87eecda Merge branch 'master' of http://github.com/oy/teeworlds 2010-12-11 21:39:42 +02:00
SushiTee 5c7d523fe4 droping mac 10.4 compatibility and fixed compatibility to 10.5 when compiling in 10.6 (fixed #274) 2010-12-11 20:37:35 +01:00
GreYFoXGTi 91bba50056 Merge branch 'master' of http://github.com/oy/teeworlds 2010-12-11 21:36:00 +02:00
GreYFoXGTi 38dfcff6b5 Merge branch 'master' of http://github.com/oy/teeworlds into DDRace 2010-12-11 21:35:44 +02:00