Choupom
|
7f15b3ac57
|
fixed several stuffs
|
2011-05-03 19:25:11 +02:00 |
|
GreYFoX
|
0d61c87fa1
|
Added 0.6.0 banmaster by @heinrich5991 #31
|
2011-04-26 11:51:02 +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
|
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
|
04a3b7be00
|
fixed problem with recorded demo files. Closes #570
|
2011-04-02 11:55:37 +02:00 |
|
oy
|
2a72c0b38b
|
added a mechanism to check for a valid standard map. Closes #132
|
2011-03-31 15:13:49 +02:00 |
|
oy
|
34a9ca20a7
|
added ipv6 support from the old lua branch
|
2011-03-28 20:11:28 +02:00 |
|
Sebastian Wojtowicz
|
500605cbee
|
Server utf8 Conversion
|
2011-03-22 21:04:27 +02: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 |
|
oy
|
d9ce720387
|
made engine an interface
|
2011-02-27 15:03: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 |
|
GreYFoXGTi
|
d7e4153ec4
|
Added banmaster by heinrich5991
|
2011-02-07 08:25:38 +02:00 |
|
GreYFoXGTi
|
9891ab8a10
|
Added timer to reduce join-spam when loading a new map by Floff aka LemonFace
removed an extra line
|
2011-01-20 22:25:09 +02:00 |
|
GreYFoXGTi
|
b502e6fd28
|
Fixed warnings and some white spaces
|
2011-01-12 11:10:57 +02:00 |
|
GreYFoXGTi
|
ddc5dd7ab3
|
Cleaned up & Re-arranged stuff
|
2011-01-06 05:46:10 +02:00 |
|
GreYFoXGTi
|
63961ecf1a
|
fixed mute evasion + kick
|
2010-12-19 07:25:01 +02:00 |
|
GreYFoXGTi
|
cebbecf632
|
Some Code Improvements and Compiler warnings
|
2010-12-07 19:44:23 +02:00 |
|
GreYFoXGTi
|
122c7954d9
|
Announcement Randomness
|
2010-12-06 04:27:35 +02:00 |
|
GreYFoXGTi
|
eed83bd7cb
|
Added Announcement
|
2010-11-22 13:00:43 +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 |
|
heinrich5991
|
c54b824a45
|
fixed 'cmdlist' rcon command for joining clients
|
2010-11-11 23:22:09 +01:00 |
|
heinrich5991
|
6f35687e03
|
added system to generalize rcon commands
|
2010-11-07 16:29:55 +01:00 |
|
GreYFoXGTi
|
caec5ada0f
|
should fix linux compilation as reported by Mo(2) thanks Mo(2)
|
2010-10-16 22:28:54 +02:00 |
|
GreYFoXGTi
|
d8e6cfcbdd
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
data/languages/french.txt
src/engine/client/client.cpp
src/engine/server/server.cpp
src/game/server/gamecontext.cpp
|
2010-10-11 03:56:58 +02:00 |
|
GreYFoXGTi
|
ed3299be05
|
more cleanup
|
2010-10-11 03:50:43 +02: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
|
332fb1de09
|
chat commands redirect to rcon and vice versa by heinrich5991
|
2010-10-11 00:40:07 +02:00 |
|
Choupom
|
7aefbca742
|
made so we can add the reason for a kick/ban (fixes #123)
|
2010-10-11 00:31:14 +02:00 |
|
GreYFoXGTi
|
ef139eb73a
|
Cleanup (Putting stuff back vanilla like)
|
2010-10-10 16:11:11 +02:00 |
|
btd
|
9de4dad6ac
|
Server dislike this map, but dont crash. Closes #12
|
2010-10-09 00:08:34 +04:00 |
|
GreYFoXGTi
|
2ba462158d
|
Removed custom stuff that are now in vanilla tw by defaults
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-19 21:47:25 +03:00 |
|
GreYFoXGTi
|
67a5765c9f
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/engine/server/server.cpp
src/engine/shared/config_variables.h
src/game/client/components/camera.cpp
src/game/client/components/camera.h
src/game/editor/ed_editor.cpp
src/game/editor/ed_layer_tiles.cpp
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-19 21:27:40 +03:00 |
|
GreYFoXGTi
|
1eb4441d14
|
Removed auth and added logout, helper, moder and admin
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-17 17:23:07 +03:00 |
|
GreYFoXGTi
|
b73ce9b42f
|
Implemented auth id 0
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-17 16:47:31 +03:00 |
|
oy
|
7714454829
|
added maximum number of tries for rcon authentication
|
2010-09-16 13:06:11 +02:00 |
|
GreYFoXGTi
|
fa379a806a
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/engine/server/server.cpp
src/game/client/components/scoreboard.cpp
src/game/server/gamecontext.cpp
src/game/server/player.cpp
|
2010-09-13 07:49:01 +03:00 |
|
oy
|
0c1261620f
|
prevent self kick/ban in the console. Closes #50
and fixed line endings
|
2010-09-12 13:52:25 +02:00 |
|
GreYFoXGTi
|
616498e7b1
|
Merge branch 'master' of http://github.com/oy/teeworlds into master
Conflicts:
src/engine/client/input.h
src/engine/server/server.cpp
src/engine/shared/config_variables.h
src/engine/shared/network_server.cpp
src/engine/storage.h
src/game/client/components/chat.cpp
src/game/client/gameclient.cpp
src/game/client/gameclient.h
src/game/collision.cpp
src/game/editor/ed_editor.cpp
src/game/editor/ed_editor.h
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/server/gamemodes/ctf.cpp
src/game/server/player.cpp
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-07 07:57:38 +02:00 |
|
Choupom
|
885d695f92
|
show map name without his folder in server info
|
2010-09-05 14:11:56 +02:00 |
|
oy
|
41afca6db2
|
added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8
|
2010-08-25 01:17:02 +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 |
|
btd
|
9c052398f4
|
Last changes added. All fixed. Server builded.
Need many test before release.
Signed-off-by: btd <bardadymchik@gmail.com>
|
2010-07-30 16:50:09 +04:00 |
|
btd
|
7f42b6225b
|
To the last DDRace. Need a lot fix
|
2010-07-29 23:55:33 +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 |
|
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 |
|
NoxNebula
|
9a5a19e7c7
|
Admin-Kick-Protection
Add IsAuthed(int ClientID); function.
Add kickprotection for admins (Remote Console logged in players)
Add Anti-Self-Kick (minor)
|
2010-06-02 09:40:08 +02:00 |
|
Thomas
|
361380d630
|
*some esthetic changes
*split "CHud::RenderGoals()"
*added "reload" command
*added the ability to show last chat lines (+show_chat)
*updated french.txt
|
2010-05-30 12:01:11 +00:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|