Commit graph

177 commits

Author SHA1 Message Date
def e69987cc93 Hopefully fix spectating 2014-06-22 15:16:34 +02:00
def 4c87cedd4d Better make sure that something exists before using it 2014-05-19 01:57:52 +02:00
def 7133545e1a Formatting 2014-04-18 14:50:15 +02:00
HMH 4a8011ced4 determine tunings to send with the players viewpos 2014-04-18 14:43:33 +02:00
def e6052ed411 add sv_pause_messages 2014-03-26 14:21:49 +01:00
HMH f2c8134bd2 send correct tunings to spectators 2014-03-23 17:10:49 +01:00
def 0e15c22639 More sensitive afk detection 2014-02-21 18:27:00 +01:00
def 17102bdf09 Still have to keep crashmeplx 2014-02-13 19:53:30 +01:00
def 4321e80c4d style 2014-02-12 13:28:07 +01:00
def 7804f9314d Hopefully fix a bunch of locked team bugs 2014-02-08 14:33:42 +01:00
def 823a04333a Add /showall 2014-02-02 19:56:10 +01:00
def 0be802c005 Fix: Even show correct team if there was a locked team before 2014-02-02 11:10:00 +01:00
def caa1f15d12 Fix possible crashes 2014-01-30 16:54:58 +01:00
def d8533eea67 Proper Client Version numbers and more visible whispers 2014-01-30 16:49:15 +01:00
def 6126ad50c4 Fix range of team related bugs by actually removing people from team when they spectate 2014-01-11 15:19:34 +01:00
def 2af9d9f423 Switchable ninjajetpack 2014-01-11 13:59:20 +01:00
def 3607218f12 Merge ddrace64 from eeeeee 2013-12-31 06:13:57 +01:00
def b6f8156e1f New fix for solo maps with switches 2013-12-28 16:27:47 +01:00
def 3eaad43b6b Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace
Conflicts:
	bam.lua
	data/languages/index.txt
	src/engine/server/server.cpp
	src/engine/shared/network_server.cpp
	src/game/client/components/chat.cpp
	src/game/client/components/menus_settings.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/version.h
2013-12-26 18:02:22 +01:00
def 70a0774453 Add /dnd 2013-12-22 18:30:13 +01:00
def 0b70f874dc Add sv_team 3 (forced random team for you, useful for solo ddrace) 2013-12-19 23:04:01 +01:00
def db1304b597 Fix Null Pointer bug 2013-11-16 02:36:04 +01:00
def eba45c4f0a Add /lock 2013-11-16 00:44:49 +01:00
def 295a1aaa50 Code cleanup 2013-11-14 16:26:25 +01:00
def 582562ed1e Remove useless code 2013-11-09 00:07:57 +01:00
def 1b49f5fab0 Keep solo after map change 2013-10-22 17:04:54 +02:00
def 34e568f41b Add converse command 2013-10-18 11:42:35 +02:00
def a2c7feda17 Add afk vote timer 2013-08-18 03:27:30 +02:00
def ccc777f792 Max 4 commands per second 2013-08-10 04:21:20 +02:00
oy ffa93a007c fixed a bug with spectating a player 2013-02-24 17:24:12 +01:00
Learath2 c55cae6492 Reduced length of new year event to 2 days. 2012-12-23 19:53:57 +02:00
eeeee 1c8c20c93e added sv_events 2012-12-23 19:47:47 +02:00
GreYFoX cd4ba53bae Merge branch 'master' of git://github.com/teeworlds/teeworlds into DDRace
Conflicts:
	bam.lua
	scripts/build.py
	scripts/make_release.py
	src/engine/server.h
	src/game/client/gameclient.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/player.cpp
	src/game/version.h
2012-04-12 02:09:31 +02:00
Learath2 44d34b0033 Fixed paused players getting afk kicks. 2012-04-11 14:41:02 +02:00
Learath2 50b2d85abb Fixed according the comment of GreYFoX. 2012-02-14 22:38:06 +02:00
Learath2 d64e1796aa Simplifys the usage of timer commands. Fixes new year happy spawn. 2012-02-14 20:25:34 +02:00
SushiTee 1e602bf31b fixed showing player spawn effect only to players who should see 2012-02-05 14:48:09 +01:00
oy dfe91338f0 added pause command. Closes #15 2012-01-10 00:49:31 +01:00
Ravomavain af8fac1bac Little fix to allow 2 players to spectate each other 2012-01-01 00:15:15 +02: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
Ravomavain 88be9657d2 Enhance pausing system (by @heinrich5991):
* enhance /pause (@heinrich5991)
 * add /spec command to pause without leaving the game (@heinrich5991)
 * if sv_pauseable is set to 0, /pause behave as /spec (@heinrich5991)
 * should fix #124 and #127 (@ravomavain)
2011-12-31 01:44:36 +02:00
oy 11cc0e78d7 removed chat spam for the team commands 2011-12-30 22:30:28 +01:00
GreYFoX 7d462b565d Fixed the bugs i know of with the last few commits 2011-12-30 16:51:08 +02:00
GreYFoX 2baa440866 Happy New Year, all tees are now born happy, Version v1.11 2011-12-29 14:39:51 +02:00
GreYFoX 799f4de2b3 Added the following settings to Close #123.
sv_time_in_broadcast, 1, 0, 1, CFGFLAG_SERVER, "Whether to display time in broadcast every interval or not by default, later the choice can be changed by players via chat commands"
sv_time_in_broadcast_interval, 1, 0, 60, CFGFLAG_SERVER, "How often to update the broadcast time"
sv_time_in_gametimer, 0, 0, 1, CFGFLAG_SERVER, "Whether to display time in the round/game timer or not by default, later the choice can be changed by players via chat commands"
Added the following Chat commands to give the player the choice over their settings:
"saytime", "", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSayTime, this, "Privately messages you your current time in this current running race"
"saytimeall", "", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSayTimeAll, this, "Publicly messages everyone your current time in this current running race"
"time", "", CFGFLAG_CHAT|CFGFLAG_SERVER, ConTime, this, "Privately shows you your current time in this current running race in the broadcast message"
"broadcasttime", "?s", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSetBroadcastTime, this, "Personal Setting of showing time in the broadcast, broadcasttime s, where s = on for on, off for off, toggle for toggle and nothing to show current status"
"servergametime", "?s", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSetServerGameTime, this, "Personal Setting of showing time in the round/game timer, servergametime s, where s = on for on off for off, toggle for toggle and nothing to show current status"
Fixed Chat Command "eyeemote" and made it a set + toggle instead of just toggle for better bin techneques
Moved some vars from CCharacter to CPlayer to keep their status evern after death but not after disconnect.
So now players have the choice to see which timer they wanna see if any.

Note: These changes are all untested Stay away from this update on your main server until they are tested, i don't even know if they will compile propperly
2011-12-29 14:17:34 +02:00
GreYFoX d9f973b8da SQL Fix 2011-09-08 00:51:55 +02:00
GreYFoX 8c103b8c13 * Added a new tile to facilitate solo parts ( works with teams )
* Can now put tiles with the same indexes as in tele or switch layer i game layer but it will drawn to the correct image
* Adjusted Masking to account for Solo players
2011-09-02 20:04:18 +02:00
eeeee 9f8ba5cf45 it was possible to avoid being kicked by afk stuff by opening chat 2011-08-27 14:09: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