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

45 commits

Author SHA1 Message Date
def dcde67b45e Fix 436 2014-01-02 02:27:38 +01:00
def 73dc056d04 Fix 435 2014-01-02 02:26:25 +01:00
def 0bcafcc72b Fix 434 2014-01-02 02:24:49 +01:00
def f1763eee79 Fix 433 2014-01-02 02:23:09 +01:00
def 256ce97ed8 Fix 432 2014-01-02 02:20:27 +01:00
def 28980ef2ba Hopefully fix 64 players 2014-01-02 01:56:09 +01:00
def 3607218f12 Merge ddrace64 from eeeeee 2013-12-31 06:13:57 +01: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
Ravomavain 5b44fae0ce Remove unneeded variables 2011-09-02 12:05:14 +02:00
GreYFoX cc63cf2553 Merge branch 'master' of git://github.com/oy/teeworlds 
Conflicts:
	src/engine/external/pnglite/pnglite.c
	src/engine/external/pnglite/pnglite.h
	src/engine/shared/config_variables.h
	src/game/client/components/menus_browser.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/version.h
 2011-05-09 18:36:13 +02:00
oy 5fbf6d0bfd fixed compiler warnings. Closes #679 2011-05-05 01:43:27 +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 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
GreYFoX 5b4d7a4658 Refactored + fixed sv_hit 0 + laser through others 2011-03-19 22:21:42 +02:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02: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 832bad08e6 Cleanup and Added All Left Masks 2011-01-29 16:18:36 +02:00
GreYFoXGTi 9891ab8a10 Added timer to reduce join-spam when loading a new map by Floff aka LemonFace 
removed an extra line
 2011-01-20 22:25:09 +02:00
GreYFoXGTi 7d6c546fcb DDRace entities no longer uses NETOBJTYPE but instead CGameWorld::ENTTYPE 2011-01-20 22:01:21 +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 7c67a1334c fixed a typo 2011-01-20 01:35:21 +01:00
oy 19a9462fe8 removed double entity list in gameworld and cleaned up connected stuff 2011-01-19 18:27:50 +01:00
oy 1359db5476 prevent that removing an entity aborts traversing the entity list in gameworld 2011-01-19 15:31:42 +01:00
GreYFoXGTi ddc5dd7ab3 Cleaned up & Re-arranged stuff 2011-01-06 05:46:10 +02:00
GreYFoXGTi bed657d805 Merge branch 'master' into DDRace 2010-12-12 04:32:40 +02:00
oy b4c007778c fixed that IntersectCharacter picks the character which is closest to the start point and within the radius 2010-12-12 01:55:36 +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 806046fe76 Merge branch 'master' of http://github.com/btd/DDRace 
Conflicts:
	src/game/server/entities/dragger.cpp
	src/game/server/gamecontext.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-22 03:02:49 +03:00
btd 2af441b703 Finish super team, fix bug with killing, DDraggers not finished 2010-09-21 23:09:11 +04:00
GreYFoXGTi 427fedb79b Starting to fix Doors 
hitted is not a word :p
forgot to change from bool to int
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-16 23:33:16 +03: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 b808d636d5 Revert "Doors can no longer close on Tees" 
i quote Tsin Said "Total Cheat" xD

This reverts commit 0f1d20c5d4.

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 07:36:48 +02:00
GreYFoXGTi 0f1d20c5d4 Doors can no longer close on Tees 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 07:35:30 +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 ab3f4b6a15 made return type bool 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-31 15:22:54 +02:00
GreYFoXGTi 4dcf0d8d3b found an easier and better way :) with much much less processing 
tested and working well
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-31 15:19:01 +02:00
btd e396813e32 Add new method which find all characters on line. Fix bug of doors, need to test 2010-08-31 15:01:46 +04:00
GreYFoXGTi 6bb5fcf316 Implementing the FrontLayer 
Also trimmed the trailings

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-20 23:48:33 +02:00
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00
Alfred Eriksson a92c6d44dc merge from 0.4.3: notification on auto team balance 2008-09-07 08:57:59 +00:00
Magnus Auvinen 78c089c0ea last of the game server clean up. now it's done 2008-08-14 18:42:47 +00:00