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 |
|
oy
|
de05682d87
|
fixed play hooking when tune player_collision is 0. Closes #825
|
2011-08-06 13:57:59 +02:00 |
|
|
oy
|
9e5ead2fbd
|
fixed nethash
|
2011-07-30 22:30:26 +02:00 |
|
|
oy
|
571dff6216
|
made rcon auto completion serverside. Closes #97
|
2011-07-14 22:07:21 +02:00 |
|
|
oy
|
9efa0e3f63
|
fixed nethash 4 real
|
2011-06-09 23:28:40 +02:00 |
|
|
oy
|
b48c59225a
|
fixed nethash
|
2011-06-09 22:19:01 +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
|
43a6c02263
|
fixed the nethash
|
2011-04-13 20:48:50 +02:00 |
|
|
oy
|
1a5d70450f
|
added "reimplemented menu music by teetow-the-great-teetow" by Choupom
|
2011-04-13 20:00:54 +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
|
974f429957
|
Added git revision to several places
|
2011-03-18 01:21:07 +02:00 |
|
|
oy
|
b59c710eba
|
changed netversion to 0.6
|
2011-02-16 11:32:40 +01:00 |
|
|
oy
|
3c7adc6a7f
|
fixed nethash
|
2011-02-13 13:06:19 +01:00 |
|
|
oy
|
127fca31f2
|
fixed nethash
|
2011-02-12 22:29:24 +01:00 |
|
root
|
75f854584d
|
Fixed wrong nethash creation with Python 3
|
2011-02-09 12:39:29 +01:00 |
|
|
oy
|
b5b33b45fa
|
added more python 3 support by Sworddragon
|
2011-01-29 20:00:39 +01:00 |
|
|
oy
|
9c6843946c
|
added Python 2.5 - Python 3.2 support by Sworddragon
|
2011-01-29 18:55:21 +01:00 |
|
|
oy
|
3c1eee2a12
|
reverted Python 3 support fixes to keep compatibility with 2.5
|
2011-01-20 01:28:17 +01:00 |
|
fisted
|
372b62566b
|
fixed tower bug
|
2011-01-20 00:15:18 +01:00 |
|
|
oy
|
232aafa891
|
added Python 3 support fixes by Sworddragon
|
2011-01-17 15:48:57 +01:00 |
|
|
oy
|
e71263d686
|
fixed last commit
|
2011-01-06 12:41:24 +01:00 |
|
Sworddragon
|
4ff61fcdaa
|
Made compiling process Python 3 compatible
|
2011-01-06 12:27:50 +01:00 |
|
|
oy
|
a72848e780
|
added constants for teams by Choupom
|
2011-01-03 12:50:38 +01:00 |
|
Magnus Auvinen
|
fe5a7105c4
|
fixed the automatic versioning
|
2010-05-29 15:20:18 +00:00 |
|
|
Magnus Auvinen
|
d754cd9d19
|
updated cmd5.py
|
2009-06-07 14:40:58 +00:00 |
|
|
Magnus Auvinen
|
bc108df382
|
renamed everything. added the new license
|
2008-03-22 18:40:27 +00:00 |
|
|
Magnus Auvinen
|
0320d20a47
|
fixed network hash versioning
|
2007-08-22 21:13:33 +00:00 |
|