Commit graph

20744 commits

Author SHA1 Message Date
oy 456fc7e9b6 cleaned up last commit 2010-11-21 17:42:58 +01:00
Sijmen Schoon c2405d03b6 Improved Dutch translation 2010-11-21 17:39:54 +01: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
Choupom faee45d928 updated french localization 2010-11-21 14:07:30 +01:00
oy e4f1e18c4e fixed entry names in the demo browser and the editor's file dialog. Closes #301 2010-11-21 12:33:13 +01:00
oy e7e2501d1b close map-download-file if the map changes during downloading 2010-11-21 01:10:25 +01:00
oy f62a1c3818 updated language files 2010-11-21 00:49:10 +01: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
oy e447de38ba use original string as localisation if there's no replacement 2010-11-21 00:27:38 +01:00
oy f75ad090e9 fixed a localisation string 2010-11-20 23:46:49 +01:00
oy 7a6006087c removed duplicate note in password popup 2010-11-20 23:39:17 +01:00
Choupom c64d3817cf fixed so we can't add a vote option multiple times by oy 2010-11-20 21:41:18 +01:00
Choupom 0aa0a56990 fixed so ui_scale is affected on server's name (fixes #43) 2010-11-20 21:37:35 +01:00
Choupom 38c2a1b45c fixed so every demo infos are not loaded when making the demos list 2010-11-20 21:34:13 +01:00
Sworddragon fc9211c777 Updated copyrights 2010-11-20 21:26:06 +01:00
Sworddragon d7b623f532 Updated copyright.py 2010-11-20 21:23:28 +01:00
GreYFoXGTi a764ebc1a8 Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-20 11:00:41 +02:00
oy 32e52d51ce added a missing localisation 2010-11-19 20:20:51 +01:00
Łukasz D 101f1da207 Added Polish translation 2010-11-19 20:04:58 +01:00
GreYFoXGTi d414579247 Added ### after *** to indicate a /me message, and avoid messages that look like the server sent it 2010-11-19 18:57:53 +02:00
GreYFoXGTi 4aca32ed6f Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/russian.txt
2010-11-19 12:05:30 +02:00
oy 114649446e added Russian translation by kaddyd. Closes #280 2010-11-18 20:30:30 +01:00
GreYFoXGTi c5254a91e4 fixed a bam.lua merge mistake 2010-11-18 01:42:40 +02:00
GreYFoXGTi 06415ee6e6 Fixed a merge mistake 2010-11-18 01:35:29 +02:00
GreYFoXGTi 6a40aea054 Revert "added hackish challenge-response-alike compatible with 0.5.2 clients. against the slot blocking exploit."
This reverts commit 9f8cf21c33.

Conflicts:

	src/engine/shared/config_variables.h
this commit was replaced by "clients are now dropped if they don't act as normal clients (4383e10 4383e10933)"
2010-11-18 01:32:54 +02:00
GreYFoXGTi ac341b5390 fixed mac compilation 2010-11-18 01:19:44 +02:00
GreYFoXGTi a109e1150d Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/shared/config_variables.h
	src/game/client/components/console.cpp
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.h
	src/game/server/gamecontext.cpp
2010-11-18 01:10:59 +02:00
oy d94355729d added icons in the demo browser and the editor's file dialog. Closes #209 2010-11-17 19:46:50 +01:00
Choupom 4383e10933 clients are now dropped if they don't act as normal clients (fixes #235) 2010-11-17 19:11:28 +01:00
oy c45dc374ff decreased the default value for maximum players with same IP a bit 2010-11-17 19:05:19 +01:00
oy 3d3572f845 fixed some compiler warnings 2010-11-17 18:36:19 +01:00
oy d32b93d3ec added file icons by Landil 2010-11-17 18:28:28 +01:00
oy ca80d2a347 reload the map on save just when the map name is equal 2010-11-17 13:08:29 +01:00
oy 8351682edf added constants for console types by Choupom 2010-11-17 13:01:46 +01:00
oy 994a44f6e1 simplified change_map command so that it switches to the next map in the maprotation when called without param 2010-11-17 12:50:01 +01:00
oy f1ce0d1949 improved loading progression in the server browser 2010-11-17 12:43:24 +01:00
Choupom a7f37446b6 added loading progression in server browser 2010-11-17 12:31:44 +01:00
Choupom 57a9235997 reload the map on save if you are authed 2010-11-17 12:30:42 +01:00
GreYFoXGTi 1721955b11 fixed a previous merge 2010-11-17 13:20:48 +02:00
GreYFoXGTi ae591407c9 Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-17 13:11:40 +02:00
oy fd3d01ef14 removed no longer needed data-dir override param - mods system should be used instead. Closes #267 2010-11-17 01:02:29 +01:00
oy 0d1178107e fixed typo in a kick message 2010-11-17 00:44:04 +01:00
oy 9ff7500f30 fixed graphic problems with ninja when pausing a demo. Closes #269 2010-11-17 00:38:20 +01:00
GreYFoXGTi b6a4b2b7ba Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-16 22:11:24 +02:00
oy e46cb02089 Made inactivity check ignore authed players. Closes #273 2010-11-16 18:08:19 +01:00
oy 295830fcaa removed unneeded include 2010-11-16 17:53:09 +01:00
Sworddragon 30fd715fc2 Cleaned up bam.lua a bit 2010-11-16 17:49:03 +01:00
Sworddragon 96a1b130fa Fixed missing teeworlds icon for gcc 2010-11-16 17:48:29 +01:00