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
3136 commits 1 branch 429 tags 411 MiB
Commit graph

158 commits

Author SHA1 Message Date
oy e6698b1118 apply custom colour to blood colour. Closes #314 2010-11-24 01:11:56 +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
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 8351682edf added constants for console types by Choupom 2010-11-17 13:01:46 +01:00
oy 994a44f6e1 simplified change_map command so that it switches to the next map in the maprotation when called without param 2010-11-17 12:50:01 +01:00
GreYFoXGTi f16d1a8507 Fixed DemoPlayback 2010-11-04 22:06:12 +02:00
btd 418875b5e5 Add score board time, need to add in server send time for players if someone enter 2010-11-04 19:39:04 +03:00
btd f42adf79ef ... 2010-11-01 00:17:36 +03:00
btd 62ef58329d Return DDRace stuff. No need in mistic compatibility 2010-10-31 23:50:40 +03:00
GreYFoXGTi 8d88f5d541 Partially Revert "Refactoring" to keep DDRace compatible with SushiTee's Stuff 
This partially reverts commit 505a5b4172.
 2010-10-30 20:17:59 +02:00
GreYFoXGTi d6b898c84a Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-30 00:48:17 +02:00
oy 476f951ffc added font that provides more characters. closes #56 2010-10-29 23:44:08 +02:00
GreYFoXGTi 505a5b4172 Refactoring 2010-10-29 23:29:07 +02:00
btd a62decbc91 Show others for ddrace clients. 
Need to fix entities now.

Signed-off-by: btd <bardadymchik@gmail.com>
 2010-10-24 14:47:25 +04:00
btd 61092f7baa Begin show_others 
Signed-off-by: btd <bardadymchik@gmail.com>
 2010-10-23 23:26:10 +04:00
GreYFoXGTi 47714c9468 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/variables.h
 2010-10-13 14:08:35 +02:00
oy e4fe7457c8 fixed problems with the mouse movement. Closes #214 2010-10-13 12:47:42 +02:00
GreYFoXGTi e46dd6b5e6 Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-11 19:45:14 +02:00
oy cd578a0dc2 moved explosions to front layer. Closes #21 2010-10-11 12:32:34 +02:00
GreYFoXGTi faaa8c241e Merge branch 'master' of http://github.com/oy/teeworlds into Cleanup 2010-10-07 15:33:48 +02:00
GreYFoXGTi cfe7ef6f38 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-10-06 23:48:39 +02:00
GreYFoXGTi 304084434b Created Destructor for Layers and Collision but making them default Destructor didn't work so i made them normal functions and called them as needed, i am not sure this is the right way though. Closes #74, Closes #35.(#35 Needs in depth testing, i tested for 3 minutes copying stuff around) 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-10-06 23:47:23 +02:00
oy 3a98f7a048 added mod system. Closes #34 2010-10-06 23:07:35 +02:00
GreYFoXGTi b6a17d1e47 Merge branch 'master' of http://github.com/oy/teeworlds into Cleanup 2010-09-30 23:38:27 +02:00
GreYFoXGTi e900e7f4db Changes Required by Teams for Client 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-30 23:31:11 +03:00
GreYFoXGTi 896634a061 Total Cleanup 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-30 23:28:06 +03:00
oy b08fdf2fb2 fixed initialisation message. Closes #194 2010-09-29 19:55:33 +02:00
GreYFoXGTi 526e36f8a0 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/client/components/menus.h
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.cpp
	src/game/variables.h
 2010-09-27 06:32:14 +03:00
GreYFoXGTi ac36e562a5 Made Personal Best/Vanilla Score Updated on game enter 2010-09-27 00:31:33 +03:00
Kaffeine 3684621589 CGameClient: Removed needless call UpdateRenderInfo and fixed team-checks. 2010-09-24 13:02:26 +02:00
btd e6718e2ede Reset Teams in Client 2010-09-24 11:12:26 +04:00
GreYFoXGTi e56b75090c Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/server/player.cpp
 2010-09-22 11:46:18 +03:00
oy 55434a2a57 added fix by Sworddragon for stopped loading bar at the beginning 2010-09-22 00:30:08 +02:00
GreYFoXGTi 8e066517ad Merge branch 'master' of http://github.com/btd/DDRace 
Conflicts:
	src/game/server/gamecontext.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-15 05:57:34 +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 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
oy d913af1ab2 renamed demorec files to demo 2010-09-12 12:16:51 +02:00
btd edbef086c1 git add src/*git add src/*! Fix character collision bug with additional protocol message, begin to finish ShowOthers 2010-09-12 00:45:56 +04:00
btd 4544b91d2f Teams collision a works fine... But i broke collision with tiles 2010-08-30 23:25:04 +04:00
btd 909c583d96 End merge 2010-08-26 00:30:21 +04: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 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 1cfa122521 fixed that scoreboard overlaps the chat. Closes #14 2010-08-24 23:48:27 +02:00
oy 538d968349 fixed that scoreboard overlaps the chat. Closes #14 2010-08-18 03:57:35 +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 d37c83962d fixed weapon change on start bug 2010-08-10 13:54:13 +02:00
oy 3797eba179 added demo recording button by fujnky 2010-08-09 14:14:15 +02:00
oy 3f0ff1fb14 removed ServerDummy function cause it isn't needed anymore(actual console separates client and server commands) and added two missing server commands to the tab completion 2010-08-07 00:01:43 +02:00
oy 22c19f45db fixed hook sound bug in demos. Closes #161 2010-07-17 19:55:17 +02: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 7b68ff4277 fixed chaining of console commands, allows snatching updates of console variables. cleaned up some code 2009-06-15 14:01:36 +00:00
Magnus Auvinen 307cf4aa64 done language selector 2009-06-15 08:15:53 +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 c2f8d0e07a minor cleanup of out commented clode 2009-06-13 08:25:50 +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 82f9be8ce0 added help messages for all commands. added syntax in the help msg 2009-01-24 14:10:26 +00:00
Magnus Auvinen 5f186c8906 fixed so the console show help for each command. not all commands have descriptions however 2009-01-24 13:12:04 +00:00
Magnus Auvinen 9d51d47cea added tab completion to the console. works for local and remote 2009-01-24 12:16:02 +00:00
Magnus Auvinen 2f801d47cf fixed so the 'default' skin is used first when no other skin is found 2009-01-21 21:00:06 +00:00
Magnus Auvinen 46125d5ed7 fixed so predicted sounds and air jump effect works with demo playback 2009-01-11 15:51:43 +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
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 fa9002f9b4 fixed a small bug 2008-12-20 16:05:30 +00:00
Magnus Auvinen e447ef04cc fixed so that events isn't processed when scrubbing a demo 2008-12-19 11:41:17 +00:00
Alfred Eriksson 2e63ef3299 stops recording when client switches state 2008-11-17 16:13:12 +00:00
Magnus Auvinen b6f6f47997 fixed issues when pausing the game and added pause and unpause console commands 2008-11-16 15:10:57 +00:00
Magnus Auvinen e27e2d8b2a fixed server side demo recording and some possible crashes with incorrect demos 2008-11-16 13:58:27 +00:00
Magnus Auvinen 54429b70cf added some extra debugging information 2008-11-15 13:29:32 +00:00
Magnus Auvinen 388a04d957 better voting support 2008-11-08 12:50:46 +00:00
Magnus Auvinen d15860e44f renamed gc_render* to render* 2008-10-20 23:46:39 +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 119b5af3d3 fixed a lot of network troubles 2008-10-19 09:10:55 +00:00
Alfred Eriksson e858ed1310 gameclient is now reset correctly 2008-10-18 10:32:36 +00:00
Magnus Auvinen 35bcd41aa2 added hammer hit effect. added reset of all systems on state change. solves a lot of possible memory errors 2008-10-17 11:23:21 +00:00
Magnus Auvinen 4484948a6d updated the demo recorder 2008-10-14 12:11:42 +00:00
Magnus Auvinen 3544db4927 fixed #490 (insert the player info in the sv_setinfo message into the snapshot instead) 2008-10-08 20:47:56 +00:00
Magnus Auvinen 79f9fb41d4 fixed so that the components are reset on connect 2008-10-08 18:19:45 +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 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 917ebc17c6 begun the work on voting 2008-09-24 14:47:03 +00:00
Magnus Auvinen d9d37b945e some server restructure. added hook no attach sound 2008-09-23 18:08:19 +00:00
Magnus Auvinen c94b1f22ab added non-hookable tile 2008-09-23 14:38:13 +00:00
Magnus Auvinen 33b50738e6 added dead reckoning to the characters 2008-09-23 07:43:41 +00:00
Magnus Auvinen 5bcba4498e fixed timeout 2008-09-12 07:20:26 +00:00
Dominik Geyer 51a9d23dae fixed spectator mode freeview 2008-09-09 15:50:41 +00:00
Magnus Auvinen fa266334fd fixed on_console_init and on_save 2008-09-04 21:36:44 +00:00
Dominik Geyer a9211ffd64 moved nameplate-code to new component nameplates; ticket #461 2008-09-04 18:54:37 +00:00
Alfred Eriksson b649ab6c16 merged teambalance-warning and mini-/maximize-stuff from 0.4.3 2008-09-01 18:17:01 +00:00
Magnus Auvinen 9c704c6a05 added mapimages component 2008-09-01 05:54:00 +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 5198d6bf01 fixed some crashes and added kill and team console commands 2008-08-31 13:36:30 +00:00
Magnus Auvinen cd7a3519a7 added the loading screen again 2008-08-30 22:38:56 +00:00
Magnus Auvinen 374714f641 clean up the hooks and removed the old gc_hooks.cpp file and renamed to clienthooks.cpp 2008-08-30 21:16:58 +00:00
Magnus Auvinen b03b048974 removed gc_client.hpp 2008-08-30 21:09:13 +00:00
Magnus Auvinen 2b53f91a1f added the special binds again. console can now be accessed in the menus aswell 2008-08-30 09:34:55 +00:00