Commit graph

2771 commits

Author SHA1 Message Date
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
oy f3c411f730 added directory enhancement for update_localization.py by Sworddragon 2010-12-11 20:29:24 +01:00
GreYFoXGTi 964dffd197 Merge branch 'master' of http://github.com/oy/teeworlds 2010-12-11 21:29:11 +02:00
GreYFoXGTi 46c2225d60 Merge branch 'master' of http://github.com/oy/teeworlds into DDRace
Conflicts:
	data/languages/dutch.txt
	data/languages/french.txt
	data/languages/russian.txt
	scripts/make_release.py
	src/engine/shared/config_variables.h
2010-12-11 21:28:43 +02:00
GreYFoXGTi 6620da58d3 used name variable to strings that include teeworlds statically 2010-12-11 19:29:44 +01:00
GreYFoXGTi ec1a546ebd fixed make_release.py looking for default.bam instead of bam.lua and configure.lua 2010-12-11 19:27:15 +01:00
oy a0985314c9 made it possible to "recycle" auto recorded demos 2010-12-11 18:55:28 +01:00
GreYFoXGTi 4510ced422 Merge branch 'DDRace' of github.com:GreYFoXGTi/teeworlds into DDRace 2010-12-10 21:20:34 +02:00
GreYFoXGTi 2c51511260 Merge branch 'master' of http://github.com/oy/teeworlds into DDRace
Conflicts:
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/game/client/gameclient.cpp
2010-12-10 20:58:53 +02:00
GreYFoXGTi 3c1a32ed90 Merge branch 'master' of http://github.com/oy/teeworlds 2010-12-10 19:47:09 +02:00
oy 4756c031c5 save auto recorded demos in a separate folder and added an option to enable/disable it in the settings menu 2010-12-08 01:55:13 +01:00
oy 0fe8cabe78 added auto recording support by Batchyx 2010-12-08 01:42:32 +01:00
oy 974a40913d added CDemoRecorder::TickCount() to get demo length by Batchyx 2010-12-08 00:48:02 +01:00
oy db9dd6b8c9 added an optional time stamp to a demo record by Batchyx 2010-12-08 00:42:32 +01:00
oy 665934ee09 cleaned up several uses of timestamps for filenames 2010-12-08 00:32:50 +01:00
oy 9ef5e64916 added function to add a time stamp string 2010-12-08 00:26:55 +01:00
oy 7c26dcbadd moved function to remove files 2010-12-08 00:13:59 +01:00
oy d30dd9da8f added Storage function to move/rename files by Batchyx 2010-12-08 00:09:18 +01:00
oy bd9850cae2 added single function to stop recording by Batchyx 2010-12-08 00:02:24 +01:00