Commit graph

4190 commits

Author SHA1 Message Date
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
oy 39b531452a fixed colour of the particles when a tee dies. Closes #331 2010-12-07 23:54:25 +01:00
oy 3ea00f61cf removed needless include 2010-12-07 23:51:04 +01:00
oy 7414271309 check the return values of RemoveFile and CreateFolder 2010-12-07 23:47:41 +01:00
GreYFoXGTi 24ea2663a1 Fixed Compiler warnings 2010-12-07 20:33:56 +02:00
GreYFoXGTi 9bed6aca8c Fixed Compiler warnings 2010-12-07 20:27:04 +02:00
GreYFoXGTi cebbecf632 Some Code Improvements and Compiler warnings 2010-12-07 19:44:23 +02:00
GreYFoXGTi aa30c29b35 Fixed Some Editor Mistakes 2010-12-07 17:51:59 +02:00
GreYFoXGTi 122c7954d9 Announcement Randomness 2010-12-06 04:27:35 +02:00
GreYFoXGTi 45fa3d49b5 Revert "Client won't vote on comments by Sushi Tee" caused crashes
This reverts commit ed7a1d5bcd.
2010-12-06 03:32:44 +02:00
GreYFoXGTi 881fd901a6 added Vote comments starting with # and also made announcement comments start with # 2010-12-06 00:38:29 +02:00
GreYFoXGTi ed7a1d5bcd Client won't vote on comments by Sushi Tee 2010-12-06 00:28:35 +02:00
GreYFoXGTi 2d581789e1 Merge branch 'master' of github.com:Speedy-Consoles/DDRace into DDRace
Conflicts:
	src/game/ddracecommands.h
2010-12-06 00:28:15 +02:00
Speedy Consoles 645e9f0a5a reworked ddrace commands 2010-12-05 20:17:16 +01:00
GreYFoXGTi f9c3f83903 Removed command broadtime since the time is not in the broadcast anymore 2010-12-05 20:29:38 +02:00
GreYFoXGTi 5e1e572882 used name variable to strings that include teeworlds statically 2010-12-05 20:22:18 +02:00
GreYFoXGTi 9a0c919242 fixed make_release.py looking for default.bam instead of bam.lua and configure.lua 2010-12-05 19:43:01 +02:00
GreYFoXGTi a9ce77c9da Fixed make_release.py 2010-12-05 19:28:55 +02:00
noother e990c94dad fixed sql injection & added a proper escaper that works like
addslashes() in php
2010-12-05 08:18:54 +02:00
GreYFoXGTi dd849d3915 Merge branch 'master' of http://github.com/heinrich5991/DDRace into DDRace 2010-12-04 23:54:06 +02:00
GreYFoXGTi bb23e58285 by reading this you have wasted 2 seconds you are not getting back
if you looked inside this commit then you have wasted 6 seconds that you are never getting back as well :p
2010-12-04 23:51:03 +02:00
heinrich5991 311d92cf47 removed response message after typing "kill" in chat 2010-12-04 20:52:23 +01:00
GreYFoXGTi 0a0e1df557 i think i fixed the crash 2010-12-04 18:51:14 +02:00
GreYFoXGTi 72c86a112b Cleaned it up a bit 2010-12-04 18:35:41 +02:00
GreYFoXGTi cb77b7cee2 Reworked bam.lua 2010-12-04 17:04:41 +02:00
GreYFoXGTi a838ad9da6 server_release on windows has no sql by default because my sql on the server_release version of windows doesn't work, but it does on server_debug 2010-12-04 16:31:54 +02:00
Speedy Consoles b790b5f1bc Merge branch 'master' of http://github.com/GreYFoXGTi/DDRace 2010-12-04 13:54:36 +01:00
GreYFoXGTi 987881c02a Further More Editor Improvements 2010-12-04 14:05:14 +02:00
GreYFoXGTi a0a16e0f48 Few Editor Improvements 2010-12-04 13:54:53 +02:00
GreYFoXGTi 69ce24b92c forgot this 2010-12-04 03:13:24 +02:00
GreYFoXGTi 9803a74664 so now windows mysql is fucked up and i don't know why 2010-12-04 03:12:30 +02:00
GreYFoXGTi e61d7d1786 Windows mysql connector has a bug even in the latest version with boost no strings over 15 chars 2010-12-04 02:02:50 +02:00