SushiTee
|
c0b905f852
|
-fixed compiler warnings
-fixed mac compiling
|
2011-01-26 14:45:44 +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 |
|
Damian Kaczmarek
|
073044747b
|
-Working ui_scale parameter.
(doing it properly would require lots of framework/interface job ...)
|
2011-01-05 12:14:36 +01:00 |
|
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
|
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 |
|
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
|
bd9850cae2
|
added single function to stop recording by Batchyx
|
2010-12-08 00:02:24 +01: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
|
ed7a1d5bcd
|
Client won't vote on comments by Sushi Tee
|
2010-12-06 00:28:35 +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 |
|
Sworddragon
|
fc9211c777
|
Updated copyrights
|
2010-11-20 21:26:06 +01:00 |
|
GreYFoXGTi
|
fb88a8e4e7
|
Added In-Game Server Browser. Closes #65.
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-10-30 00:44:52 +02:00 |
|
Choupom
|
d2519f7ab9
|
small ui fixes
|
2010-10-25 18:59:33 +02:00 |
|
oy
|
b65a26fe93
|
fixed last commits
|
2010-10-11 01:06:44 +02:00 |
|
Choupom
|
61201fea13
|
added reason to kick a player in the callvote tab
|
2010-10-11 00:31:21 +02:00 |
|
oy
|
3797eba179
|
added demo recording button by fujnky
|
2010-08-09 14:14: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
|
23e2d5f424
|
fixed votekick menu (#807)
|
2010-05-31 15:36:20 +00:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|
Magnus Auvinen
|
878ede3080
|
major update with stuff
|
2009-10-27 14:38:53 +00:00 |
|
Magnus Auvinen
|
ab171f8f30
|
updated localization
|
2009-06-15 07:34:25 +00:00 |
|
Magnus Auvinen
|
76bffb13a8
|
added scrollbar to the voting menu
|
2009-01-21 23:13:37 +00:00 |
|
Magnus Auvinen
|
f29276e8d5
|
fixed so the number of players in the server info is correct
|
2009-01-11 14:48:38 +00:00 |
|
Magnus Auvinen
|
aee14baf8d
|
fixed the favorite button in the server info
|
2008-11-08 12:58:39 +00:00 |
|
Magnus Auvinen
|
388a04d957
|
better voting support
|
2008-11-08 12:50:46 +00:00 |
|
Magnus Auvinen
|
6224fc7763
|
fixed sending of new player info when player changes something in the info
|
2008-10-20 23:38:23 +00:00 |
|
Magnus Auvinen
|
15217d8458
|
fixed so that you can't vote on maps that arn't in the map list. fixed crash bug in the server info menu page
|
2008-10-20 23:20:28 +00:00 |
|
Magnus Auvinen
|
a91fecae92
|
fixed fetching of server info and corrected some spelling errors
|
2008-10-17 21:16:23 +00:00 |
|
Magnus Auvinen
|
12472ef7f4
|
major update. continued on ban support. added demo recording (client and server side). added demo player. added demo menu. demos have some quirks and file size optimizations havn't been done yet. some interface tweaks
|
2008-10-06 18:05:01 +00:00 |
|
Dominik Geyer
|
343324c21b
|
fixed compiler warnings
|
2008-10-02 15:34:45 +00:00 |
|
Magnus Auvinen
|
eac9658b73
|
added voting gui and a lot of other minor changes
|
2008-09-29 11:34:49 +00:00 |
|