XXLTomate
f9e4547b31
fixing the console (2)
2012-01-28 11:14:31 +01:00
GreYFoX
ee670118a5
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
...
Conflicts:
src/engine/console.h
src/engine/server/server.cpp
src/engine/server/server.h
src/engine/shared/config.h
src/engine/shared/console.cpp
src/engine/shared/console.h
src/engine/shared/network_server.cpp
@heinrich5991 todo
2012-01-01 00:11:56 +02:00
oy
c975390195
made vote ban check if the ip matches an authed player
2011-12-31 12:11:48 +01:00
oy
8052ddf0ff
fixed compiling
2011-12-30 19:35:57 +01:00
oy
ec4bb94537
added logout command for econ
2011-12-30 19:12:31 +01:00
oy
1bb64d7534
fixed last commit
2011-12-30 00:07:17 +01:00
Learath2
81e6cf6f83
Added logout command. Closes #903
2011-12-29 23:53:07 +01:00
oy
b44ee3d975
reworked ban system
2011-12-29 23:36:53 +01:00
oy
4c73eab869
fixed empty player names based on utf8 characters. Closes #904
2011-12-29 13:34:13 +01:00
eeeee
0c16a58563
enforce upper limit on minutes to prevent unix timestamp from overflowing
2011-12-14 13:47:49 +01: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
oy
8e0ce38e29
fixed sv_max_client usage
2011-12-04 16:51:33 +01:00
Choupom
b2a825652d
added a command to unban all
2011-12-04 14:22:59 +01:00
GreYFoX
b75a26eed9
Fixed the console
2011-08-26 20:03:30 +02:00
Ravomavain
47a1e2b230
Fix banmaster compilation. Fix some sign-compare warnings
2011-08-26 16:28:13 +02:00
GreYFoX
de4a95c5d2
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611
2011-08-20 06:50:06 +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
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
Shereef Marzouk
c6fd4a2cc5
General whitespace and tab cleanup
2011-08-11 10:59:14 +02:00
oy
435639636e
Merge pull request #808 from SushiTee/master
...
fixed a warning
2011-08-03 13:53:18 -07:00
Shereef Marzouk
c1b23535ff
fixed typo
2011-08-02 12:14:23 +02:00
SushiTee
370b93d8e1
fixed a warning
2011-08-01 12:11:10 +02:00
oy
3209aec45f
fixed compiling error on osx
2011-07-31 13:17:38 +02:00
oy
1705c90e14
fixed ban for life on the server
2011-07-31 12:43:35 +02:00
oy
9349af0085
clean up econ sockets on shutdown. Closes #804
2011-07-31 02:20:46 +02:00
oy
94bdd95957
added missing newlines at end of 2 files
2011-07-30 18:29:40 +02:00
Johannes Loher
e2664c1b00
Added server sided automatic demo recording
2011-07-30 18:23:59 +02:00
oy
0f11cf014c
increased length for help string of temporary commands
2011-07-30 18:19:15 +02:00
oy
a0a62bcd70
fixed econ feature and tcp
2011-07-30 13:40:01 +02:00
heinrich5991
2ba6fbd731
added econ functionality
2011-07-29 17:51:14 +02:00
Choupom
6b2dc40570
fixed a rcon authentication issue
2011-07-20 21:49:38 +02:00
oy
571dff6216
made rcon auto completion serverside. Closes #97
2011-07-14 22:07:21 +02:00
oy
f440944905
fixed problem with rcon authentication
2011-07-08 00:00:38 +02:00
oy
e37d536fdf
fixed some NETTYPE usage based on the socket state
2011-07-07 01:48:00 +02:00
oy
1ae474689d
added moderator support for the remote console. #518
2011-07-05 21:54:10 +02:00
Romain Labolle
813f689957
Tune reset clean up ( fix #50 )
...
* Removing old unused DDRaceTunesReset() function.
* Adding ResetTuning() function to reset tunes.
* Adding ResetTuning() and some settings reset (sv_hit/sv_endless_drag/sv_old_laser) to CGameContext::OnInit() which is loaded on each map load.
GreYFoX:
Repositioned the new Functions
2011-06-01 16:43:20 +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
0d61c87fa1
Added 0.6.0 banmaster by @heinrich5991 #31
2011-04-26 11:51:02 +02:00
GreYFoX
87dc38ee06
fixed hiding reserved slots from server browser by @heinrich5991
2011-04-20 17:04:34 +02:00
GreYFoX
768e6b9291
Added todo
2011-04-17 19:13:55 +02:00
oy
73bc6afb67
decreased the length of built in client names
2011-04-16 18:41:44 +02:00
GreYFoX
a2e4e9c050
Fixed CServer::SetRconLevel
2011-04-15 05:19:11 +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
heinrich5991
c83c7b1a19
reworked IConsole::PrintResponse to IResult::Print (and obviously CConsole::PrintResponse to CResult::Print)
2011-04-14 00:34:10 +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
3fc6e2d2eb
prevent empty nicknames. Closes #616
2011-04-06 17:53:05 +02:00
oy
caf6e98ccb
fixed server crash on "bans" command
2011-04-06 17:30:50 +02:00