edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-21 18:14:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
3828 commits 1 branch 424 tags 417 MiB
Commit graph

72 commits

Author SHA1 Message Date
eeeee 56ad4f3c73 prevent bullets from drifting 2013-02-01 13:12:33 +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 dfe91338f0 added pause command. Closes #15 2012-01-10 00:49:31 +01:00
GreYFoX 8b09813288 old useless todo 2011-12-26 11:56:12 +02:00
GreYFoX 8c103b8c13 * Added a new tile to facilitate solo parts ( works with teams ) 
* Can now put tiles with the same indexes as in tele or switch layer i game layer but it will drawn to the correct image
* Adjusted Masking to account for Solo players
 2011-09-02 20:04:18 +02:00
Ravomavain 5b44fae0ce Remove unneeded variables 2011-09-02 12:05:14 +02:00
GreYFoX 74462d4611 enumerated laser types, made it possible to choose which weapon to disable using switch layer delay variable 2011-07-25 22:16:20 +02:00
GreYFoX 3d07ffdbdd Added the Missing Single Tee No Hitting Logic 2011-07-21 03:13:59 +02:00
GreYFoX f5d38a84f9 formatting 2011-04-19 15:15:40 +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
oy 06115dd49d added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
GreYFoX 03095b5ecf Nothing 2011-04-12 00:27:52 +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
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
GreYFoXGTi 832bad08e6 Cleanup and Added All Left Masks 2011-01-29 16:18:36 +02:00
GreYFoXGTi 5b51295185 Added Deep freeze/unfreeze to switch layer so that it can be controlled with switches 
fixed the freeze command

Added Freeze Tile to switch layer to set freeze tile custom delay

Added sv_freeze_delay to control default freeze time delay
 2011-01-25 12:05:53 +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
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 df47aedbfe reset flags and projectiles when leaving the game layer too much. Closes #385 2011-01-08 11:34:19 +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 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 6f75b661b0 Total Noobness 2010-11-14 17:51:04 +02:00
GreYFoXGTi f60817b5c0 Different Flicker for Crazy Bullets 2010-11-14 12:13:11 +02:00
GreYFoXGTi 4486a7abed Added Alive Check 2010-11-14 12:08:21 +02:00
GreYFoXGTi 3c1c045722 Added Flicker effect to NON-Active Entities 2010-11-14 12:01:42 +02:00
GreYFoXGTi bf0b4183cc Fixed bullet wall stuck when de activated and collides with a tee 2010-11-14 11:36:00 +02:00
GreYFoXGTi 5ec06369c5 fixed last pull commit 2010-11-14 03:32:23 +02:00
GreYFoXGTi 670e90c7e3 Merge branch 'master' of http://github.com/btd/DDRace 
Conflicts:
	src/game/server/entities/door.cpp
 2010-11-14 03:32:00 +02:00
GreYFoXGTi 071fb6a5a3 new Switch System //TODO Rendering Rotation 2010-11-14 02:39:04 +02:00
btd 002cf9792f Fix project tile 2010-11-13 18:41:43 +03:00
btd cd59d111a8 Fix explosion issue. Dont pull, not tested. Can pull if test both commits=) 2010-11-11 12:12:03 +03:00
btd d4d519c3ef Fix teams show_others 2010-10-23 16:15:29 +04:00
GreYFoXGTi ce03f911d8 lol :) 2010-10-11 20:19:13 +02:00
GreYFoXGTi dff5a70b91 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 
Conflicts:
	src/game/editor/ed_editor.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
 2010-10-02 03:32:44 +02:00
GreYFoXGTi 5bdb8090af Fixed Projectile Team mask 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-10-02 03:25:42 +02:00
GreYFoXGTi 5bc075afe3 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-09-30 23:51:07 +03:00
GreYFoXGTi 2f08f74318 Fixed Projectiles Snapping 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-30 23:49:23 +03:00
GreYFoXGTi 896634a061 Total Cleanup 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-30 23:28:06 +03:00
btd 99f5a1d767 Fix projecttile 2010-09-22 23:01:09 +04:00
btd 2af441b703 Finish super team, fix bug with killing, DDraggers not finished 2010-09-21 23:09:11 +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
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 1fe93f4592 Reworked the Crazy Shotgun, and fixed a bug ( still needs testing ) 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 07:47:10 +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