Commit graph

35 commits

Author SHA1 Message Date
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
oy d12db45c48 added editor function to construct different game tiles from a layer. Closes #460 2011-02-12 19:10:45 +01:00
GreYFoXGTi 984d10970e Localization and Cooler Browser Filter 2011-01-31 00:30:53 +02:00
GreYFoXGTi f1a8b6b7ad Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/shared/config.h
	src/engine/shared/config_variables.h
	src/game/client/gameclient.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
2011-01-24 14:06:55 +02:00
oy 12e29d7efd fixed Italian language file 2011-01-23 17:54:12 +01:00
Carmine c7ddd5f8ed update italian translation 2011-01-23 17:54:06 +01:00
GreYFoXGTi 2151883b43 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/gamecore.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/entities/pickup.cpp
	src/game/server/entities/projectile.cpp
	src/game/server/entity.h
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/variables.h
2011-01-20 16:10:32 +02:00
oy bf6fcc20f4 added an error popup on startup when the sound couldn't be initialised. Closes #425 2011-01-17 13:28:15 +01:00
GreYFoXGTi 2ec0e0eec4 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/shared/console.cpp
	src/game/client/components/hud.cpp
	src/game/client/components/scoreboard.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
2011-01-12 11:08:17 +02:00
oy 308dd0304d added Romanian translation by kneekoo 2011-01-11 01:09:46 +01:00
GreYFoXGTi ddc5dd7ab3 Cleaned up & Re-arranged stuff 2011-01-06 05:46:10 +02:00
GreYFoXGTi 1d9190fd5b Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/russian.txt
	readme.txt
	src/game/variables.h
2011-01-06 01:49:58 +02:00
oy 18461535fd changed time left localisation in the map download popup to allow better translations 2011-01-05 17:28:53 +01:00
oy 023763e1a4 updated localisations based on last commit 2011-01-05 12:08:38 +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 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
oy c75a75b64f made it possible to automatically take game over screenshots. Closes #339 2010-12-12 16:48:13 +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
oy a0985314c9 made it possible to "recycle" auto recorded demos 2010-12-11 18:55:28 +01:00
GreYFoXGTi 5d9ee1736e made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/dutch.txt
	data/languages/french.txt
	data/languages/german.txt
	data/languages/russian.txt
	src/game/server/entities/flag.cpp
	src/game/server/entities/flag.h
	src/game/server/gamecontext.cpp
	src/game/server/gamemodes/ctf.cpp
	src/game/server/gamemodes/ctf.h
	src/game/server/gamemodes/dm.cpp
	src/game/server/gamemodes/dm.h
	src/game/server/gamemodes/mod.cpp
	src/game/server/gamemodes/tdm.cpp
	src/game/server/gamemodes/tdm.h
2010-11-22 00:26:00 +02:00
oy 97a7dea152 added localisation updates by Sworddragon 2010-11-21 14:25:00 +01:00
oy ba05ddd0f5 removed duplicate entry from the localisation files 2010-11-21 14:12:39 +01:00
oy f62a1c3818 updated language files 2010-11-21 00:49:10 +01:00
GreYFoXGTi 11f480a79b Changed the Loading String to Loading DDRace Client
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-28 19:59:24 +02:00
Fujnky 7ca5e0fbb1 Fixed localizations, most german translation strings fit in buttons now. 2010-06-07 16:17:40 +02:00
Fujnky bf68f803e3 Internationalized editor and updated german localization 2010-06-05 23:36:52 +02:00
Fujnky 5a641132e7 Fixed localization for 'Error loading demo'-Popup 2010-06-03 17:07:15 +02:00
Fujnky d581e413c8 More localization fixes 2010-06-03 11:30:05 +02:00
Fujnky 0d4c0ccef5 Some localization fixes 2010-06-02 21:03:15 +02:00
Tom Adams 6fca512a95 added fix for italian language by Lanta and fixed a bug with the id in votekick menu 2010-05-31 20:05:45 +00:00
Tom Adams 262b566c94 increased the fontsize of the chat messages 2010-05-30 17:08:54 +00:00
Tom Adams 08df0fe63d added fix for italian translation by Lanta 2010-05-30 14:26:04 +00:00
Tom Adams baa57830ad fixed bubble sort loop (#802), 2 entries in the language files and a possible overrun 2010-05-29 23:57:30 +00:00
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00