GreYFoXGTi
a3d29d5447
Merge branch 'master' of http://github.com/heinrich5991/DDRace
2010-11-23 03:57:48 +02:00
heinrich5991
077b8bd84d
fixed sv_vote_percentage
2010-11-22 22:30:50 +01:00
GreYFoXGTi
4737588827
New Delayed Switches
2010-11-22 23:10:12 +02:00
GreYFoXGTi
eed83bd7cb
Added Announcement
2010-11-22 13:00:43 +02:00
GreYFoXGTi
f1781c0eb4
lol
2010-11-22 11:13:04 +02:00
GreYFoXGTi
b8fe169419
Added Mac Fixes by Allisone (Trust)
2010-11-22 11:09:27 +02:00
GreYFoXGTi
3ceebe2ef4
Forgot to make the map.cfg level 4
2010-11-22 10:32:00 +02:00
GreYFoXGTi
2ad456433d
Made File Execution Level 3, but level 4 only for autoexec.cfg at server start
...
Removed TODO, because it's needed there to reset tunings on map change
2010-11-22 10:27:13 +02:00
GreYFoXGTi
bdd3af9f43
Applied CMDList Pages
2010-11-22 09:55:50 +02:00
GreYFoXGTi
4f3d086b92
Fixed /pause making u return as a Team 0 Player
2010-11-22 09:21:02 +02:00
GreYFoXGTi
a80ac35cb9
Fixed http://ddrace.info/forum/showthread.php?261-DDrace-Trunk-Alpha-Crash-caused-by-teams
2010-11-22 08:59:40 +02: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
vierkant
ebd45829ce
Improved dutch language file. Translated more in context.
2010-11-21 18:30:33 +01:00
oy
8e3cba8dbf
disable free view when chatting as spectator. Closes #303
2010-11-21 18:05:26 +01:00
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