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
|
fa2cd82335
|
clamp maximum ping value in the server browser filters
|
2011-01-23 18:04:31 +01:00 |
|
Carmine
|
0c43e6f906
|
increase scroll value in the server list broswer, from 1 to 3
|
2011-01-23 17:53:58 +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
|
9819163c5f
|
fixed some overlapping in the server browser. Closes #376
|
2011-01-10 00:18:30 +01: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
|
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 |
|
Choupom
|
0aa0a56990
|
fixed so ui_scale is affected on server's name (fixes #43)
|
2010-11-20 21:37:35 +01:00 |
|
Sworddragon
|
fc9211c777
|
Updated copyrights
|
2010-11-20 21:26:06 +01: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 |
|
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 |
|
heinrich5991
|
684e1788ed
|
added strict gametype filtering
|
2010-10-19 17:18:32 +02:00 |
|
GreYFoXGTi
|
b6a17d1e47
|
Merge branch 'master' of http://github.com/oy/teeworlds into Cleanup
|
2010-09-30 23:38:27 +02:00 |
|
oy
|
2f388139c1
|
fixed auto-scrolling in server browser and listbox
|
2010-09-30 01:13:12 +02:00 |
|
oy
|
68851630ca
|
fixed server browser list. Closes #74
|
2010-09-30 00:32:45 +02:00 |
|
btd
|
909c583d96
|
End merge
|
2010-08-26 00:30:21 +04:00 |
|
oy
|
41afca6db2
|
added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8
|
2010-08-25 01:17:02 +02:00 |
|
oy
|
cabecb7fa9
|
added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8
|
2010-08-18 00:06:00 +02:00 |
|
oy
|
d471663913
|
added localisation fixes by fujnky
|
2010-08-09 00:35:37 +02:00 |
|
oy
|
5d442ae329
|
refresh the server browser if the "favorites"-tab is active and a new entry has been added with "add_favorite"-command
|
2010-07-04 16:10:00 +02:00 |
|
oy
|
c42679a10e
|
cut too long player names in the server browser. Closes #151
fixed overlapping of too long player names in the scoreboard
|
2010-07-02 14:14:41 +02:00 |
|
xalduin
|
6e1eaa96ec
|
Fixed issue #115, text now fits into columns in server browser
|
2010-06-10 20:38:04 +08:00 |
|
oy
|
3d079a35e9
|
fixed bug with the quick search box. Closes #89
|
2010-06-03 23:32:32 +02:00 |
|
Tom Adams
|
651cd062e6
|
fixed english localisation bug
|
2010-05-31 11:07:58 +00:00 |
|
Tom Adams
|
e16fdc3f3e
|
added clipping to editboxes (#773) and made their cursors blink
|
2010-05-29 15:53:57 +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
|
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
|
6309d7ad56
|
continued with localization
|
2009-06-15 06:45:44 +00:00 |
|
Magnus Auvinen
|
bc20e9c433
|
localization update
|
2009-06-13 17:18:06 +00:00 |
|
Magnus Auvinen
|
cdc5f26900
|
new font rendering system using freetype2. only compiles under linux for now
|
2009-06-07 14:36:54 +00:00 |
|
Magnus Auvinen
|
4bb1df3189
|
moved 0.5 branch to trunk
|
2009-05-31 09:44:20 +00:00 |
|
Alfred Eriksson
|
ae5b47a266
|
fixed height of toolbox to fit 16p
|
2009-01-24 13:00:58 +00:00 |
|
Magnus Auvinen
|
47c567a5ea
|
fixed so that the refresing master servers doesn't popup under lan and favorites
|
2009-01-24 10:53:09 +00:00 |
|
Alfred Eriksson
|
598369870d
|
refresh button work for favorites. removed duplicate of the refreshing master servers-msg. we need to refresh the serverlist at the game start
|
2009-01-24 10:02:29 +00:00 |
|
Alfred Eriksson
|
fe71008a9b
|
fixed enter in server browser
|
2009-01-21 21:19:10 +00:00 |
|
Magnus Auvinen
|
d3928f559f
|
fixed big messages in the middle of the server browser so users doesn't miss if their filter catches all servers
|
2009-01-21 20:39:48 +00:00 |
|
Alfred Eriksson
|
38a9e32efd
|
fixed quick search box positioning
|
2009-01-21 18:09:06 +00:00 |
|
Alfred Eriksson
|
b0ef334817
|
fixed pure server image issue
|
2009-01-19 14:57:17 +00:00 |
|
Alfred Eriksson
|
54def5d97d
|
moved quick search to the bottom and fixed reset filter
|
2009-01-17 10:33:16 +00:00 |
|
Magnus Auvinen
|
5f296f3963
|
fixed the unpure icon
|
2009-01-11 13:31:36 +00:00 |
|
Alfred Eriksson
|
8ad943b4f3
|
added linebreak on new version text to prevent overlap
|
2009-01-11 12:34:07 +00:00 |
|
Alfred Eriksson
|
c164ba3518
|
fixed #593
|
2009-01-11 11:01:32 +00:00 |
|
Alfred Eriksson
|
32645b247f
|
reverted wrongful commit
|
2009-01-11 10:43:17 +00:00 |
|
Alfred Eriksson
|
39a12060d6
|
removed the tuning filtering and warning. modded servers can use tuning for free. added pure server checking - ctf, dm and tdm gametypes are not allowed to have different tuning.
|
2009-01-11 10:40:14 +00:00 |
|
Magnus Auvinen
|
66579c87a2
|
fixed gametype filtering
|
2008-10-21 18:50:23 +00:00 |
|