edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-11 10:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
13429 commits 1 branch 429 tags 411 MiB
Commit graph

274 commits

Author SHA1 Message Date
def d6aea5ba40 Prepare DDNet gametype name 2014-09-20 13:48:59 +02:00
def 684ad0b890 Ingame DDNet menu 2014-09-20 13:41:20 +02:00
east c4fc429e99 small cleanup 2014-09-20 11:47:51 +02:00
east cda02a3d9a versionsrv serverlist download added 2014-09-20 00:36:22 +02:00
east 202d5d8866 Filter flag grid added 2014-09-19 23:52:09 +02:00
east 9db12d455d working on CDDNetCountry 2014-09-18 16:13:06 +02:00
east e732008157 DDNet serverlist added 2014-09-13 16:36:25 +02:00
def c5b36f8038 Minor textual changes in client 2014-07-09 21:59:03 +02:00
def e6bcb528cd Cleanup 2014-06-27 10:13:57 +02:00
def 7875c2ec36 Android support (by Pelya) 2014-06-16 13:29:18 +02:00
def d57634792d Add ping and gametype colorization (Thanks to NooBxGockeL and Gamerclient) 2014-05-03 17:24:34 +02:00
def db0410c443 Add SPEC info to serverbrowser 2014-02-19 14:24:26 +01:00
def 57889d5fbc Also show proper times in Serverbrowser 2014-01-24 22:09:52 +01:00
def 6d0bceda6b Fix: Friend selection in server browser 2014-01-16 00:46:13 +01:00
def 31629b15c1 DDNet Version notice 2014-01-14 23:13:17 +01:00
def 9e4114f27d Better 64 player search 2014-01-14 21:40:55 +01:00
def 9de10f9e91 Also show temporary results while server browser is loading 2014-01-14 20:58:47 +01:00
def 188635162e 64 Player Filter Button 2014-01-11 21:38:50 +01:00
def ef65abfe35 Fix scrolling lists in menus 2014-01-10 12:22:48 +01:00
def 52e83313c8 64 players in server browse 2014-01-08 06:15:56 +01:00
def 3eaad43b6b Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace 
Conflicts:
	bam.lua
	data/languages/index.txt
	src/engine/server/server.cpp
	src/engine/shared/network_server.cpp
	src/game/client/components/chat.cpp
	src/game/client/components/menus_settings.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/version.h
 2013-12-26 18:02:22 +01:00
oy b2a9e98bf4 fixed client crash on removing friends. Closes #1077 2013-03-16 16:03:38 +01:00
oy 0bce750a33 count spectators in the server browser when 'count players only'-filter is disabled 2013-02-24 17:33:37 +01:00
GreYFoX cd4ba53bae Merge branch 'master' of git://github.com/teeworlds/teeworlds into DDRace 
Conflicts:
	bam.lua
	scripts/build.py
	scripts/make_release.py
	src/engine/server.h
	src/game/client/gameclient.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/player.cpp
	src/game/version.h
 2012-04-12 02:09:31 +02:00
oy e960cbdff3 added a config to display the code string of a country flag instead of the image. Closes #897 2012-01-08 18:16:38 +01:00
GreYFoX de4a95c5d2 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 2011-08-20 06:50:06 +02:00
GreYFoX 5b27758650 Removed level stuff 
Removed client ID stuff
Removed console stuff
Resolved merge conflicts
Upgraded Banmaster
Cleaned up
 2011-08-13 02:11:06 +02:00
GreYFoX 35d16bd58c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 
Conflicts:
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/menus_browser.cpp
	src/game/client/gameclient.cpp
	src/game/editor/editor.cpp
	src/game/editor/editor.h
	src/game/editor/io.cpp
	src/game/editor/layer_tiles.cpp
	src/game/editor/popups.cpp
	src/game/gamecore.cpp
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gamemodes/ctf.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2011-08-13 02:01:40 +02:00
Shereef Marzouk c6fd4a2cc5 General whitespace and tab cleanup 2011-08-11 10:59:14 +02:00
oy 20fbe2f92c fixed that player friends are marked as online in the friends list if they match a clan friend 2011-07-05 23:23:33 +02:00
Choupom 4a5c13d1de fixed so Reset Filter button resets all filters 2011-07-02 19:23:36 +02:00
oy 123eab41c8 made it possible to filter by player country in the server browser. Closes #654 2011-06-29 22:27:32 +02:00
oy fb309436b4 improved friends feature 2011-06-26 17:10:13 +02:00
GreYFoX eb70e55ead Merge branch 'master' of git://github.com/oy/teeworlds 2011-05-17 09:00:25 +02:00
PsychoGod 210d98666c Scroll fix, protect scrolling 2 windows at the same time 2011-05-17 01:15:54 +02:00
GreYFoX cc63cf2553 Merge branch 'master' of git://github.com/oy/teeworlds 
Conflicts:
	src/engine/external/pnglite/pnglite.c
	src/engine/external/pnglite/pnglite.h
	src/engine/shared/config_variables.h
	src/game/client/components/menus_browser.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/version.h
 2011-05-09 18:36:13 +02:00
heinrich5991 9fb36fd802 added strict game type filter 2011-05-02 19:25:38 +02:00
oy 246cbed786 colorized background of entries in the server browser scoreboard so it's more obvious what belongs together 2011-04-16 18:55:36 +02:00
GreYFoX c6ca0fd6b0 Fixed Reset Filter 2011-04-15 06:40:42 +02:00
GreYFoX 0df6d0541f Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 
Conflicts:
	bam.lua
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config.h
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/game/client/components/binds.cpp
	src/game/client/components/chat.h
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/controls.cpp
	src/game/client/components/emoticon.h
	src/game/client/components/maplayers.cpp
	src/game/client/components/menus.h
	src/game/client/components/scoreboard.h
	src/game/client/components/spectator.h
	src/game/client/components/voting.h
	src/game/client/gameclient.cpp
	src/game/client/gameclient.h
	src/game/client/render.h
	src/game/collision.cpp
	src/game/editor/ed_layer_tiles.cpp
	src/game/gamecore.cpp
	src/game/gamecore.h
	src/game/layers.cpp
	src/game/layers.h
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/entities/laser.h
	src/game/server/entities/pickup.cpp
	src/game/server/entities/pickup.h
	src/game/server/entities/projectile.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gameworld.cpp
	src/game/server/gameworld.h
	src/game/server/player.cpp
	src/game/variables.h
 2011-04-14 01:27:49 +02:00
oy 06115dd49d added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
GreYFoX aaac8a3f77 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/version.h
 2011-04-09 22:33:06 +02:00
GreYFoX f7f6058a92 Merged Oy, Cleaned up, removed some useless features and code parts 
Added Icon by landil
alot more...
 2011-04-09 22:32:17 +02:00
oy caf1a9f912 made translations ready for 0.6 release and added fixed friends/mute icons 2011-04-09 18:08:11 +02:00
oy 5c6e274a88 added more and resized flags by Crises and made them show up smaller and less of an eye-catcher. Closes #566 2011-04-04 20:37:12 +02:00
oy a6fced3d3a made new version notification show up in red colour 2011-04-01 18:06:59 +02:00
oy ae325c873f added friends feature. Closes #24 2011-03-23 13:06:35 +01:00
oy 96808a1145 made it possible to just show the number of player slots of a server (instead of client ones). Closes #68 2011-03-20 15:33:49 +01:00
oy 079de7bc10 fixed that the server browser shows matching map name 2011-03-18 19:14:35 +01:00
oy a8bf857c68 improved server browser list resorting and made search work on IP addresses. Closes #482 2011-03-18 19:03:13 +01:00
oy f8ae9f7732 made server browser show clan name and country code for players 2011-03-18 17:59:48 +01:00
GreYFoX 974f429957 Added git revision to several places 2011-03-18 01:21:07 +02:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
GreYFoXGTi 1b2703aaba Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
GreYFoXGTi 4ca79188dc DDRace Flags Finalized 2011-02-05 06:13:32 +02:00
GreYFoXGTi 984d10970e Localization and Cooler Browser Filter 2011-01-31 00:30:53 +02:00
GreYFoXGTi 9d98ce7e72 Version 1.03a 2011-01-30 23:51:14 +02:00
GreYFoXGTi 0aa3e8f546 Forgot to do this with the other DDRace Flags 2011-01-30 21:11:32 +02:00
GreYFoXGTi f1b002e7fa DDRace flags for the server browser (client-sided). 
Some fixes in the server sided part.
One task left, Adding the flags to SortHash(), added Todo in the code.
 2011-01-30 18:21:41 +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 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
Alfred Eriksson 8c1ed7d81d fixed typo 2008-10-21 16:35:44 +00:00
Magnus Auvinen d15860e44f renamed gc_render* to render* 2008-10-20 23:46:39 +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 faa96f6d3a show if servers use non-standard tuning and let serverbrowser filter for these; ticket #393 2008-10-05 09:57:46 +00:00
Magnus Auvinen eac9658b73 added voting gui and a lot of other minor changes 2008-09-29 11:34:49 +00:00
Magnus Auvinen 3b086d616a fixed threaded jobs 2008-09-07 21:13:24 +00:00
Alfred Eriksson c3ff86330f merge from 0.4.3: lots of small stuff 2008-09-07 08:30:49 +00:00
Alfred Eriksson 4c2632b7b6 merge from 0.4.3: version-notification on client 2008-09-04 18:45:41 +00:00
Magnus Auvinen 7248dd641d cleaned up the browser code a bit 2008-09-04 18:42:26 +00:00
Magnus Auvinen bcabb31780 new browser layout. work not done, but started 2008-09-04 18:25:12 +00:00
Magnus Auvinen 53da3f0d40 added favorites. no saving of them yet however 2008-09-03 20:03:01 +00:00
Magnus Auvinen 04eddacd65 setting of correct game type in game controller. fixed gametype filter in browser. various cleanups 2008-08-31 21:50:14 +00:00
Magnus Auvinen 432602c4ca renamed gc_ui.* to ui.* 2008-08-30 21:31:01 +00:00
Magnus Auvinen 0511e1152a added sound component 2008-08-29 05:34:18 +00:00
Magnus Auvinen dfe499248f major commit. game client restructure. not complete, loads of stuff not working, but the structure is there 2008-08-27 15:48:50 +00:00