edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-14 03:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
4173 commits 1 branch 429 tags 411 MiB
Commit graph

75 commits

Author SHA1 Message Date
def 3eaad43b6b Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace 
Conflicts:
	bam.lua
	data/languages/index.txt
	src/engine/server/server.cpp
	src/engine/shared/network_server.cpp
	src/game/client/components/chat.cpp
	src/game/client/components/menus_settings.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/version.h
 2013-12-26 18:02:22 +01:00
def bb46b6acbf Version 1.26 2013-12-23 20:43:36 +01:00
def 83c9744dc8 Version 1.25 2013-12-20 03:34:20 +01:00
def c6cca39ace Version 1.24 2013-12-18 16:56:20 +01:00
def f944ce1099 Version 1.23 2013-12-17 14:49:46 +01:00
def e34384a5a7 Push version to 1.22 2013-11-22 15:12:50 +01:00
def 3ed74bc730 Version 1.21 2013-10-30 09:27:31 +01:00
def 64d7b6a117 Push version: 1.20 2013-10-25 03:24:55 +02:00
def 16918aa3a1 Push version 2013-10-18 11:50:50 +02:00
def 9596cf385b Version 1.18 2013-10-09 16:27:48 +02:00
def 3032567028 Version 2013-10-07 23:56:11 +02:00
def ce2f689e5f Version 2013-08-30 19:00:29 +02:00
oy 2f1389e5cd fixed version string of the versionserver 2013-02-25 22:31:30 +01:00
oy f010791231 added options for the threaded stuff in the menu and set version 2013-02-24 19:43:09 +01:00
Shereef Marzouk 4c95ed5006 Version Bump to 1.15a. (Closes #198) 2013-02-01 13:25:28 +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
Shereef Marzouk 53225b718d Version 1.13a 2012-04-11 15:44:18 +03:00
oy 590dbac239 put the game version constants all together in one file. Closes #870 2012-01-09 02:02:02 +01:00
GreYFoX 7820e48ec6 Minor changes 2011-12-31 01:33:11 +02:00
GreYFoX 2baa440866 Happy New Year, all tees are now born happy, Version v1.11 2011-12-29 14:39:51 +02:00
GreYFoX 49e875e3a3 v1.1a 2011-12-26 14:07:57 +02:00
GreYFoX ee115b5346 Version update 2011-12-25 15:34:07 +02:00
Shereef Marzouk 1871207bfe Version and Credits 2011-12-14 17:05:48 +02:00
GreYFoX 1446d0980b Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 
* Version 1.098a
Conflicts:
	bam.lua
	src/game/client/gameclient.h
	src/game/mapitems.h
 2011-12-05 11:32:01 +02:00
GreYFoX 077217a802 incremented version 2011-12-01 19:51:51 +02:00
GreYFoX eda127392a 0.6 trunk, 1.096a 2011-09-05 15:51:58 +02:00
GreYFoX 37d3bfee81 0.6 trunk, 1.095a 2011-09-02 22:25:38 +02:00
GreYFoX 5035506825 Fixed team collision and 0.6 trunk, 1.094a 2011-09-01 20:29:08 +02:00
GreYFoX dd3568338f 0.6 trunk, 1.093a 2011-08-31 23:37:04 +02:00
GreYFoX aad11d2cae 0.6 trunk, 1.092a 2011-08-31 23:00:00 +02:00
GreYFoX 7e24be5d83 Version 1.091a 2011-08-31 12:10:15 +02:00
GreYFoX 5b27758650 Removed level stuff 
Removed client ID stuff
Removed console stuff
Resolved merge conflicts
Upgraded Banmaster
Cleaned up
 2011-08-13 02:11:06 +02:00
oy 72eb98c75e changed to trunk again 2011-08-05 19:52:33 +02:00
oy 50edfd37c0 made 0.6.1 release 2011-07-31 23:17:00 +02:00
GreYFoX 831aea796e Saving hitting status on pause 2011-07-25 21:15:51 +02:00
GreYFoX d7fe844690 1.082a 2011-07-22 14:33:07 +02:00
GreYFoX a6922db418 1.081a 2011-07-19 23:33:46 +02:00
GreYFoX 413bf4a39e Credits and version 1.08a 2011-06-07 16:48:01 +02:00
GreYFoX 25f69d704b Version 1.77a, Beware this version maybe buggy contains more than one untested/unrevised commits, but from trusted Developers 2011-06-01 17:06:00 +02:00
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