edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-11 02:28:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
3923 commits 1 branch 429 tags 411 MiB
Commit graph

1296 commits

Author SHA1 Message Date
GreYFoX c5d992dc2c nothing 2011-04-14 04:42:09 +02:00
GreYFoX 7c6d405e2a Fixed vote abortion by admin login 2011-04-14 04:26:13 +02:00
GreYFoX c37bad0be8 fixed a crash 2011-04-14 04:00:22 +02:00
GreYFoX dc886b7b2e New emoticons eye actions 2011-04-14 01:36:51 +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
GreYFoX f7892d3f00 Administrator privacy, re-enabled disabled functions 2011-04-14 00:53:33 +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 dd70b687ed Better ICons + Mac Icons 
Disabled Emotional tees until reworked
 2011-04-13 01:34:39 +02:00
GreYFoX 4a46168631 Temporarily removed crash features til it's fixed, made version 1.071a 
changed some names for the build bot to work
 2011-04-12 03:52:01 +02:00
GreYFoX 0ee65685be Fixed Crazy shotgun bullets 2011-04-12 00:28:00 +02:00
GreYFoX 03095b5ecf Nothing 2011-04-12 00:27:52 +02:00
GreYFoX b4f05a6772 removed comments from voting - no longer needed 2011-04-10 15:32:56 +02:00
GreYFoX b2c67df7e7 fixed hammer hit 2011-04-10 15:07:36 +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
SushiTee dce5222f78 removed unused function 2011-04-07 19:52:44 +02:00
oy 9b97eb282a prevent that you can add votes with an empty description 2011-04-05 20:06:41 +02:00
oy 0046825953 fixed server crash on remove vote 2011-04-04 16:58:53 +02:00
oy d7b6c3543b fixed a compiler warning. Closes #565 2011-04-01 17:46:20 +02:00
heinrich5991 b6fa69cedb the server shows the disconnect reason of clients now 2011-04-01 00:05:35 +02:00
oy 32876b9ba7 changed the output level of a console message 2011-03-31 21:46:01 +02:00
oy f9288eb5b1 fixed that spectators go to free view if the followed player joins spectators and prevent that you can follow spectators 2011-03-28 23:45:47 +02:00
oy 34a9ca20a7 added ipv6 support from the old lua branch 2011-03-28 20:11:28 +02:00
oy d4f2b8de87 fixed skin colour of spectators 2011-03-27 11:52:16 +02:00
oy 722644008f added a respawn delay command for tdm 2011-03-26 22:38:05 +01: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 b8f144ba81 added a vote that allows to move a player to spectators. Closes #58 2011-03-26 16:56:59 +01:00
oy 0e207fba6f fixed problem with force_vote command 2011-03-26 16:24:12 +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 741de082fc fixed linux compilation 2011-03-22 21:56:52 +02:00
GreYFoX 61dcc7b848 Re-Added noother's afk kick 
Disabled vanilla afk kick by default
enumerated variables.h
 2011-03-22 21:49:12 +02: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
GreYFoX 5b4d7a4658 Refactored + fixed sv_hit 0 + laser through others 2011-03-19 22:21:42 +02:00
GreYFoX ed5c9c1d92 sv_show_other the ability to use the command showothers 2011-03-19 11:22:03 +02:00
GreYFoX 974f429957 Added git revision to several places 2011-03-18 01:21:07 +02:00
GreYFoX 45f3cf042a Fixed a login with cheats 
Renamed a constant
 2011-03-18 00:17:01 +02:00
GreYFoX c74cda68e0 Fixed tuned server behavior 2011-03-17 19:20:44 +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
GreYFoX 2dc557d77b Fixed Rifle and Shotgun not affecting tees after Passing through owner when sv_old_laser = 1 2011-03-16 13:59:36 +02:00
GreYFoX ca447b7aa4 http://bugs.mysql.com/bug.php?id=50046 2011-03-16 13:59:17 +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 83e83947cf give ninja players the momentum they had before slicing, after slicing. Closes #120 2011-03-13 19:00:00 +01:00
oy b834426548 fixed several problems with spectator view in game and demo player. Closes #83 2011-03-12 18:07:57 +01:00
oy 1f10c1e8bf fixed problem with ctf if there're no flags 2011-03-10 10:14:41 +01:00
oy ee2f625754 added extended spectator mode. Closes #28 2011-03-10 10:08:14 +01:00
oy 0640acb27e added a command to set a minimum player limit that is needed to start a kick vote 2011-03-04 17:35:50 +01:00
oy 9811c2396b made network clip flags. Closes #131 2011-03-04 17:08:10 +01:00
oy 4bede550be only update the ping if the scoreboard is active. Closes #27 2011-03-01 18:31:20 +01:00
GreYFoX 709f0cd0f9 Removed Spam checks from ConRank 
Moved CGameContext::ProcessSpamProtection(int ClientID) away from vanilla functions
Made Muted text shown to sender
Corrected a + to *
Added FileScore ShowRank to Spam protection
changed SendChatTarget to SendChat in SQLScore and added it into the Spam protection
 2011-02-27 10:07:57 +02:00
EliteKuchen 55144629dc wrong names 2011-02-26 20:49:29 +02:00
heinrich5991 652443f068 fixed rewritten mutes 2011-02-26 20:45:02 +02:00
GreYFoX 355dd98bfa lol i missed this 2011-02-26 15:48:15 +02:00
heinrich5991 3d0aab503f rewritten mutes 2011-02-23 23:45:31 +02:00
GreYFoX 90d93ba7b2 Client showothers 2011-02-23 22:22:05 +02:00
GreYFoX bef7a1fbbd Emote normal 
lol
 2011-02-23 21:53:15 +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
GreYFoX 9e54b25740 Fixed 2 Teams bugs 
Added comments so that remembering what CGameTeams::SetForceCharacterTeam does won't be hard
Raised the version so that bug tracking is easier
 2011-02-23 14:14:56 +02:00
GreYFoX 6d181a2daa Fixed a merge mistake 2011-02-23 09:43:05 +02:00
GreYFoX 48b29bebd4 Possibly Fixed a Teams bug 2011-02-23 08:18:38 +02:00
Romain Labolle 0209ef4126 The first parameter of set_team is the victim (cf. line 1190) 2011-02-23 08:02:55 +02:00
GreYFoX e6643607f4 Reset Team from Super to normal on death 2011-02-23 07:31:39 +02:00
Romain Labolle 7ac12219ea move/move_raw/up/down/left/right commands may apply on Victim not on player who typed the command 2011-02-21 21:40:13 +02:00
oy 45eee0c8c2 fixed spawning on crappy maps 2011-02-21 12:35:14 +01:00
GreYFoXGTi 4e9e60524e Fixed last commit 2011-02-21 00:41:15 +02:00
GreYFoXGTi 2e1094f15d Welcome Trust o_0 Aeeeh ?! 2011-02-20 20:17:38 +02:00
Sebastian Wojtowicz c3739e0e4d fixed a bug that prevented records to be saved in files 2011-02-20 19:11:04 +02:00
Sebastian Wojtowicz 968762b144 Fixed a casting error 2011-02-19 20:10:03 +02:00
Sebastian Wojtowicz 84196b1ef3 some little cleanup 
If /times is entered with no params it now shows last 5 times of server in general
 2011-02-19 19:53:15 +02:00
GreYFoXGTi 417b18963f windows compiling 2011-02-16 19:56:20 +02:00
GreYFoXGTi 793ea4a499 Don't holdup spawning if tees are there 
fixed cl_ddrace_scoreboard
 2011-02-16 19:04:41 +02:00
oy d939b84125 removed no longer needed progression browse info 2011-02-16 12:31:47 +01:00
GreYFoXGTi cd998a2a93 sv_reset_pickups 1 to remove weapons on start tiles 2011-02-16 13:08:14 +02:00
GreYFoXGTi 335a8f69c2 Morning Cleanup 2011-02-16 10:21:23 +02: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
Sebastian Wojtowicz 60de0da1c3 Added timestamp into MySQL ranking, and function to have ago time web2.0 like printed on asking for /rank 2011-02-15 02:27:19 +02:00
GreYFoXGTi 604ae5286f Several Fixes and some more on the way 2011-02-14 23:34:46 +02:00
GreYFoXGTi d68e853ca7 StickyTeams, TeamStrict Logic and fixed some team bugs 2011-02-14 20:44:02 +02:00
GreYFoXGTi 29c9bf531d Fixed merge errors 2011-02-14 09:43:44 +02:00
GreYFoXGTi 40a218b5ee Fixed Braces in /yes and /no 2011-02-13 22:21:17 +02:00
Romain Labolle 806a1babc1 Mute may not affect chat commands (like /pause) 2011-02-13 19:48:54 +02:00
GreYFoXGTi 718d697707 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/collision.cpp
	src/game/collision.h
	src/game/gamecore.cpp
	src/game/server/gamecontext.cpp
 2011-02-13 19:36:53 +02:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
oy 3c7adc6a7f fixed nethash 2011-02-13 13:06:19 +01:00
GreYFoXGTi 68a1a29db8 Reverted 1 Letter Refactoring or Edited it to a full name. 2011-02-13 12:57:10 +01:00
Choupom 7bfbe24a1c added flag return message on death tile collision 2011-02-13 12:24:19 +01: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
oy 3f05289328 fixed a possible problem with occupied spawn points and cleaned up spawn code a bit 2011-02-10 12:05:55 +01:00
GreYFoXGTi beec56aee0 prevented a useless SendchatTarget 
added some missing code
 2011-02-10 02:50:18 +02:00
GreYFoXGTi c1ebccd8a2 Fixed infinite Loop 
Don't tell Oy to add this, he will just say we don't support mods
 2011-02-09 01:03:42 +02:00
GreYFoXGTi c735384b52 If you Edit the Source Don't use the game mode DDRace 2011-02-08 18:35:48 +02:00
GreYFoXGTi 55c368b679 Formatting 
Raised version for statistical analysis
 2011-02-08 14:52:23 +02:00
GreYFoXGTi ae06076d10 Mute By Fisted 2011-02-08 14:44:59 +02:00
GreYFoXGTi e5bff28375 Fixed a Stopper bug 
1 still remains
 2011-02-07 04:22:13 +02:00
GreYFoXGTi 6c3698469b Fixed some bugs 
fixed a mistake
Official Noobness
 2011-02-06 20:38:24 +02:00
GreYFoXGTi acea19e9b5 Console::PrintResponse instead of SendChatTarget 
Thanks Julian->Assange for pointing it out
 2011-02-05 06:56:21 +02:00
GreYFoXGTi 89889fa1d1 Fixed double jump sound 
how did i miss this!
 2011-02-05 06:33:11 +02:00
GreYFoXGTi f901fc65fa Removed DeepFreeze Messages 
Removed some curl brackets
 2011-02-05 06:18:32 +02:00
GreYFoXGTi 693ad89c00 DeepFreeze = EMOTE_PAIN, freeze stays EMOTE_BLINK (eyes closed) 2011-02-05 04:28:05 +02:00
GreYFoXGTi 2c36457b94 Fixed warnings 2011-02-05 03:33:53 +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
GreYFoXGTi ff839af9ba Fixed a collision error 2011-02-04 18:49:36 +02:00
fisted addbf8e3d6 automatic mute on spam 2011-02-03 14:39:00 +01:00
fisted 00f47c18c4 player muting by ip 2011-02-03 13:02:32 +01:00
GreYFoXGTi 9d98ce7e72 Version 1.03a 2011-01-30 23:51:14 +02:00
GreYFoXGTi 3223a9d4c5 Few Improvements 2011-01-30 20:07:02 +02:00
GreYFoXGTi 5961edf6ce Better Performance, Fixed a mistake and added check for next tiles (Left, Right, Bottom and Above). 2011-01-30 01:58:47 +02:00
GreYFoXGTi 57c8739bb9 Show join a team message without spam 2011-01-29 16:31:50 +02:00
GreYFoXGTi 832bad08e6 Cleanup and Added All Left Masks 2011-01-29 16:18:36 +02:00
GreYFoXGTi b2e96bf9eb formatting and refactoring 2011-01-26 23:09:54 +02:00
DemonulPierdut/-/Julian /[Assange/] c98be07e2a fixed my spam team thing :P 2011-01-26 23:03:38 +02:00
GreYFoXGTi b59e130037 DeathMask 2011-01-26 23:03:20 +02:00
GreYFoXGTi 4e32aee417 Commented some dbg_msgs 
may need them in the future
 2011-01-26 22:59:55 +02:00
GreYFoXGTi 3356455007 Fixed double hook sounds 2011-01-26 22:57:23 +02:00
SushiTee d7057ef9e1 fixed server compiling in mac (sql is not working though) 2011-01-26 14:45:44 +02:00
GreYFoXGTi 5b51295185 Added Deep freeze/unfreeze to switch layer so that it can be controlled with switches 
fixed the freeze command

Added Freeze Tile to switch layer to set freeze tile custom delay

Added sv_freeze_delay to control default freeze time delay
 2011-01-25 12:05:53 +02:00
GreYFoXGTi 4e36d2f069 Merge branch 'greyfox' of https://github.com/JulianAssange/DDRaceExtra 2011-01-24 21:25:17 +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
DemonulPierdut/-/Julian /[Assange/] 2f45abdc40 fixed the sv_team 1 message.. lol it never told u too join a team :D 2011-01-24 22:36:05 +11:00
DemonulPierdut/-/Julian /[Assange/] 8ff2b1a95f for some reason hooking wasnt masked propley. 2011-01-24 06:23:04 +11:00
DemonulPierdut/-/Julian /[Assange/] 422b6c7c0d added more team mask's.. The sounds were fucking annoying lol 2011-01-24 05:56:20 +11:00
oy 83fc81092f fixed position of the hammer damage effect. Closes #448 2011-01-23 17:58:28 +01:00
heinrich5991 43b67aaa57 added server command to clear the votes. this fixes #47 partially 2011-01-23 17:53:53 +01:00
GreYFoXGTi e0bb8731a7 minor changes 2011-01-21 19:59:52 +02:00
GreYFoXGTi 0a08e1ca06 blocked voting invalid votes, by Floff aka LemonFace 2011-01-21 15:40:39 +02:00
GreYFoXGTi 1f302ea22a Made doors check for Collision or NoLaser 
* Renamed a Function
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2011-01-21 15:18:50 +02:00
GreYFoXGTi 1276bebfe1 Fixed Speedup Tiles ( made them skip-able ) 2011-01-21 11:53:58 +02:00
GreYFoXGTi a1fc979867 fixed grammar mistake, thanks fisted 2011-01-20 22:30:22 +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 7d6c546fcb DDRace entities no longer uses NETOBJTYPE but instead CGameWorld::ENTTYPE 2011-01-20 22:01:21 +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 7c67a1334c fixed a typo 2011-01-20 01:35:21 +01:00
oy 1701241636 added hammerhit simplification by fisted. Closes #443 2011-01-19 22:41:44 +01:00
oy 19a9462fe8 removed double entity list in gameworld and cleaned up connected stuff 2011-01-19 18:27:50 +01:00
oy 1359db5476 prevent that removing an entity aborts traversing the entity list in gameworld 2011-01-19 15:31:42 +01:00
oy 68faba809c made dbg dummies work again 2011-01-18 19:09:53 +01:00
oy 99e9d4910a fixed that team mates are regarded when evaluating the spawn position. Closes #426 2011-01-17 15:55:23 +01:00
Floff Floffsson 2edeeadce0 Team messages fixed 2011-01-17 14:59:28 +01:00
Floff Floffsson 3e530ac02d SetClientAuthed() moved 2011-01-17 14:59:12 +01:00
oy 40f6740742 fixed few spelling mistakes and disabled an unused command 2011-01-17 12:56:49 +01:00
Floff Floffsson 645f31141d deepfreeze tiles 2011-01-17 00:38:24 +02:00
GreYFoXGTi 9c66a2d54c Endless Hook Tile for ingameplay by Floff aka LemonFace 2011-01-17 00:13:21 +02:00
GreYFoXGTi 2ec0e0eec4 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/shared/console.cpp
	src/game/client/components/hud.cpp
	src/game/client/components/scoreboard.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
 2011-01-12 11:08:17 +02:00
Patafix a9f7f3a3ea just formatting 2011-01-09 23:29:56 +01:00
oy df47aedbfe reset flags and projectiles when leaving the game layer too much. Closes #385 2011-01-08 11:34:19 +01:00
fisted 2a4bb8e631 fixed /emote reset 2011-01-07 23:26:28 +01:00
GreYFoXGTi 395c87a7ad woops 2011-01-07 20:37:21 +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
GreYFoXGTi 802dc7a73d Revert "dunno who added this or why!", i seem to have confused Spectator/In-Game with teams system 
used team constants

This reverts commit 27c3f06f27.
 2011-01-06 15:49:05 +02:00
oy 1306b62ce2 added command to move all players to a team. Closes #384 2011-01-06 13:37:28 +01:00
GreYFoXGTi 21994e017f fixed warnings 2011-01-06 14:21:44 +02:00
GreYFoXGTi af160c8401 Can't pause while you are in a team 2011-01-06 07:58:37 +02:00
GreYFoXGTi 22aa8940a7 Code Style of some files converted from K&R to BSD/Allman 2011-01-06 07:30:19 +02:00
GreYFoXGTi b909829b61 Fixed team state sending, it was illogical 2011-01-06 07:22:08 +02:00
GreYFoXGTi babe838cab Added /ShowOthers 2011-01-06 07:08:12 +02:00
GreYFoXGTi ddc5dd7ab3 Cleaned up & Re-arranged stuff 2011-01-06 05:46:10 +02:00
GreYFoXGTi c5648311ed Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/german.txt
	src/game/client/components/scoreboard.cpp
	src/game/editor/ed_layer_tiles.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/variables.h
 2011-01-04 22:37:09 +02:00
oy a72848e780 added constants for teams by Choupom 2011-01-03 12:50:38 +01:00
GreYFoXGTi 27c3f06f27 dunno who added this or why! 2010-12-24 17:02:02 +02:00
GreYFoXGTi 8f9520b09a test 2010-12-23 07:57:26 +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 08a2f47ee8 Added Ability to Restart the race in a team after you have finished <br/> 
<b>Testers: Please check if this can be abused</b>
 2010-12-19 05:48:16 +02:00
GreYFoXGTi fc323326ec fixed mute evasion 2010-12-17 13:05:55 +02:00
GreYFoXGTi 0bbdabae97 Merge branch 'master' of https://github.com/noother/DDRace 2010-12-17 01:20:41 +02:00
GreYFoXGTi a4fa4d2fee Credits update. 2010-12-17 01:20:26 +02:00
floff 4008a1dc95 spectator votes configurable 2010-12-16 10:06:24 +01:00
floff 4a93c28eb8 added configurable time between pauses, to reduce spam 2010-12-16 10:05:20 +01: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 bed657d805 Merge branch 'master' into DDRace 2010-12-12 04:32:40 +02:00
oy b4c007778c fixed that IntersectCharacter picks the character which is closest to the start point and within the radius 2010-12-12 01:55:36 +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 2d581789e1 Merge branch 'master' of github.com:Speedy-Consoles/DDRace into DDRace 
Conflicts:
	src/game/ddracecommands.h
 2010-12-06 00:28:15 +02:00
GreYFoXGTi f9c3f83903 Removed command broadtime since the time is not in the broadcast anymore 2010-12-05 20:29:38 +02:00
noother e990c94dad fixed sql injection & added a proper escaper that works like 
addslashes() in php
 2010-12-05 08:18:54 +02:00
GreYFoXGTi dd849d3915 Merge branch 'master' of http://github.com/heinrich5991/DDRace into DDRace 2010-12-04 23:54:06 +02:00
GreYFoXGTi bb23e58285 by reading this you have wasted 2 seconds you are not getting back 
if you looked inside this commit then you have wasted 6 seconds that you are never getting back as well :p
 2010-12-04 23:51:03 +02:00
heinrich5991 311d92cf47 removed response message after typing "kill" in chat 2010-12-04 20:52:23 +01:00
GreYFoXGTi 0a0e1df557 i think i fixed the crash 2010-12-04 18:51:14 +02:00
GreYFoXGTi 72c86a112b Cleaned it up a bit 2010-12-04 18:35:41 +02:00
GreYFoXGTi a838ad9da6 server_release on windows has no sql by default because my sql on the server_release version of windows doesn't work, but it does on server_debug 2010-12-04 16:31:54 +02:00
Speedy Consoles b790b5f1bc Merge branch 'master' of http://github.com/GreYFoXGTi/DDRace 2010-12-04 13:54:36 +01:00
GreYFoXGTi 9803a74664 so now windows mysql is fucked up and i don't know why 2010-12-04 03:12:30 +02:00
GreYFoXGTi e61d7d1786 Windows mysql connector has a bug even in the latest version with boost no strings over 15 chars 2010-12-04 02:02:50 +02:00
GreYFoXGTi 83cea23373 Reworked some stuff 2010-12-03 14:58:38 +02:00
GreYFoXGTi fb5a264e9e Allowing speedup tile skipping 2010-12-02 23:05:10 +02:00
GreYFoXGTi 8542181d9a Added include recommended by SushiTee to fix the following mac compiling Errors 
#1 c++ src/game/server/gamecontext.cpp
In file included from src/base/tl/range.h:6,
                 from src/base/tl/algorithm.h:6,
                 from src/base/tl/sorted_array.h:6,
                 from src/game/server/score/file_score.h:6,
                 from src/game/server/gamecontext.cpp:18:
src/base/tl/base.h:8: error: expected `)' before ‘(’ token
bam: 'objs/game/server/gamecontext.o' error 256
 2010-12-02 20:51:21 +02:00
GreYFoXGTi 388ca1288f Fixed Tile Parsing Error and Added dbg Messages to show map tiles 2010-12-02 01:33:02 +02:00
GreYFoXGTi af6f96bc7e Added Tile for the new Map Config 2010-12-02 00:45:36 +02:00
GreYFoXGTi 0a29aae473 added old Laser Behavior Configuration 2010-12-02 00:07:33 +02:00
GreYFoXGTi c149b17617 FinishTime Difference 2010-11-30 05:04:21 +02:00
GreYFoXGTi af44a79b03 New Broadcast/Timer System 2010-11-30 04:24:15 +02:00
GreYFoXGTi b4fd1aaca9 Fixed Announcement System 2010-11-29 05:39:47 +02:00
GreYFoXGTi 94d5351108 Just to be sure this doesn't make an infinite loop 2010-11-29 05:25:27 +02:00
GreYFoXGTi 7f24d0f144 Fixed ID 0 Bug 2010-11-26 20:01:55 +02:00
GreYFoXGTi 5db203a1ed Mute Evasion 2010-11-26 18:57:18 +02:00
GreYFoXGTi 4f777211a5 Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-25 00:22:02 +02:00
heinrich5991 5204bbe6b7 fixed rcon command "set_team" 2010-11-24 23:17:56 +01:00
heinrich5991 73ca31d168 changed rcon command "cmdlist" nearly completly 2010-11-24 22:09:31 +01:00
GreYFoXGTi a2896fd660 Commit by Allisone (Trust) 
* Fixed CSqlScore::ShowRankThread so /rank works properly
* Fixed CSqlScore::Init so CREATE TABLE ends with  character set utf8
* Added in CSqlScore more verbose SQLException messages
* Removed all statements that would prevent including and loading the CSqlScore class
* Changed bam.lua so on OSX the mysql lib folder gets linked and the include folders get included
* Changed bam.lua so macosx min version 10.5 and sdk 10.6 are required
* Cleaned CSqlScore and replaced new function calls with equal but backward compatible code
 2010-11-24 01:50:02 +02:00
GreYFoXGTi a3d29d5447 Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-23 03:57:48 +02:00
heinrich5991 077b8bd84d fixed sv_vote_percentage 2010-11-22 22:30:50 +01:00
GreYFoXGTi 4737588827 New Delayed Switches 2010-11-22 23:10:12 +02:00
GreYFoXGTi eed83bd7cb Added Announcement 2010-11-22 13:00:43 +02:00
GreYFoXGTi f1781c0eb4 lol 2010-11-22 11:13:04 +02:00
GreYFoXGTi b8fe169419 Added Mac Fixes by Allisone (Trust) 2010-11-22 11:09:27 +02:00
GreYFoXGTi 3ceebe2ef4 Forgot to make the map.cfg level 4 2010-11-22 10:32:00 +02:00
GreYFoXGTi 4f3d086b92 Fixed /pause making u return as a Team 0 Player 2010-11-22 09:21:02 +02:00
GreYFoXGTi a80ac35cb9 Fixed http://ddrace.info/forum/showthread.php?261-DDrace-Trunk-Alpha-Crash-caused-by-teams 2010-11-22 08:59:40 +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
Choupom c64d3817cf fixed so we can't add a vote option multiple times by oy 2010-11-20 21:41:18 +01:00
Sworddragon fc9211c777 Updated copyrights 2010-11-20 21:26:06 +01:00
GreYFoXGTi d414579247 Added ### after *** to indicate a /me message, and avoid messages that look like the server sent it 2010-11-19 18:57:53 +02:00
GreYFoXGTi ac341b5390 fixed mac compilation 2010-11-18 01:19:44 +02:00
GreYFoXGTi a109e1150d Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/shared/config_variables.h
	src/game/client/components/console.cpp
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.h
	src/game/server/gamecontext.cpp
 2010-11-18 01:10:59 +02:00
oy 994a44f6e1 simplified change_map command so that it switches to the next map in the maprotation when called without param 2010-11-17 12:50:01 +01:00
GreYFoXGTi ae591407c9 Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-17 13:11:40 +02:00
oy 0d1178107e fixed typo in a kick message 2010-11-17 00:44:04 +01:00
GreYFoXGTi b6a4b2b7ba Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-16 22:11:24 +02:00
oy e46cb02089 Made inactivity check ignore authed players. Closes #273 2010-11-16 18:08:19 +01:00
GreYFoXGTi 4cbcbae508 Fixed sv_vote_percentage 2010-11-16 16:59:17 +02:00
GreYFoXGTi 0c6767dd9d Added option to have DDRace Compiled without SQL 2010-11-16 15:44:16 +02:00
GreYFoXGTi 5ee8796381 Removed sql from mac, people who need sql compile the Mac branch 
the boost stuff made my working dir very messy and searching through it takes more time
 2010-11-16 15:26:19 +02:00
GreYFoXGTi c6f0bf7500 how did that happen 2010-11-14 17:59:28 +02:00
GreYFoXGTi 6f75b661b0 Total Noobness 2010-11-14 17:51:04 +02:00
GreYFoXGTi bf4ed7515c Forgot to parse the tiles from the Switch layer ^^ 2010-11-14 16:00:33 +02:00
GreYFoXGTi bb0d4a5671 Some Fixes 2010-11-14 13:14:18 +02:00
GreYFoXGTi ca54f1d7c7 for got this one 2010-11-14 12:19:41 +02:00
GreYFoXGTi d49eb12120 CLight Flickering 2010-11-14 12:16:27 +02:00
GreYFoXGTi f60817b5c0 Different Flicker for Crazy Bullets 2010-11-14 12:13:11 +02:00
GreYFoXGTi 4486a7abed Added Alive Check 2010-11-14 12:08:21 +02:00
GreYFoXGTi 3c1c045722 Added Flicker effect to NON-Active Entities 2010-11-14 12:01:42 +02:00
GreYFoXGTi bf0b4183cc Fixed bullet wall stuck when de activated and collides with a tee 2010-11-14 11:36:00 +02:00
GreYFoXGTi 79226352af revert teleport useless change 2010-11-14 11:04:13 +02:00
GreYFoXGTi 5ec06369c5 fixed last pull commit 2010-11-14 03:32:23 +02: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 002cf9792f Fix project tile 2010-11-13 18:41:43 +03:00
btd e3fb77f444 Merge branch 'master' of github.com:btd/DDRace 2010-11-13 18:31:25 +03:00
btd 2c44c94c4e Move console staff 2010-11-13 18:31:13 +03:00
btd 9b5235650d Fix mistake 2010-11-13 01:41:43 +03: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
btd 7fcd245611 Fixes 2010-11-13 00:50:51 +03:00
GreYFoXGTi 30680ddd79 MAX_NAME_LENGTH 2010-11-12 19:23:53 +02:00
Allisone 961a0c8cf0 Repaired MySQL Insert and increased player name length for db from 16 to 64 2010-11-12 17:44:37 +01: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
btd 748065dbcf Fix door issue. Not tested, dont pull 2010-11-11 11:44:39 +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
GreYFoXGTi 17cb8a6ffb Merge branch 'develop' of http://github.com/heinrich5991/DDRace 
Conflicts:
	src/game/server/gamecontext.cpp
 2010-11-09 17:30:30 +02:00
GreYFoXGTi 50b16e7821 added high sensitivity for Begin and End tiles 2010-11-09 02:51:49 +02:00
GreYFoXGTi 27864ec70d Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-09 00:24:42 +02:00
GreYFoXGTi 86675f7dd7 Able to amend the mute to something less 2010-11-08 11:29:09 +02:00
heinrich5991 50b8d93d6d finished system to generalize rcon commands, sorry for last commit's description 2010-11-07 17:35:11 +01:00
heinrich5991 470e2773ba added system to generalize rcon commands 2010-11-07 17:08:09 +01:00
heinrich5991 678c94b344 removed the senseless parameters of CGameContext::CheatsAvailable 2010-11-07 13:21:25 +01:00
heinrich5991 b9875cefd8 fixed a bit ugly code 2010-11-07 12:03:26 +01:00
btd 5f6e35b418 Finish sv_team 2010-11-07 01:54:35 +03:00
GreYFoXGTi 12dffd5edc Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-06 22:13:01 +02:00
btd ec2387f0e9 Spectator can see all events 2010-11-06 19:54:59 +03:00
heinrich5991 dcb0b0ee1d fixed "you were worse" message after finishing the first time, prevented that you get this message if your time is equal to your record 2010-11-06 09:38:39 +01:00
btd a156d15bd1 Merge branch 'master' of git://github.com/GreYFoXGTi/DDRace 2010-11-05 14:57:15 +03:00
btd 081c5d8bc2 Fix score board and small perfomance improvments 2010-11-05 14:56:44 +03:00
GreYFoXGTi 96e67724f1 Merge branch 'rm_clientdummies' of https://github.com/heinrich5991/DDRace 
Conflicts:
	src/game/server/gamecontext.cpp
moved and edited src/game/ddracecommands.h
 2010-11-05 01:59:37 +02:00
GreYFoXGTi 6735dce1af Applied Patch by Mo(2) Hammer-fly out of the freeze 2010-11-05 01:52:37 +02:00
GreYFoXGTi 9feef5638e Merge branch 'master' of http://github.com/btd/DDRace 2010-11-04 21:18:55 +02:00
btd 4e5ffed2b5 Cheaters have no timer now 2010-11-04 22:06:47 +03:00
btd 32d80c22d1 score board 2010-11-04 21:33:51 +03:00
GreYFoXGTi 32429ebe31 /me is a number of word, parameter = r not s 2010-11-04 20:24:13 +02:00
GreYFoXGTi 970822f0f0 bad time, better luck next time 2010-11-04 20:20:45 +02:00
GreYFoXGTi 3756c98715 Total IP Scoring Annihilation ( doesn't make sense ), please test this, also delete the old records 2010-11-04 20:10:51 +02:00
GreYFoXGTi 8ac101d60e revised all usages of sv_hide_score in the code 2010-11-04 19:32:54 +02:00
GreYFoXGTi 5efc7d0d9b Fixed Crash on no TELEOUT matching TELEIN tile 2010-11-04 13:49:38 +02:00
GreYFoXGTi 0c2c4e1af7 fixed last commit } missing 2010-11-04 11:19:07 +02:00
GreYFoXGTi 0c7a1afc94 if(Force == 255 && MaxSpeed) act as a speed setter 2010-11-04 11:05:12 +02:00
heinrich5991 60d7639c9b moved ddrace-specific rcon cmds from 'game/server/gamecontext.cpp' to 'game/server/ddracecommands.h' in order to remove renundancy with client-side server dummies for tab-completion 2010-11-02 17:07:45 +01:00
GreYFoXGTi 1d4e9214e6 Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-01 23:54:36 +02:00
GreYFoXGTi 6b4d717a69 4 is fine 2010-11-01 23:53:23 +02: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
GreYFoXGTi 46d66aa06e Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-01 20:07:57 +02:00
heinrich5991 7167cb827c re-implemented rcon weapon functions with the new function CGameContext::ModifyWeapons 2010-11-01 18:22:40 +01:00
heinrich5991 9a38340c57 added CGameContext::ModifyWeapons in order to generalize rcon<-> weapon system 2010-11-01 18:07:09 +01:00
GreYFoXGTi 96eeec6a39 Entities: Fisico 2010-11-01 17:29:09 +02:00