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
oy
4ad6d2f01e
fixed problem with sv_bindaddr on the server
2011-04-04 18:20:05 +02:00
heinrich5991
b6fa69cedb
the server shows the disconnect reason of clients now
2011-04-01 00:05:35 +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
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
GreYFoX
45f3cf042a
Fixed a login with cheats
...
Renamed a constant
2011-03-18 00:17:01 +02:00
GreYFoX
0cbcdd027a
Removed Helper made Moderators able to moderate only
...
Enumerated levels
http://ddrace.info/forum/showthread.php?t=528
or modify the server and change the game type to something other than DDRace thank you
2011-03-16 16:27:30 +02:00
GreYFoX
16c074741f
To have Cheats you must set a password and sv_register 0
...
http://ddrace.info/forum/showthread.php?t=528
or modify the server and change the game type to something other than DDRace thank you
2011-03-16 15:41:26 +02:00
GreYFoX
cccfb09e32
Reverted Team to it's old state without leader or Strict until it's reworked
2011-03-16 15:14:25 +02:00
oy
7412fabb9c
made serverinfo use clan name and country code for players
2011-03-16 12:37:41 +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
oy
50b266086b
made dbg_dumpmem and dbg_lognetwork work again
2011-03-05 11:46:24 +01:00
oy
0ae19e1339
removed support for old server infos
2011-03-04 18:14:08 +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
oy
b63dbfede5
fixed problems with map downloading if the map changes during download. Closes #236
2011-02-16 12:07:54 +01:00
GreYFoXGTi
604ae5286f
Several Fixes and some more on the way
2011-02-14 23:34:46 +02: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
09068d91a4
Compiler warnings
2011-02-08 18:58:36 +02:00
GreYFoXGTi
750b20f544
fixed banmaster.cfg run level
2011-02-07 08:53:41 +02:00
GreYFoXGTi
d7e4153ec4
Added banmaster by heinrich5991
2011-02-07 08:25:38 +02:00
GreYFoXGTi
4ca79188dc
DDRace Flags Finalized
2011-02-05 06:13:32 +02:00
GreYFoXGTi
9db333dfee
Re-enabled flag sending
2011-02-05 03:14:17 +02:00
GreYFoXGTi
e32b52b57a
don't send the DDRace flags until i change them to their final look
2011-02-01 00:45:25 +02:00
GreYFoXGTi
f1b002e7fa
DDRace flags for the server browser (client-sided).
...
Some fixes in the server sided part.
One task left, Adding the flags to SortHash(), added Todo in the code.
2011-01-30 18:21:41 +02:00
Floff Floffsson
8c32c01653
added unmute + some minor fix
2011-01-20 22:27:54 +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
2151883b43
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/gamecore.cpp
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/entities/pickup.cpp
src/game/server/entities/projectile.cpp
src/game/server/entity.h
src/game/server/gamecontext.cpp
src/game/server/player.cpp
src/game/variables.h
2011-01-20 16:10:32 +02:00
oy
7a20c313ee
made some output just show up on debug
2011-01-19 15:39:04 +01:00
Floff Floffsson
e0c02eb691
functioncall not needed, dunno why its there anyway
2011-01-17 14:59:21 +01:00
Floff Floffsson
3e530ac02d
SetClientAuthed() moved
2011-01-17 14:59:12 +01: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
5e841fcfae
Merge branch 'master' of http://github.com/heinrich5991/DDRace
2010-12-19 15:22:31 +02: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
63961ecf1a
fixed mute evasion + kick
2010-12-19 07:25:01 +02:00
GreYFoXGTi
e803f30f52
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/server/entities/character.cpp
src/game/server/entities/flag.cpp
src/game/server/player.cpp
src/game/variables.h
2010-12-16 06:06:23 +02:00
oy
0121f27311
fixed server crash on too many snap items. Closes #317
2010-12-16 03:29:08 +01:00
GreYFoXGTi
157aafd4dd
Merge branch 'master' into DDRace
...
Conflicts:
src/engine/server/server.cpp
src/game/variables.h
2010-12-11 23:57:41 +02:00
Choupom
cdd8184f89
fixed "Kicked by console (Kicked by vote)" drop message
2010-12-11 21:57:34 +01:00
GreYFoXGTi
4510ced422
Merge branch 'DDRace' of github.com:GreYFoXGTi/teeworlds into DDRace
2010-12-10 21:20:34 +02:00
GreYFoXGTi
2c51511260
Merge branch 'master' of http://github.com/oy/teeworlds into DDRace
...
Conflicts:
src/engine/client/client.cpp
src/engine/server/server.cpp
src/engine/shared/config_variables.h
src/game/client/gameclient.cpp
2010-12-10 20:58:53 +02:00
oy
db9dd6b8c9
added an optional time stamp to a demo record by Batchyx
2010-12-08 00:42:32 +01: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
881fd901a6
added Vote comments starting with # and also made announcement comments start with #
2010-12-06 00:38:29 +02:00
GreYFoXGTi
326c46551c
Resseted sv_old_laser to 0
2010-12-02 01:16:09 +02:00
GreYFoXGTi
b22f6e0036
Added Announcement Comments
2010-11-29 06:21:04 +02:00
heinrich5991
73ca31d168
changed rcon command "cmdlist" nearly completly
2010-11-24 22:09:31 +01:00
GreYFoXGTi
eed83bd7cb
Added Announcement
2010-11-22 13:00:43 +02:00
GreYFoXGTi
2ad456433d
Made File Execution Level 3, but level 4 only for autoexec.cfg at server start
...
Removed TODO, because it's needed there to reset tunings on map change
2010-11-22 10:27:13 +02:00
GreYFoXGTi
bdd3af9f43
Applied CMDList Pages
2010-11-22 09:55:50 +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
GreYFoXGTi
6a40aea054
Revert "added hackish challenge-response-alike compatible with 0.5.2 clients. against the slot blocking exploit."
...
This reverts commit 9f8cf21c334383e104383e10933
2010-11-18 01:32:54 +02:00
heinrich5991
89ef2a0928
fixed CServer::ConKick because of the new victim system, fixed the victim system for cases with at least one parameter after the victim
2010-11-15 18:58:44 +01:00
heinrich5991
051172838b
fixed commit with the fix of cmdlist
2010-11-12 17:56:31 +01:00
heinrich5991
c54b824a45
fixed 'cmdlist' rcon command for joining clients
2010-11-11 23:22:09 +01:00
heinrich5991
c36eb3d359
fixed a bug with "me" as victim, fixed kick function due to new victim system
2010-11-10 23:24:33 +01:00
heinrich5991
470e2773ba
added system to generalize rcon commands
2010-11-07 17:08:09 +01:00
heinrich5991
6f35687e03
added system to generalize rcon commands
2010-11-07 16:29:55 +01:00
