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
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
SushiTee
dce5222f78
removed unused function
2011-04-07 19:52:44 +02:00
heinrich5991
b6fa69cedb
the server shows the disconnect reason of clients now
2011-04-01 00:05:35 +02:00
oy
5b328e5484
added a limit for the number of votes that can be added to the server and send options as lists when a client joins. Closes #459
2011-03-26 22:06:29 +01:00
oy
fbeace5272
cleaned up some voting code
2011-03-26 17:44:34 +01:00
oy
6ece07ee74
added force_vote command
2011-03-25 12:06:45 +01:00
oy
359b806e95
added remove_vote command. Closes #47
2011-03-25 11:49:35 +01:00
oy
a4580d451f
added reasons to vote in general and show reason in vote hud. Closes #219
2011-03-25 10:26:59 +01:00
oy
8ad3def65e
added aliases for votes. Closes #144
2011-03-25 09:49:21 +01:00
GreYFoX
1172a79693
fixed compilation
2011-03-22 21:15:15 +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
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
GreYFoX
b3da5344c1
Fixed banning Higher level players
...
Fixed abort vote on login
removed ComparePlayers (useless i think)
Refactored last_mapvote
2011-02-23 16:27:11 +02:00
oy
d939b84125
removed no longer needed progression browse info
2011-02-16 12:31:47 +01:00
Sebastian Wojtowicz
6963a233a4
Added a new command /last5times (for sql scores only)
...
Added index to name in race sql table, so search is faster
2011-02-15 02:27:20 +02: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
cd574d10a7
Added sv_vote_majority, 1 like vanilla, 0 Consider number of yes against Number of Yes + No
2011-02-12 22:31:42 +02:00
GreYFoXGTi
1b2703aaba
Refactoring & fixed WEAPONSPEC_GUN in content.py
2011-02-12 21:18:41 +01:00
GreYFoXGTi
ae06076d10
Mute By Fisted
2011-02-08 14:44:59 +02:00
GreYFoXGTi
30f010593c
Teams with leaders
...
this maybe buggy but i will fix the bugs when they are reported
2011-02-04 18:49:37 +02:00
fisted
00f47c18c4
player muting by ip
2011-02-03 13:02:32 +01:00
GreYFoXGTi
832bad08e6
Cleanup and Added All Left Masks
2011-01-29 16:18:36 +02:00
GreYFoXGTi
f1a8b6b7ad
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/engine/shared/config.h
src/engine/shared/config_variables.h
src/game/client/gameclient.cpp
src/game/server/entities/character.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontext.h
2011-01-24 14:06:55 +02:00
heinrich5991
43b67aaa57
added server command to clear the votes. this fixes #47 partially
2011-01-23 17:53:53 +01:00
Floff Floffsson
8c32c01653
added unmute + some minor fix
2011-01-20 22:27:54 +02:00
GreYFoXGTi
6889adc0bb
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
.gitignore
src/game/client/gameclient.cpp
src/game/editor/ed_editor.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontext.h & Cleaned it up
2011-01-06 23:32:19 +02:00
oy
1306b62ce2
added command to move all players to a team. Closes #384
2011-01-06 13:37:28 +01:00
GreYFoXGTi
babe838cab
Added /ShowOthers
2011-01-06 07:08:12 +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
122c7954d9
Announcement Randomness
2010-12-06 04:27:35 +02:00
GreYFoXGTi
83cea23373
Reworked some stuff
2010-12-03 14:58:38 +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
GreYFoXGTi
670e90c7e3
Merge branch 'master' of http://github.com/btd/DDRace
...
Conflicts:
src/game/server/entities/door.cpp
2010-11-14 03:32:00 +02:00
GreYFoXGTi
071fb6a5a3
new Switch System //TODO Rendering Rotation
2010-11-14 02:39:04 +02:00
btd
325aa980e9
Fix door issue. Fix explosion-team issue. Fix null pointer bug. Fix predicion bug. Fix crash when character killed and snap in this moment
2010-11-13 00:54:33 +03:00
heinrich5991
c54b824a45
fixed 'cmdlist' rcon command for joining clients
2010-11-11 23:22:09 +01:00
btd
cd59d111a8
Fix explosion issue. Dont pull, not tested. Can pull if test both commits=)
2010-11-11 12:12:03 +03:00
heinrich5991
40eade2021
removed me commands callback handler in header
2010-11-10 22:50:28 +01:00
heinrich5991
e078d537c2
moved spam protection and re-added it for /rank and /me; some smaller fixes
2010-11-10 22:42:29 +01:00
heinrich5991
50b8d93d6d
finished system to generalize rcon commands, sorry for last commit's description
2010-11-07 17:35:11 +01:00
heinrich5991
678c94b344
removed the senseless parameters of CGameContext::CheatsAvailable
2010-11-07 13:21:25 +01:00
heinrich5991
d2e24f0318
added rcon commands 'move' and 'move_raw', re-implemented 'up', 'down', 'left', 'right'
2010-11-01 21:09:44 +01:00
heinrich5991
c9dd108e09
added CGameContext::MoveCharacter, fixed CGameContext::ModifyWeapons
2010-11-01 20:44:36 +01:00
heinrich5991
9a38340c57
added CGameContext::ModifyWeapons in order to generalize rcon<-> weapon system
2010-11-01 18:07:09 +01:00
GreYFoXGTi
beb5712a79
i thought i added those like 10 years ago
2010-11-01 13:00:37 +02:00
btd
86365bedcd
Add Race stuff but fully reworked. Still only need to make score board
2010-10-30 18:22:35 +04:00
GreYFoXGTi
505a5b4172
Refactoring
2010-10-29 23:29:07 +02:00
heinrich5991
14c0f77c45
added config command "clear votes"
2010-10-14 12:11:17 +02:00
GreYFoXGTi
dc12d59a00
registered server dummy commands for tab completion in the client
2010-10-12 10:02:46 +02:00
GreYFoXGTi
01158b0ce1
Merge branch 'master' of http://github.com/heinrich5991/DDRace
2010-10-11 19:41:52 +02:00
GreYFoXGTi
a129e59d7c
Fixed Voting
2010-10-11 13:10:39 +02:00
heinrich5991
085601eced
all old chat commands re-added, admins can call any vote, fixed compare_players, logout level setted to 0
2010-10-11 10:37:33 +02:00
GreYFoXGTi
332fb1de09
chat commands redirect to rcon and vice versa by heinrich5991
2010-10-11 00:40:07 +02:00
GreYFoXGTi
ef139eb73a
Cleanup (Putting stuff back vanilla like)
2010-10-10 16:11:11 +02:00
btd
538efe273b
Clean Tele Layer initialization and holding.
2010-10-04 23:17:56 +04:00
GreYFoXGTi
b32f9d4184
Revereted the reconnect feature because after testing it, i found out that currently it is not so useful, and i don't have time to make it work for dynamic ips atm
...
so revert it for now maybe later i will fix it
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-19 22:13:28 +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
b7d5a3f7d2
Improved Reconnection Reload
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 12:58:54 +03:00
GreYFoXGTi
e061d84f20
Added Ability to Reconnect in the same place as your disconnect
...
Decided by sv_max_dc_restore
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 12:34:13 +03:00
GreYFoXGTi
dc64ebba46
Improved Commands
...
some refactoring
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 00:22:00 +03:00
GreYFoXGTi
c17371d2e4
Added command uninvis_me
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-16 23:44:59 +03:00
btd
c4fa5c6128
Ugly command invis_me ^_^ seems very funny
2010-09-14 20:56:28 +04:00
GreYFoXGTi
ddb4c2e370
Merge branch 'master' of github.com:GreYFoXGTi/DDRace into teams2
...
Conflicts:
src/game/server/entities/character.cpp
src/game/server/entities/projectile.cpp
src/game/server/gamecontext.cpp
src/game/server/gamemodes/DDRace.h
src/engine/shared/config_variables.h
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-08 22:22:08 +02:00
btd
fec294caee
Fix linux compilation. Revert last changes. Add /show_other option (in menu now working)
2010-09-08 20:22:11 +04:00
GreYFoXGTi
3df855df00
Moved Switch layer Initialization from CGameContext to GameControllerDDRace
...
i Quote btd "gamecontext as a global rubbish" xD
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:48:20 +02:00
GreYFoXGTi
7f0fa6d6b1
Added Switch Layer and it Finally works like it should
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-28 18:24:56 +02:00
btd
f769741f8f
Merge
2010-08-28 16:14:36 +04:00
GreYFoXGTi
206f7376d4
Fixed small mistake that was already fixed in the lost commit
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-27 19:39:44 +02:00
btd
397d8634c7
Fix
2010-08-27 18:37:14 +04:00
GreYFoXGTi
b0bf68c3d3
added chat command /time to show or hide time until next spawn
...
added chat command /broadcast to show or hide broadcast until next spawn
added rcon shot,shotgun_me,grenade,grenade_me,laser,laser_me
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-27 09:09:47 +02:00
GreYFoXGTi
0325c59aa9
Merge branch 'master' of http://github.com/btd/DDRace
2010-08-24 03:38:33 +02:00
GreYFoXGTi
51c6af1303
SvShotgunBulletSound
...
also added protection to shotgun stucks, needs to be tested when a random crazy shotgun bullet gets stuck
loaded the score file before saving to avoid corruption
added freeze and unfreeze in rcon
added protection in some rcon commands
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-23 23:40:23 +02:00
btd
6fabca9e10
Add checkpoints. Client undestand that it is a DDRace server fully. Need to rework /top5 /rank. Clean rubbish. I want to sleep(
2010-08-23 23:37:27 +04:00
GreYFoXGTi
5a2af8f3ff
re worked timer commands fixes issue #11
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-21 05:19:47 +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
Magnus Auvinen
72c06a2589
copied refactor to trunk
2010-05-29 07:25:38 +00:00