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 |
|
|
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
|
1705c90e14
|
fixed ban for life on the server
|
2011-07-31 12:43:35 +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
|
0d61c87fa1
|
Added 0.6.0 banmaster by @heinrich5991 #31
|
2011-04-26 11:51:02 +02:00 |
|
|
GreYFoX
|
f322f65f45
|
fixed ban for life
|
2011-04-20 21:25:59 +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 |
|
|
oy
|
59d56cd332
|
finished IPv6 support (master servers aren't compatible with 0.5 and older). Closes #233
|
2011-03-30 12:08:33 +02:00 |
|
|
oy
|
34a9ca20a7
|
added ipv6 support from the old lua branch
|
2011-03-28 20:11:28 +02:00 |
|
|
GreYFoXGTi
|
718d697707
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/game/collision.cpp
src/game/collision.h
src/game/gamecore.cpp
src/game/server/gamecontext.cpp
|
2011-02-13 19:36:53 +02:00 |
|
|
GreYFoXGTi
|
f83132448d
|
Merged Oy, Isolated Freeze from Deep Freeze
|
2011-02-13 19:32:06 +02:00 |
|
heinrich5991
|
825eca4bab
|
added saving of the banreason.
|
2011-02-13 13:31:58 +01:00 |
|
|
GreYFoXGTi
|
d7e4153ec4
|
Added banmaster by heinrich5991
|
2011-02-07 08:25:38 +02:00 |
|
Sworddragon
|
fc9211c777
|
Updated copyrights
|
2010-11-20 21:26:06 +01:00 |
|
Choupom
|
7aefbca742
|
made so we can add the reason for a kick/ban (fixes #123)
|
2010-10-11 00:31:14 +02:00 |
|
|
oy
|
cabecb7fa9
|
added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8
|
2010-08-18 00:06:00 +02:00 |
|
|
oy
|
5988b9d388
|
- show connecting players with rcon status command
- make it possible to limit the number of clients with the same ip that can connect to the server
|
2010-06-03 14:48:32 +02:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|