Commit graph

36 commits

Author SHA1 Message Date
GreYFoX f7f1f72d5c 1.76a 2011-05-09 18:48:03 +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
Choupom 7f15b3ac57 fixed several stuffs 2011-05-03 19:25:11 +02:00
GreYFoX 96cec72681 Version 1.075a 2011-04-20 22:42:13 +02:00
GreYFoX 34d33fc829 Version 1.074a 2011-04-19 16:33:46 +02:00
GreYFoX 89abd3ad81 1.073a 2011-04-15 06:37:02 +02:00
GreYFoX 2a0e272950 1.072a 2011-04-14 01:29:00 +02:00
GreYFoX 4a46168631 Temporarily removed crash features til it's fixed, made version 1.071a
changed some names for the build bot to work
2011-04-12 03:52:01 +02:00
oy 3788d2392d moved to trunk version again and added update for Portuguese translation by Slinack 2011-04-10 02:23:39 +02:00
GreYFoX 32a85dabe3 Fixed some merge mistakes, NOTE: This will be be buggy to say the least 2011-04-09 23:01:10 +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
oy f677b397a3 made 0.6.0 release 2011-04-09 20:42:51 +02:00
GreYFoX 8695fc77bd 1.07a 2011-03-22 23:41:54 +02:00
GreYFoX 8c2ef1f1ea version 1.063a
some default binds
2011-03-17 03:50:07 +02:00
GreYFoX 9e54b25740 Fixed 2 Teams bugs
Added comments so that remembering what CGameTeams::SetForceCharacterTeam does won't be hard
Raised the version so that bug tracking is easier
2011-02-23 14:14:56 +02:00
GreYFoXGTi 937d81c85b Upped the version again to 1.052a just for bug tracking 2011-02-21 00:42:12 +02:00
oy b59c710eba changed netversion to 0.6 2011-02-16 11:32:40 +01:00
GreYFoXGTi d68e853ca7 StickyTeams, TeamStrict Logic and fixed some team bugs 2011-02-14 20:44:02 +02:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
GreYFoXGTi 55c368b679 Formatting
Raised version for statistical analysis
2011-02-08 14:52:23 +02:00
GreYFoXGTi 9d98ce7e72 Version 1.03a 2011-01-30 23:51:14 +02:00
GreYFoXGTi ddc5dd7ab3 Cleaned up & Re-arranged stuff 2011-01-06 05:46:10 +02:00
GreYFoXGTi 1d3660c152 Elevated Version to 1.01a 2010-11-29 05:15:37 +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 862c6544c5 Fixed Server would not shown as compatible version 2010-10-31 04:31:36 +02:00
GreYFoXGTi 505a5b4172 Refactoring 2010-10-29 23:29:07 +02:00
GreYFoXGTi a277c7672c Declared Alpha Testing Stage 2010-10-19 02:03:59 +02:00
GreYFoXGTi 0a9dc07d0c Fixes Issue #5
Changed /info
Fixed anti-rainbowmod

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-07-29 17:54:04 +03:00
GreYFoXGTi 434b4aad86 The Porting of DDRace-Beta to trunk by [BlackTee] den Maps with one and two layer works properly. Laser works. Fix second game layer Re-added logs Readded the rcon commands addvote and scoring system and time Fixed Weapons
Signed-off-by: btd <bardadymchik@gmail.com>
2010-07-29 08:59:32 +03:00
oy 1272c4d805 prevent that the server gets filtered by "compatible version" in the clients server browser 2010-06-06 23:28:34 +02:00
Magnus Auvinen fe5a7105c4 fixed the automatic versioning 2010-05-29 15:20:18 +00:00
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00
Magnus Auvinen a2566b3ebd cleaned up code structure a bit 2007-12-15 10:24:49 +00:00
Magnus Auvinen a0e5181e42 added license info 2007-11-25 19:42:40 +00:00
Magnus Auvinen 0320d20a47 fixed network hash versioning 2007-08-22 21:13:33 +00:00