Commit graph

102 commits

Author SHA1 Message Date
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 41236a3413 Merge branch 'master' of http://github.com/oy/teeworlds 2010-12-22 13:42:36 +02:00
oy 26546585f7 fixed path for make_release in build.py 2010-12-22 12:34:48 +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 c6848cd229 fixed build.py on windows 2010-12-16 03:14:31 +01:00
Sworddragon 9852ec658c Updated build.py 2010-12-16 03:08:45 +01: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 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
GreYFoXGTi a9ce77c9da Fixed make_release.py 2010-12-05 19:28:55 +02:00
oy 5fcb63d325 fixed last commit 2010-11-21 00:48:47 +01:00
Choupom 7ad1d60805 updated update_localization.py by Sworddragon 2010-11-21 00:28:13 +01:00
Sworddragon d7b623f532 Updated copyright.py 2010-11-20 21:23:28 +01:00
oy 3a98f7a048 added mod system. Closes #34 2010-10-06 23:07:35 +02:00
oy d9a3cc032f updated refactor script and fixed a thing 2010-08-12 19:03:03 +02:00
Magnus Auvinen fe5a7105c4 fixed the automatic versioning 2010-05-29 15:20:18 +00:00
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00
Magnus Auvinen b3c1bae2e9 cleaned up localization. fixed motd so it shows when connecting to a server 2009-06-15 09:46:25 +00:00
Magnus Auvinen ab171f8f30 updated localization 2009-06-15 07:34:25 +00:00
Magnus Auvinen bc20e9c433 localization update 2009-06-13 17:18:06 +00:00
Magnus Auvinen 6d9ccee95d base for the localization system 2009-06-13 16:54:04 +00:00
Magnus Auvinen d754cd9d19 updated cmd5.py 2009-06-07 14:40:58 +00:00
Magnus Auvinen 24899a13e8 improved the prediction timer to handle crappy connections better 2009-01-21 00:05:07 +00:00
Joel de Vahl 1d6668583a initial server launcher for osx 2009-01-12 20:04:14 +00:00
Johan Althoff 7179e467a6 added SDL.dll to the make_release.py 2009-01-11 12:59:54 +00:00
Alfred Eriksson 67f4910e86 reverted unnecessary changes 2009-01-11 12:53:06 +00:00
Alfred Eriksson 7bdead04e7 adds SDL.dll to the release 2009-01-11 12:49:14 +00:00
Alfred Eriksson ab7ecbcf3f fixed path 2009-01-11 12:42:00 +00:00
Magnus Auvinen 144b9fbb6b updated build scripts 2009-01-11 12:35:37 +00:00
Joel de Vahl 2a7402dd6c use dmg for osx deliver, build universal binary, fix backspace being entered as a character 2009-01-11 12:10:30 +00:00
Magnus Auvinen b281831d5d fixed more reliable tw_api.py script 2009-01-10 10:25:27 +00:00
Magnus Auvinen 42553448f7 fixed so it handles multiple packets from the masters 2008-11-16 14:01:40 +00:00
Magnus Auvinen 8acf5ed788 upgraded the master server code so it can handle more servers 2008-11-15 13:29:56 +00:00
Magnus Auvinen bd5b2b9f85 removed glfw and portaudio. SDL is now a requirement 2008-10-23 16:18:33 +00:00
Joel de Vahl 21445b67bb use system installed sdl on osx 2008-10-21 16:16:16 +00:00
Joel de Vahl 8edfa80028 Use SDL on OSX 2008-10-21 15:59:32 +00:00
Magnus Auvinen 8404143afe added SDL support 2008-10-20 17:47:42 +00:00
Magnus Auvinen 4484948a6d updated the demo recorder 2008-10-14 12:11:42 +00:00
Joel de Vahl b74c2b7931 Initial launcher (again) 2008-10-08 16:33:08 +00:00
Magnus Auvinen 6d44adb711 fixed keybindings. reworked the voting a bit. added vote spamming protection. added ingame voting hud. 2008-09-25 14:04:02 +00:00
Magnus Auvinen a13b94f9e0 minor update 2008-07-08 09:07:21 +00:00
Magnus Auvinen f6c67c29cd large commit with loads of clean up. more is comming 2008-06-12 10:51:48 +00:00
Magnus Auvinen ac18c6a3bd more stuff :) 2008-04-27 05:59:38 +00:00
Magnus Auvinen a7cb36877c commited the small thing that I had before I reinstall my machine 2008-04-27 05:56:56 +00:00
Magnus Auvinen 171d6b1c20 added the tw_api.py 2008-03-24 22:59:11 +00:00
Magnus Auvinen 3fbdaaa11e updated build.py 2008-03-22 19:33:45 +00:00