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
ddnet/src/game/server/entities
History
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
..
character.cpp Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 2011-08-13 02:01:40 +02:00
character.h Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 2011-08-13 02:01:40 +02:00
door.cpp Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
door.h new Switch System //TODO Rendering Rotation 2010-11-14 02:39:04 +02:00
dragger.cpp fixed a crash on toooooooo many draggers 2011-04-18 00:05:56 +02:00
dragger.h new Switch System //TODO Rendering Rotation 2010-11-14 02:39:04 +02:00
flag.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
flag.h Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
gun.cpp Added Plasma Gun tweaking 2011-04-20 15:59:40 +02:00
gun.h Added Plasma Gun tweaking 2011-04-20 15:59:40 +02:00
laser.cpp Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 2011-08-13 02:01:40 +02:00
laser.h Fixing the sound for the laser when a player DCs after shooting it 2011-07-22 15:03:15 +02:00
light.cpp Refactored some stuff in CLight and fixed CLight::Snap 2011-04-19 15:34:59 +02:00
light.h new Switch System //TODO Rendering Rotation 2010-11-14 02:39:04 +02:00
pickup.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
pickup.h Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
plasma.cpp fixed plasma snapping 2011-04-20 16:05:05 +02:00
plasma.h Starting to fix Doors 2010-09-16 23:33:16 +03:00
projectile.cpp 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
projectile.h Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00