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

195 commits

Author SHA1 Message Date
oy c0530b0d09 added language popup on first start. Closes #336 2010-12-12 19:20:30 +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
oy 7a6006087c removed duplicate note in password popup 2010-11-20 23:39:17 +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
GreYFoXGTi fb88a8e4e7 Added In-Game Server Browser. Closes #65. 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-10-30 00:44:52 +02:00
GreYFoXGTi 4d204d642f Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/console.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
 2010-10-26 00:25:36 +02:00
GreYFoXGTi 2f3152691c Revert "ingame browser added (config: cl_serverbrowser, hotkey: ctrl+shift+b" because it's buggy and i never intended to pull it, but btd did 
This reverts commit 5b5eb0b2c0.
 2010-10-25 20:09:08 +02:00
Choupom d2519f7ab9 small ui fixes 2010-10-25 18:59:33 +02:00
heinrich5991 5b5eb0b2c0 ingame browser added (config: cl_serverbrowser, hotkey: ctrl+shift+b 2010-10-22 17:29:46 +02:00
GreYFoXGTi 4197a6ce8b Re-enabled pure tuning check, reset tunings to vanilla values, made server apply DDRace tunings on startup and map change. Closes #97. 
Revert "Now can Join Vanilla servers. Closes #96."

This reverts commit c6fda43369.

Conflicts:

	src/game/client/components/menus_settings.cpp
 2010-10-22 15:22:17 +02:00
GreYFoXGTi c6fda43369 Now can Join Vanilla servers. Closes #96. 2010-10-19 18:30:45 +02:00
GreYFoXGTi ddf2883cb2 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/engine/shared/console.cpp
	src/game/server/gamecontext.cpp
 2010-10-16 21:59:59 +02:00
oy 639c32d661 do not show the restart warning in the settings if you change back to actual settings. Closes #90 2010-10-16 11:24:42 +02:00
GreYFoXGTi d8e6cfcbdd Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/french.txt
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/game/server/gamecontext.cpp
 2010-10-11 03:56:58 +02:00
oy de7504282c made edit boxes scrollable. Closes #96 2010-10-11 01:36:46 +02:00
Choupom 61201fea13 added reason to kick a player in the callvote tab 2010-10-11 00:31:21 +02:00
GreYFoXGTi faaa8c241e Merge branch 'master' of http://github.com/oy/teeworlds into Cleanup 2010-10-07 15:33:48 +02:00
oy 3a98f7a048 added mod system. Closes #34 2010-10-06 23:07:35 +02:00
GreYFoXGTi 896634a061 Total Cleanup 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-30 23:28:06 +03:00
GreYFoXGTi fa379a806a Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/server/server.cpp
	src/game/client/components/scoreboard.cpp
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
 2010-09-13 07:49:01 +03:00
oy c52ee7baa9 unbind a key with right mouse button in the controls menu. Closes #67 2010-09-12 17:15:09 +02:00
oy 5437513a0d use escape key to abort binding a control key in the menu 2010-09-12 13:40:24 +02:00
oy e226b47212 close the emote selector, chat history and the scoreboard when closing the chat, console or ingame menu. Closes #111 2010-09-12 12:43:03 +02:00
GreYFoXGTi 0b1b949a3c Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/server/entities/flag.cpp
	src/game/server/entities/flag.h
	src/game/server/gamemodes/ctf.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-09 05:37:08 +02:00
oy e31b125a0d use the numpad enter key as well. Closes #166 2010-09-08 02:32:41 +02:00
GreYFoXGTi 616498e7b1 Merge branch 'master' of http://github.com/oy/teeworlds into master 
Conflicts:
	src/engine/client/input.h
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/engine/shared/network_server.cpp
	src/engine/storage.h
	src/game/client/components/chat.cpp
	src/game/client/gameclient.cpp
	src/game/client/gameclient.h
	src/game/collision.cpp
	src/game/editor/ed_editor.cpp
	src/game/editor/ed_editor.h
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamemodes/ctf.cpp
	src/game/server/player.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 07:57:38 +02:00
oy 5588e1ec8c fixed selected index when deleting a demo and added a popup to confirm the deletion 2010-09-05 17:53:31 +02:00
Choupom fcfaa8389f added Remove button in demos browser (#66) 2010-09-05 17:40:51 +02:00
GreYFoXGTi 11f480a79b Changed the Loading String to Loading DDRace Client 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-28 19:59:24 +02:00
GreYFoXGTi 7f8fb7a5a7 Merging the client manually into the server 
but i can't get the client to accept the console class of the server -.-" yet..

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-25 17:31:49 +02:00
oy 6193f35423 Merge branch 'master' of http://github.com/matricks/teeworlds 2010-07-17 14:10:43 +02:00
Magnus Auvinen 575f72d978 fixed some compiler errors and warnings with clang 2010-07-05 20:57:07 +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
Choupom 848764544f added folders in demo browser (#25) 2010-06-04 22:14:02 +02:00
oy 67d4903b9f fixed stuck "error loading demo"-popup. Closes #90 2010-06-03 22:03:27 +02:00
Fujnky 0d4c0ccef5 Some localization fixes 2010-06-02 21:03:15 +02:00
Tom Adams 08df0fe63d added fix for italian translation by Lanta 2010-05-30 14:26:04 +00:00
Thomas 361380d630 *some esthetic changes 
*split "CHud::RenderGoals()"
*added "reload" command
*added the ability to show last chat lines (+show_chat)
*updated french.txt
 2010-05-30 12:01:11 +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 57b2c49d57 fixed so that the demo player doesn't crash when the map isn't found 2009-06-15 13:16:33 +00:00
Magnus Auvinen d023c72256 fixed demo browser so it's ordered and shows all files 2009-06-15 10:12:16 +00:00
Magnus Auvinen b31243d271 tweaked checkboxes 2009-06-15 09:48:18 +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 21c1c3866f translation update 2009-06-15 08:20:29 +00:00
Magnus Auvinen ab171f8f30 updated localization 2009-06-15 07:34:25 +00:00
Magnus Auvinen bc20e9c433 localization update 2009-06-13 17:18:06 +00:00
Magnus Auvinen 6d9ccee95d base for the localization system 2009-06-13 16:54:04 +00:00
Magnus Auvinen 69511102de improved the font system even futher. utf8 is now used everywhere. it uses less memory as well 2009-06-13 08:22:37 +00:00
Magnus Auvinen 9254ca61f1 fixed utf8 support 2009-06-07 16:06:03 +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
Alfred Eriksson 5141ddac4d refreshing the server info when loading 2009-01-12 14:03:19 +00:00
Joel de Vahl 2a7402dd6c use dmg for osx deliver, build universal binary, fix backspace being entered as a character 2009-01-11 12:10:30 +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
Alfred Eriksson 6c1212da49 fixed the scrolling in server list 2009-01-10 20:24:47 +00:00
Alfred Eriksson d0d91c412d fixed #585 2009-01-10 11:16:21 +00:00
Alfred Eriksson 2e5ab69c2b show the internet server browser when trying to show ingame pages offline 2008-11-17 18:44:05 +00:00
Alfred Eriksson 9167fdea18 fixed demo list refreshing 2008-11-17 16:46:21 +00:00
Magnus Auvinen a6bcd74120 solved #559 2008-11-08 09:19:46 +00:00
Alfred Eriksson 4ce4849131 fixed #538 2008-10-23 18:19:17 +00:00
Magnus Auvinen bd5b2b9f85 removed glfw and portaudio. SDL is now a requirement 2008-10-23 16:18:33 +00:00
Magnus Auvinen bf09116059 fixed esc key that I broke recently 2008-10-21 18:25:28 +00:00
Magnus Auvinen daf9a100eb fixed error when menu takes over enter key 2008-10-21 18:21:55 +00:00
Magnus Auvinen ad9c1b0a22 fixed text input box bug 2008-10-20 23:43:15 +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 da473cf614 fixed various issues with binding keys like enter and f1-f15 2008-10-20 23:10:00 +00:00
Magnus Auvinen 8e0e105123 fixed problem with the UI always listening directly to the keyboard 2008-10-18 10:52:26 +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
Alfred Eriksson bddc6ec6cc server browser is now default menu page 2008-10-01 18:40:09 +00:00
Dominik Geyer 397b9a764b data-dir autodetection; data-dir override; compiled-in data-dir; messagebox if detection fails; does chdir into data-dir 2008-10-01 17:16:22 +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 6d44adb711 fixed keybindings. reworked the voting a bit. added vote spamming protection. added ingame voting hud. 2008-09-25 14:04:02 +00:00
Magnus Auvinen d2d4024c7a voting fixes 2008-09-25 12:41:37 +00:00
Magnus Auvinen aaaba4f403 continued on the voting 2008-09-25 12:23:44 +00:00
Alfred Eriksson 059c2ee4cb reverted changes that changed to the old background 2008-09-24 15:09:09 +00:00
Magnus Auvinen 917ebc17c6 begun the work on voting 2008-09-24 14:47:03 +00:00
Alfred Eriksson 2f28978237 server info page is fixed, remaining is to set current_server_info 2008-09-24 14:28:26 +00:00
Magnus Auvinen 2aca3b874f new menu background, much more relaxing 2008-09-23 11:58:12 +00:00
Magnus Auvinen 5bcba4498e fixed timeout 2008-09-12 07:20:26 +00:00
Magnus Auvinen 39c01e7f11 trying out a funnier background 2008-09-11 22:45:28 +00:00
Alfred Eriksson 4c2632b7b6 merge from 0.4.3: version-notification on client 2008-09-04 18:45:41 +00:00
Magnus Auvinen 53da3f0d40 added favorites. no saving of them yet however 2008-09-03 20:03:01 +00:00
Magnus Auvinen 9c704c6a05 added mapimages component 2008-09-01 05:54:00 +00:00
Magnus Auvinen cd7a3519a7 added the loading screen again 2008-08-30 22:38:56 +00:00
Magnus Auvinen 432602c4ca renamed gc_ui.* to ui.* 2008-08-30 21:31:01 +00:00
Magnus Auvinen b03b048974 removed gc_client.hpp 2008-08-30 21:09:13 +00:00
Magnus Auvinen dfe7cb1579 fixed so that menus doesn't use inp_get_event. fixes the gui key binder 2008-08-30 09:28:31 +00:00
Magnus Auvinen 0511e1152a added sound component 2008-08-29 05:34:18 +00:00
Magnus Auvinen a47fe88d19 ingame menu fixed 2008-08-27 20:23:50 +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