Commit graph

79 commits

Author SHA1 Message Date
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 ddbef31cb5 updated git ignore file 2012-01-29 12:39:00 +01:00
Ravomavain 74de1972a1 Add binaries to .gitignore 2012-01-01 00:15:14 +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
Sworddragon 7a772f4e20 Updated .gitignore 2011-04-03 22:35:16 +02:00
Choupom fa79602522 fixed freetype.dll entry in .gitignore 2011-04-02 18:11:21 +02:00
oy 147095fc07 added update to version 2.4.4 and dynamic library for freetype by Sworddragon. Closes #77. Closes #513 2011-03-27 13:09:10 +02:00
Romain Labolle 8a3cb8d472 Adding banmaster binary to .gitignore 2011-02-21 21:41:25 +02:00
GreYFoXGTi 24a688b2c3 Added AutoDemoRecord and ghost made by Race mod team, implemented to DDRace by noother 2011-02-04 22:15:02 +02:00
Floff Floffsson 8860202172 'invalid' char in .gitignore... 2011-01-14 17:26:52 +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
Choupom 3f9708b263 added some .gitignore entries 2011-01-11 21:43:45 +01:00
GreYFoXGTi 6889adc0bb Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	.gitignore
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h & Cleaned it up
2011-01-06 23:32:19 +02:00
Sworddragon b90a015daf Added entries in .gitignore 2011-01-06 12:22:07 +01:00
GreYFoXGTi ddc5dd7ab3 Cleaned up & Re-arranged stuff 2011-01-06 05:46:10 +02:00
GreYFoXGTi 4c4544da12 Added bam.lua changes by SushiTee 2010-12-01 20:52:00 +02:00
GreYFoXGTi 0c6767dd9d Added option to have DDRace Compiled without SQL 2010-11-16 15:44:16 +02:00
GreYFoXGTi 5837b71a73 added pdb to gitignore
Helpers can now use me as victim as well
2010-11-13 11:55:17 +02:00
GreYFoXGTi 921dd65d3d Added id numbers to the scoreboard. Closes #71.
added shortcuts to the gitignore
2010-10-12 15:12:44 +02:00
GreYFoXGTi 3b3b008fda added Eclipse stuff to ignore
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-30 23:40:02 +02:00
GreYFoXGTi 4d5af54f5b added patches to ignore
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-28 18:21:50 +02:00
GreYFoXGTi c5a8160e4d Updated Git Ignore and reset FreezeTick
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-26 20:14:14 +02:00
GreYFoXGTi 7f8fb7a5a7 Merging the client manually into the server
but i can't get the client to accept the console class of the server -.-" yet..

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-25 17:31:49 +02:00
GreYFoXGTi 0fc74db57a changed gitignore
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-24 23:42:08 +02:00
GreYFoXGTi e3dffbb741 Making the Mod Cooler ( Pimp My Mod ) xD
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-22 06:28:14 +02:00
GreYFoXGTi 122fcef8b6 Updated gitignore 2010-08-12 15:15:58 +03:00
btd 534081a3fe Fix emo color 2010-07-30 20:14:53 +04:00
btd 9c052398f4 Last changes added. All fixed. Server builded.
Need many test before release.

Signed-off-by: btd <bardadymchik@gmail.com>
2010-07-30 16:50:09 +04:00
Magnus Auvinen 143af11a25 added a .gitignore file 2010-06-17 10:34:51 +02:00