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

313 commits

Author SHA1 Message Date
def 67ede77105 fix 2014-02-08 23:46:55 +01:00
def 50d3e03c16 Fix teams in client 2014-02-08 23:41:12 +01:00
def f1661fc6b4 Sorted scoreboard and spectator view 2014-02-08 22:24:57 +01:00
def bf658945a5 Fix some +showhookcoll 2014-02-08 21:55:08 +01:00
def b21dc83b1a Compatibility for old servers 2014-01-30 17:15:54 +01:00
def d8533eea67 Proper Client Version numbers and more visible whispers 2014-01-30 16:49:15 +01:00
def e97d3ba788 Fix: +showhookcoll fixes 2014-01-30 04:10:52 +01:00
def fea96c411a Properly show SUPER team in Scoreboard 2014-01-28 19:52:46 +01:00
def 9ff38a940b Allow +showhookcoll on yourself 2014-01-27 05:16:07 +01:00
def 3e5bcb0213 Absolutely perfect +showhookcoll 2014-01-27 05:06:23 +01:00
def c7cc656f1a Remove useless code 2014-01-24 22:10:14 +01:00
def 25f69ecdeb Display teams in scoreboard 2014-01-22 01:39:18 +01:00
def f0d79b8388 Trying to get better team support 2014-01-22 00:08:30 +01:00
def fe7f274023 Fix: Proper super on DDRace 16 player servers 2014-01-21 18:21:01 +01:00
def 693d68841c More exact showhookcoll 2014-01-12 00:45:25 +01:00
def 0f251a435b Revert "Remove useless code" 
This reverts commit 3e28e52d8d.
 2014-01-02 01:14:20 +01:00
def 3e28e52d8d Remove useless code 2014-01-01 15:44:49 +01:00
def 3607218f12 Merge ddrace64 from eeeeee 2013-12-31 06:13:57 +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
def ad724453ad Better fix for slow Map loading 2013-12-20 12:27:10 +01:00
def 06fed6e596 Disable Tilemap Skip Generation (Makes map loading 30 times faster) 2013-12-20 03:33:50 +01:00
def 2a70aefc63 Show correct nameplates without antiping 2013-10-09 16:23:18 +02:00
def dc6d2305d5 Add AntiPing 2013-10-09 16:02:23 +02:00
def 9028d77471 Add +showhookcoll from H-Client 2013-08-24 01:50:35 +02:00
def 85b5277bb5 Reset zoom when player joins team 2013-07-11 17:25:51 +02:00
oy 32c8dd6cf5 increased time for client info resend to prevent possible overlap 2013-02-24 17:28:39 +01:00
oy 5de2763f82 skip auto screenshot when the editor is active. #931 2013-02-24 17:27:44 +01:00
BeaR 6d74d52c22 Fix problem with show other players: (Closes DDRace/teeworlds#210) 
sending packet on setting change
 2013-02-03 20:23:44 +02: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 d17ee055a2 fixed an issue about resending player info 2012-01-29 12:44:33 +01:00
oy 4fde2cf7f2 add tuning to demo. Closes #899 2012-01-09 00:49:20 +01:00
oy b592d7a591 cleaned up playing of global sounds 2012-01-06 19:38:40 +01:00
GreYFoX c46f3e06e7 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 2012-01-04 20:10:07 +02:00
oy 7328098f8d Merge pull request #912 from matricks/threadedflip 
Threadedflip
 2012-01-03 15:40:30 -08:00
GreYFoX ee670118a5 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 
Conflicts:
	src/engine/console.h
	src/engine/server/server.cpp
	src/engine/server/server.h
	src/engine/shared/config.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
@heinrich5991 todo
 2012-01-01 00:11:56 +02:00
Magnus Auvinen b31abc4053 fixed so that you can select graphics backend via gfx_threaded 2011-12-31 10:29:25 +01:00
BeaR afb1d5e201 Swap and Shuffle Teams 2011-12-30 21:52:01 +01:00
GreYFoX 1446d0980b Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 
* Version 1.098a
Conflicts:
	bam.lua
	src/game/client/gameclient.h
	src/game/mapitems.h
 2011-12-05 11:32:01 +02:00
oy b99ac459be fixed envelope rendering when seeking in the demo player 2011-12-04 14:04:12 +01:00
GreYFoX ff696bad6c Mac Loves Cyclic Includes 2011-08-31 13:56:04 +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
oy 2b2ddde04f sort players in kick/move to spec vote and player options by team. Closes #809 2011-08-05 19:52:38 +02:00
oy e18390fea8 fixed that client resets tuning. Closes #746 2011-07-05 23:32:32 +02:00
oy ac9c3b8f7f made the dropped flag sign blink faster the last 5 seconds to indicate that it's about to return. Closes #631 2011-07-05 23:15:24 +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
Johannes Loher 14f98a9ded Added possibility to deny changing of team after a set_team for a certain amount of time. Added server setting to do this automatically for spec votes. fixes #640. 2011-06-27 17:07:23 +02:00
GreYFoX bee10fda8f Merge branch 'master' of git://github.com/oy/teeworlds 
Conflicts:
	src/game/server/gamecontext.cpp
 2011-06-02 19:13:40 +02:00
Choupom deff0ce7c4 fixed netevent struct names 2011-06-02 17:40:08 +02:00
GreYFoX dad66bffc3 General DDRace binds improvements 2011-04-17 19:45:48 +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
heinrich5991 c83c7b1a19 reworked IConsole::PrintResponse to IResult::Print (and obviously CConsole::PrintResponse to CResult::Print) 2011-04-14 00:34:10 +02:00
oy 06115dd49d added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
oy 1a5d70450f added "reimplemented menu music by teetow-the-great-teetow" by Choupom 2011-04-13 20:00:54 +02:00
Shereef Marzouk 0354625f9b fixed Mac compilation 2011-04-10 00:05:34 +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
Choupom 733f0b3390 reimplemented extra projectiles 2011-04-03 22:57:03 +02:00
oy ab810cab25 fixed that player options just show players as friends not clans 2011-04-02 19:51:05 +02:00
oy d4f2b8de87 fixed skin colour of spectators 2011-03-27 11:52:16 +02:00
oy 6ece07ee74 added force_vote command 2011-03-25 12:06:45 +01:00
oy 359b806e95 added remove_vote command. Closes #47 2011-03-25 11:49:35 +01:00
oy 8ad3def65e added aliases for votes. Closes #144 2011-03-25 09:49:21 +01:00
oy ae325c873f added friends feature. Closes #24 2011-03-23 13:06:35 +01:00
oy b64db75a6b added an option to ignore other players in chat 2011-03-22 22:41:27 +01:00
Sebastian Wojtowicz 55ce870597 Client utf8 converting (servernames,playernames) in Internet tab and (playernames,playermessage) in chat and hud 2011-03-22 21:11:10 +02:00
oy eaef2ce48a added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115 2011-03-22 00:31:42 +01:00
oy 2547bfa4fc linked console commands player_clan and player_country to the client's info update 2011-03-20 11:17:51 +01:00
oy 79aa9d640e fixed that server browser shows the correct country flag 2011-03-20 11:15:24 +01:00
GreYFoX 0cbcdd027a Removed Helper made Moderators able to moderate only 
Enumerated levels
http://ddrace.info/forum/showthread.php?t=528
or modify the server and change the game type to something other than DDRace thank you
 2011-03-16 16:27:30 +02:00
GreYFoX 3059199505 Fixed a crash 2011-03-16 13:59:36 +02:00
oy 156e23b592 added loading/support for country flags to the client 2011-03-16 12:09:22 +01:00
oy 30d9c9f4d9 made network support clan name and country code for players 2011-03-15 11:23:49 +01:00
oy b834426548 fixed several problems with spectator view in game and demo player. Closes #83 2011-03-12 18:07:57 +01:00
oy ee2f625754 added extended spectator mode. Closes #28 2011-03-10 10:08:14 +01:00
oy 9811c2396b made network clip flags. Closes #131 2011-03-04 17:08:10 +01:00
oy 0bc13c91eb made cl_threadsoundloading work again 2011-02-27 17:56:03 +01:00
GreYFoX 90d93ba7b2 Client showothers 2011-02-23 22:22:05 +02:00
Romain Labolle 0209ef4126 The first parameter of set_team is the victim (cf. line 1190) 2011-02-23 08:02:55 +02:00
noother 901859a494 fixed all known bugs in racedemos & ghosts, including "ghost is shown when playing a demo", "ghost doesn't reset when crossing the startline 
again" (this conflicts with racemod however, where the time isn't reset on crossing the start tiles again. This should be removed in
DDRace.), "ghost sometimes doesn't save"  (this was because of kill tiles right next to finish tiles, and it just wasn't quick enough when
going through them fast), "demos contain a lot of garbage before the actual run (prior attempts)" ghosts and racedemos should now work 100%
 2011-02-16 10:39:26 +02:00
GreYFoXGTi 718d697707 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/collision.cpp
	src/game/collision.h
	src/game/gamecore.cpp
	src/game/server/gamecontext.cpp
 2011-02-13 19:36:53 +02:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
oy 09cd38d320 cleaned up skin initialisation 2011-02-13 13:58:59 +01:00
GreYFoXGTi 1b2703aaba Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
GreYFoXGTi 24a688b2c3 Added AutoDemoRecord and ghost made by Race mod team, implemented to DDRace by noother 2011-02-04 22:15:02 +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
heinrich5991 43b67aaa57 added server command to clear the votes. this fixes #47 partially 2011-01-23 17:53:53 +01:00
GreYFoXGTi 2151883b43 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/gamecore.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/entities/pickup.cpp
	src/game/server/entities/projectile.cpp
	src/game/server/entity.h
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2011-01-20 16:10:32 +02:00
oy da84771345 removed some old checks 2011-01-18 18:53:19 +01:00
oy 216967c3bf release gameclient components when opening the editor. Closes #429 2011-01-17 12:28:37 +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 b60d6deb51 made m_paInfoByScore within gameclient's snap state work and cleaned up render scoreboard 2011-01-11 23:03:01 +01:00
GreYFoXGTi 959b05d557 Merge branch 'master' of http://github.com/oy/teeworlds 2011-01-10 00:45:58 +02:00
oy 41b8022aa1 record a new demo when a game ends. Closes #358 2011-01-06 23:21:51 +01:00
oy eedaf62d97 fixed that the client crashes if it has no skins 2011-01-06 22:55:57 +01:00
GreYFoXGTi 6889adc0bb Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	.gitignore
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h & Cleaned it up
 2011-01-06 23:32:19 +02:00
oy f8b1edca64 show error message for all content that could not be loaded. Closes #257 2011-01-06 22:18:19 +01:00
oy 1306b62ce2 added command to move all players to a team. Closes #384 2011-01-06 13:37:28 +01:00
GreYFoXGTi 22aa8940a7 Code Style of some files converted from K&R to BSD/Allman 2011-01-06 07:30:19 +02:00
GreYFoXGTi ddc5dd7ab3 Cleaned up & Re-arranged stuff 2011-01-06 05:46:10 +02: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 2f5f332cbb Merge branch 'master' into DDRace 
Conflicts:
	src/engine/client/client.cpp
	src/engine/shared/config_variables.h
 2010-12-13 03:43:22 +02:00
oy c75a75b64f made it possible to automatically take game over screenshots. Closes #339 2010-12-12 16:48:13 +01:00
oy 3ea00f61cf removed needless include 2010-12-07 23:51:04 +01:00
GreYFoXGTi ae4aebd365 Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-24 02:28:01 +02:00
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