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

85 commits

Author SHA1 Message Date
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 19a9462fe8 removed double entity list in gameworld and cleaned up connected stuff 2011-01-19 18:27:50 +01:00
oy 68faba809c made dbg dummies work again 2011-01-18 19:09:53 +01:00
Floff Floffsson 3e530ac02d SetClientAuthed() moved 2011-01-17 14:59:12 +01:00
Floff Floffsson 645f31141d deepfreeze tiles 2011-01-17 00:38:24 +02:00
GreYFoXGTi 9c66a2d54c Endless Hook Tile for ingameplay by Floff aka LemonFace 2011-01-17 00:13:21 +02:00
GreYFoXGTi babe838cab Added /ShowOthers 2011-01-06 07:08:12 +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 8f9520b09a test 2010-12-23 07:57:26 +02:00
GreYFoXGTi 63961ecf1a fixed mute evasion + kick 2010-12-19 07:25:01 +02:00
GreYFoXGTi fc323326ec fixed mute evasion 2010-12-17 13:05:55 +02:00
floff 4a93c28eb8 added configurable time between pauses, to reduce spam 2010-12-16 10:05:20 +01:00
GreYFoXGTi e803f30f52 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/server/entities/character.cpp
	src/game/server/entities/flag.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2010-12-16 06:06:23 +02:00
oy 0121f27311 fixed server crash on too many snap items. Closes #317 2010-12-16 03:29:08 +01:00
GreYFoXGTi cebbecf632 Some Code Improvements and Compiler warnings 2010-12-07 19:44:23 +02:00
GreYFoXGTi 5db203a1ed Mute Evasion 2010-11-26 18:57:18 +02:00
GreYFoXGTi 4f3d086b92 Fixed /pause making u return as a Team 0 Player 2010-11-22 09:21:02 +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
Sworddragon fc9211c777 Updated copyrights 2010-11-20 21:26:06 +01:00
btd 9b5235650d Fix mistake 2010-11-13 01:41:43 +03:00
btd 7fcd245611 Fixes 2010-11-13 00:50:51 +03:00
GreYFoXGTi 505a5b4172 Refactoring 2010-10-29 23:29:07 +02:00
btd 61092f7baa Begin show_others 
Signed-off-by: btd <bardadymchik@gmail.com>
 2010-10-23 23:26:10 +04:00
heinrich5991 0cd8390036 Revert "better spam protection. Closes #82. Feedback Please" 
This reverts commit daac101024.
 2010-10-14 08:42:29 +02:00
GreYFoXGTi daac101024 better spam protection. Closes #82. Feedback Please 2010-10-12 16:13:56 +02:00
GreYFoXGTi 8df6703224 Fixed Player Scores not being sent in the player snap 2010-10-11 20:53:56 +02:00
GreYFoXGTi e7ab496262 Deleted old afk timer by noother, because it's replaced by a Vanilla feature 
Note: we may need to tweak the vanilla features to suite DDRace needs in the future
 2010-10-10 14:36:56 +02:00
GreYFoXGTi 40d2068c70 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/editor/ed_editor.cpp
	src/game/editor/ed_editor.h
	src/game/editor/ed_layer_tiles.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2010-10-10 14:36:02 +02:00
oy cd95f1869e added inactive player kicking. Closes #51 2010-10-09 19:14:42 +02:00
GreYFoXGTi 896634a061 Total Cleanup 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-30 23:28:06 +03: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 68ed9154ae don't add player that aren't ingame to the snapshot and don't let them autospawn. Closes #125 2010-09-22 01:00:33 +02:00
GreYFoXGTi e5bdd8a279 fixed time bug in pause and reconnect 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 15:21:12 +03:00
GreYFoXGTi e061d84f20 Added Ability to Reconnect in the same place as your disconnect 
Decided by sv_max_dc_restore

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 12:34:13 +03:00
GreYFoXGTi 4f22df654e Fixed /pause crash in spectator with out using /pause 1st. 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 09:05:27 +03: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
btd c4fa5c6128 Ugly command invis_me ^_^ seems very funny 2010-09-14 20:56:28 +04:00
btd 0221f68d35 Disable /show_others (for DDRace-Client instead use menu). Fix sending all teams information to new joiners 2010-09-14 15:38:46 +04: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 64c9b5c4ab added quotes around player names in the other server messages too and changed it to ' for consistency 2010-09-12 13:34:30 +02:00
GreYFoXGTi ddb4c2e370 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into teams2 
Conflicts:
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamemodes/DDRace.h
	src/engine/shared/config_variables.h

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-08 22:22:08 +02:00
btd fec294caee Fix linux compilation. Revert last changes. Add /show_other option (in menu now working) 2010-09-08 20:22:11 +04:00
GreYFoXGTi 08040f5487 Added an Option to Disable Eye Emotes 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 07:15:24 +02:00
GreYFoXGTi ebb5636fa3 /pause no longer pauses you time by default 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 06:42:42 +02:00
oy 3857096a20 Put quotes around player names in leave message. 2010-09-07 01:18:06 +02:00
Fujnky 69adb4800e Put quotes around player names in server messages. 2010-09-07 01:11:20 +02:00
btd b67de28a0c Revert conversion float=> char*=>int 2010-08-27 18:28:01 +04:00
btd 510a47a158 Fix Server Best and no needed float -> char* -> int cast 2010-08-26 21:55:04 +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