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

93 commits

Author SHA1 Message Date
GreYFoXGTi 29c9bf531d Fixed merge errors 2011-02-14 09:43:44 +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
oy 3f05289328 fixed a possible problem with occupied spawn points and cleaned up spawn code a bit 2011-02-10 12:05:55 +01:00
GreYFoXGTi 2c36457b94 Fixed warnings 2011-02-05 03:33:53 +02:00
GreYFoXGTi 832bad08e6 Cleanup and Added All Left Masks 2011-01-29 16:18:36 +02: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 19a9462fe8 removed double entity list in gameworld and cleaned up connected stuff 2011-01-19 18:27:50 +01:00
oy 99e9d4910a fixed that team mates are regarded when evaluating the spawn position. Closes #426 2011-01-17 15:55:23 +01:00
oy 40f6740742 fixed few spelling mistakes and disabled an unused command 2011-01-17 12:56:49 +01:00
GreYFoXGTi 21994e017f fixed warnings 2011-01-06 14:21:44 +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 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 af44a79b03 New Broadcast/Timer System 2010-11-30 04:24:15 +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
GreYFoXGTi ae591407c9 Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-17 13:11:40 +02:00
oy 0d1178107e fixed typo in a kick message 2010-11-17 00:44:04 +01:00
GreYFoXGTi b6a4b2b7ba Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-16 22:11:24 +02:00
oy e46cb02089 Made inactivity check ignore authed players. Closes #273 2010-11-16 18:08:19 +01:00
GreYFoXGTi 071fb6a5a3 new Switch System //TODO Rendering Rotation 2010-11-14 02:39:04 +02:00
GreYFoXGTi 6ebac7a214 forgot to delete this dbg_msg 2010-11-01 12:19:01 +02:00
GreYFoXGTi e43bcd80db Rotation 
FTW
 2010-11-01 03:51:17 +02:00
heinrich5991 4d6370d890 fixed last commit, removed debug messages 2010-10-18 20:52:29 +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 90a0ba17f0 Fix change_map. Closes #73. 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-10-08 22:12:12 +02:00
GreYFoXGTi 5f0cf76e4f Revert "Reworked laser rotation. Opens #59." 
This reverts commit be122406ef.
 2010-10-07 15:28:29 +02:00
btd b07cc717d4 Fix plasmas 2010-10-04 11:45:10 +04:00
GreYFoXGTi be122406ef Reworked laser rotation. Closes #59. 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-10-02 00:00:41 +02:00
btd 5db7748af4 Fix ddraggers 2010-09-22 14:43:59 +04:00
btd 7ed685ee11 Merge 2010-09-11 13:42:35 +04:00
GreYFoXGTi 72e05efc53 Added Evil Teleporter, 
Added Speed Setters to speedup layer
Added Unfreeze Plasma
Supposedly Fixed Crazy Shotgun (needs Testing)

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-11 02:01:15 +02:00
btd 4eadf3029b Finish doors. Door hits all characters, check on activating team and send in snapshot only needed information 2010-09-01 12:52:59 +04:00
GreYFoXGTi 15542a6c20 Fixed doors and lasers not affect more than 1 player, but there is something wrong, i need sleep, this sometimes compiles and runs perfectly and some times it compiles but runs buggy, need to correct CLight::HitCharacter and CDoor::HitCharacter 
also did some refactoring

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-31 08:25:21 +02:00
btd b0d8bfca03 Merge 2010-08-29 14:44:15 +04:00
GreYFoXGTi 22fc13c692 Fixed crazy shotgun bullets explosion collision when sv_hit = 0 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-29 04:24:43 +02:00
btd faf743b02a Merge branch 'master' of git://github.com/GreYFoXGTi/DDRace into teams 2010-08-29 01:05:02 +04:00
btd 366e175983 Logic and scores seems done. Next will be collision 2010-08-29 00:53:42 +04:00
GreYFoXGTi 8426442936 Separated Freezing Plasma gun from Explosive Plasma gun and added one with both 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-28 22:32:16 +02:00
GreYFoXGTi c6803b405f Removed Old Door System 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-28 21:38:13 +02: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
oy 8cb15be7c0 added fixes for compiler errors and warnings by sworddragon 2010-08-24 23:44:33 +02:00
GreYFoXGTi 51c6af1303 SvShotgunBulletSound 
also added protection to shotgun stucks, needs to be tested when a random crazy shotgun bullet gets stuck
loaded the score file before saving to avoid corruption
added freeze and unfreeze in rcon
added protection in some rcon commands

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-23 23:40:23 +02:00
GreYFoXGTi 3580547297 Fixed NoWall Draggers 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-21 19:32:42 +02:00
GreYFoXGTi 19e379afdf Updated GetTile for FrontLayer 
Added dbg_msg check

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-21 19:25:10 +02:00