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 |
|
heinrich5991
|
b6fa69cedb
|
the server shows the disconnect reason of clients now
|
2011-04-01 00:05:35 +02:00 |
|
|
oy
|
34a9ca20a7
|
added ipv6 support from the old lua branch
|
2011-03-28 20:11:28 +02:00 |
|
|
oy
|
96808a1145
|
made it possible to just show the number of player slots of a server (instead of client ones). Closes #68
|
2011-03-20 15:33:49 +01:00 |
|
|
oy
|
30d9c9f4d9
|
made network support clan name and country code for players
|
2011-03-15 11:23:49 +01:00 |
|
|
oy
|
27e5a6af0d
|
made clients sending startinfo a requirement to prevent empty player infos
|
2011-03-15 09:58:57 +01:00 |
|
|
heinrich5991
|
3d0aab503f
|
rewritten mutes
|
2011-02-23 23:45:31 +02:00 |
|
|
oy
|
d939b84125
|
removed no longer needed progression browse info
|
2011-02-16 12:31:47 +01:00 |
|
|
GreYFoXGTi
|
f83132448d
|
Merged Oy, Isolated Freeze from Deep Freeze
|
2011-02-13 19:32:06 +02:00 |
|
|
GreYFoXGTi
|
1b2703aaba
|
Refactoring & fixed WEAPONSPEC_GUN in content.py
|
2011-02-12 21:18:41 +01:00 |
|
|
heinrich5991
|
bf62514088
|
added some DDRace flags for the server browser (server-sided), client-sided still needed
|
2010-12-19 14:11:14 +01: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
|
040ba467bf
|
Changed The lowest level to -1 ( has chat but no rcon )
made rcon for level 0 open by default users can use logout or login/auth or in normal consol rcon_auth to raise their level
|
2010-10-11 02:39:08 +02:00 |
|
|
GreYFoXGTi
|
ef139eb73a
|
Cleanup (Putting stuff back vanilla like)
|
2010-10-10 16:11:11 +02:00 |
|
|
GreYFoXGTi
|
40d2068c70
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/game/editor/ed_editor.cpp
src/game/editor/ed_editor.h
src/game/editor/ed_layer_tiles.cpp
src/game/server/gamecontroller.cpp
src/game/server/player.cpp
src/game/variables.h
|
2010-10-10 14:36:02 +02:00 |
|
|
oy
|
cd95f1869e
|
added inactive player kicking. Closes #51
|
2010-10-09 19:14:42 +02:00 |
|
btd
|
227c03cbb1
|
Fix mistake
|
2010-08-07 22:49:57 +04: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 |
|
NoxNebula
|
dd19074deb
|
Admin-Kick-Protection
Add IsAuthed(int ClientID); function.
Add kickprotection for admins (Remote Console logged in players)
Add Anti-Self-Kick (minor)
|
2010-06-03 03:27:34 +08:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|