Commit graph

3381 commits

Author SHA1 Message Date
oy 0e40ab434a fixed a check 2013-02-24 17:31:57 +01:00
oy 0036a07ce7 fixed that client displays active vote after connecting to a server 2013-02-24 17:29:05 +01:00
oy 32c8dd6cf5 increased time for client info resend to prevent possible overlap 2013-02-24 17:28:39 +01:00
oy 76d7569e15 limit the number of chat messages a player can queue to 3 2013-02-24 17:28:11 +01:00
oy 5de2763f82 skip auto screenshot when the editor is active. #931 2013-02-24 17:27:44 +01:00
oy 13d06e45ac fixed used nettype in server browser and try to use ipv4 and ipv6 socket when using a bindaddr. Closes #940 2013-02-24 17:26:59 +01:00
oy ffd89938d7 fixed registering of ban commands. Closes #942 2013-02-24 17:26:30 +01:00
oy fa85cede53 reset rcon AuthTries on logout. Closes #941 2013-02-24 17:26:10 +01:00
oy 2a4af1573b auto adjust the screen resolution on first start. Closes #921 2013-02-24 17:25:55 +01:00
oy 38256d0d45 skip screenshot when window isn't active. Closes #931 2013-02-24 17:25:14 +01:00
oy 2f86ad3c4b fixed chat ignore feature 2013-02-24 17:24:30 +01:00
oy ffa93a007c fixed a bug with spectating a player 2013-02-24 17:24:12 +01:00
oy 85271f2e7e increased recv buffer size on windows 2013-02-24 17:14:55 +01:00
oy e291a60e7e fixed map initialisation. Closes #64 2013-02-24 17:09:42 +01:00
Teetime b4ed006f83 fix for saving bans in a file 2013-02-24 17:03:48 +01:00
heinrich5991 921f5f9239 fixed map downloading auth check 2013-02-16 14:37:53 +02:00
Learath2 c843d62ec7 Defaults to gfx_threaded 0. Partially fixes #213 2013-02-13 18:34:46 +02:00
BeaR 6d74d52c22 Fix problem with show other players: (Closes DDRace/teeworlds#210)
sending packet on setting change
2013-02-03 20:23:44 +02:00
Shereef Marzouk 4c95ed5006 Version Bump to 1.15a. (Closes #198) 2013-02-01 13:25:28 +02:00
Shereef Marzouk 0081251628 Fixes not displaying the nick when /rank {nick} is used. (Closes #197) 2013-02-01 13:25:00 +02:00
eeeee 56ad4f3c73 prevent bullets from drifting 2013-02-01 13:12:33 +02:00
Shereef Marzouk b000c9e4e1 Fixed team blocking by disconnect (Closes #206) 2013-02-01 13:08:23 +02:00
oy 6295b33965 set default value for asynchronous rendering to disabled for now. #1001 2013-02-01 11:38:09 +02:00
oy a7574f75d2 fixed last commit 2013-02-01 11:38:09 +02:00
BeaR c86ebb34df Bug: Losing render-commands if commandbuffer is full(gfx)
Problem:
If there is a new draw call, it is checked if there is enough free memory for the vertices in the databuffer but not if we have enough free space in the commandbuffer to add the command
So we lose some commands during a frame cuz the commandbuffer is full

This fixes the 2nd part of issue 1004
2013-02-01 11:38:09 +02:00
Learath2 6f98bcfee0 Update src/game/server/gamecontext.cpp 2013-01-27 23:31:50 +02: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
eeeee ee2647de41 turns out that Drop was needed after all :S 2012-12-23 20:10:31 +03:00
Shereef Marzouk 38aa2cac78 Player name when requesting another player's. closes #197.
Edited from github directly needs to be tested
2012-11-26 12:54:17 +02:00
Shereef Marzouk 7f7a46b497 Player name when requesting another player's
Edited from github directly needs to be tested
2012-11-26 12:47:41 +02:00
Learath2 3ececbd5f7 Fixes the last commit 2012-11-19 19:52:23 +02:00
Learath2 17140fc755 Added a config variable to control the map window.Closes #172 2012-11-14 20:34:23 +02:00
eeeee cae8c68d87 send ahead window for maps downloading. works with vanilla client. 2012-11-12 21:50:46 +02:00
BeaR 50b722b2b4 Closes #153.
Fix Input Handling
2012-11-12 20:39:36 +02:00
aelio_ru b68840b30b Fixes inactive dragger after map change or server start, Fixes #181. 2012-08-26 09:23:11 +02:00
Learath2 ec3c96abd6 Fixes records for maps in subfolder. Closes #46 2012-07-20 14:25:44 +02:00
oy 0d7c19889b fixed ban range check to make sure the whole ip matches and not just rely on the hash. Closes #946 2012-07-20 14:08:24 +02:00
oy c7f8697c51 fixed registering of ban commands. Closes #942 2012-07-20 14:08:18 +02:00
Ravomavain 52ba9eea04 remove other banmaster related code 2012-05-02 01:18:11 +02:00
Learath2 f98734e86e Made a log line more useful. 2012-05-01 21:58:40 +02:00
Ravomavain cd5046a1a9 Prevent laser draggers from dragging paused players. Fix XXLTomate#16
Reset velocity on resume to avoid other bugs.
2012-05-01 21:57:09 +02:00
Ravomavain 4481eabcc5 remove banmaster from sources 2012-05-01 21:57:09 +02:00
eeeee 96c1bd513c made cl_showhud 0 hide records 2012-04-12 13:02:43 +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 d5dcfa3c4f Fixed obligatory Teams (sv_team 2). 2012-04-11 16:16:30 +02:00
Shereef Marzouk 53225b718d Version 1.13a 2012-04-11 15:44:18 +03:00
Learath2 44d34b0033 Fixed paused players getting afk kicks. 2012-04-11 14:41:02 +02:00
Learath2 f053fd64a0 Forgot a return at can't pause while spectator or dead 2012-04-11 14:40:04 +02:00
Sebastian Wick 57d90a16eb fixes srv crash if typing '/top5 -999999' 2012-03-23 22:32:20 +01:00
Learath2 5e6d5a28f0 Follow up fix for pause and spec cant spec or pause in spectators. 2012-03-08 18:24:23 +02:00
Learath2 e06fd51ec1 Fixed a bug i experienced in a up to date server 2012-03-07 19:51:30 +02:00
Shereef Marzouk 65bbd53009 removed useless ve line 2012-03-02 00:53:19 +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
Teetime ec8dd34a5a fix for saving bans in a file 2012-02-13 23:22:40 +01:00
oy c045071b40 always show default country flag on invalid country index 2012-02-05 15:53:22 +01:00
SushiTee 1e602bf31b fixed showing player spawn effect only to players who should see 2012-02-05 14:48:09 +01:00
oy 27daa26b99 fixed stuck mouse cursor when loosing fullscreen focus on windows 2012-02-05 13:28:35 +01:00
oy 0c05b3bfa1 fixed compiling with vs2008 (#932) 2012-02-05 13:22:39 +01:00
XXLTomate dce5e8434b This fixes mute. Thanks to @heinrich5991 @Learath2 Mo2, the whole #DDRace and my dog. 2012-02-03 00:16:22 +01:00
oy d17ee055a2 fixed an issue about resending player info 2012-01-29 12:44:33 +01:00
oy 841e0dcb32 Merge pull request #927 from fisted/fix_tellport
tell what port might be in use, if we cannot bind
2012-01-29 03:33:48 -08:00
fisted 00f580cb91 tell what port might be in use, if we cannot bind 2012-01-28 23:54:04 +01:00
XXLTomate f9e4547b31 fixing the console (2) 2012-01-28 11:14:31 +01:00
SushiTee e359f82c69 init m_LockTeams with 0 to prevent locked teams on server start 2012-01-26 22:18:21 +01:00
SushiTee 4b2a34e1c5 force vote only if there is a vote 2012-01-26 22:17:26 +01:00
SushiTee f737910e0a fixed FillSelection so it actually fills the current selection 2012-01-12 22:03:55 +01:00
east 28410c00a7 Econ bufferoverflow fix 2012-01-12 19:59:27 +01:00
SushiTee 65f4416164 added map info 2012-01-10 23:14:24 +01:00
oy fa81141110 added demo markers by Choupom. Closes #837 2012-01-10 23:13:19 +01:00
oy e8f9145a0d deactivate player ignore setting if show just friends chat is active and player isn't a friend 2012-01-10 23:03:23 +01:00
oy 4efd65359e show notification when game is paused 2012-01-10 22:40:48 +01:00
oy dfe91338f0 added pause command. Closes #15 2012-01-10 00:49:31 +01:00
oy 9251796c3a fixed rendering on pause/specific speed for damage indicators and muzzle in the demo player 2012-01-09 23:43:53 +01:00
oy 3e918075df added an option to show only chat messages from friends 2012-01-09 23:29:15 +01:00
oy e97cfaecad buffered chat input. Closes #916 2012-01-09 23:13:51 +01:00
oy 590dbac239 put the game version constants all together in one file. Closes #870 2012-01-09 02:02:02 +01:00
oy 4073520214 cleaned up content folder creation. Closes #845 2012-01-09 01:38:45 +01:00
oy de8c9b23eb added command to toggle config values. Closes #888 2012-01-09 01:25:18 +01:00
oy 4fde2cf7f2 add tuning to demo. Closes #899 2012-01-09 00:49:20 +01:00
oy 7d2df3a386 added some vector operators 2012-01-09 00:38:20 +01:00
oy 7c300ccc7b added player names to dm score hud and repositioned the player name in team games. Closes #871 2012-01-09 00:28:42 +01:00
oy 526262ea55 increased the size of emoticons in the selector. Closes #625 2012-01-09 00:23:58 +01:00
oy e960cbdff3 added a config to display the code string of a country flag instead of the image. Closes #897 2012-01-08 18:16:38 +01:00
oy 3811476c6e removed multiple updating of the renderinfo for ninjas. Closes #855 2012-01-08 15:44:49 +01:00
oy 3626286d0d skip inactive kick for debug dummies to avoid console spam 2012-01-08 15:26:37 +01:00
oy 672b70e9b9 fixed some line endings 2012-01-08 13:57:40 +01:00
oy 57a975f38e added a server command to lock teams. Closes #831 2012-01-08 13:55:20 +01:00
oy a9db705c14 fixed that refocus is done when using Home-key in a editor edit box. Closes #821 2012-01-08 13:36:47 +01:00
oy f8b895181a show animation/grid/zoom level in the map editor. Closes #780 2012-01-08 13:16:19 +01:00
oy bafd22ebe7 show path in the editor file dialog. Closes #786 2012-01-08 13:14:02 +01:00
oy be37147342 fixed border rendering in the editor's image preview. Closes #908 2012-01-08 01:47:53 +01:00
oy 58f5779508 - disabled clipping lines in the tile picker
- fixed aspect ratio of the image in the tile picker
Closes #833
2012-01-08 01:14:52 +01:00
oy 535324d6ed added an entry for the kill command to the controls menu. Closes #652 2012-01-08 00:20:02 +01:00
oy 45302957f1 removed some unused zlib stuff. Closes #907 2012-01-07 23:50:47 +01:00
GreYFoX 420447dc51 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
Conflicts:
	readme.txt
2012-01-07 19:16:20 +02:00
oy 6649d651a8 switched client and highlight chat sound. Closes #630 2012-01-06 20:06:13 +01:00
oy 2785293469 don't start playing the music again if we're quitting 2012-01-06 20:03:57 +01:00
oy f3ebfae18e drop multiple chat sounds that are played within 300ms. Closes #440 2012-01-06 19:47:49 +01:00
oy b592d7a591 cleaned up playing of global sounds 2012-01-06 19:38:40 +01:00
oy 6ad6d59b6f fixed memory corruption with snd_buffer_size config 2012-01-06 19:27:18 +01:00
oy 29738552a6 made bindaddr config work for client and master too. Closes #909 2012-01-06 19:17:14 +01:00
oy 78bb0e3d8c fixed compiling for macosx 2012-01-06 16:35:48 +01:00
oy 71dd0c5aab made gfx_finish work again 2012-01-06 14:12:49 +01:00
oy 12f76e7f8d made the editor work again. Closes #914 2012-01-06 12:55:19 +01:00
GreYFoX c46f3e06e7 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 2012-01-04 20:10:07 +02:00
oy f14c0e2359 fixed linking for older gcc versions 2012-01-04 01:19:54 +01:00
oy f4f425b230 fixed compiling with gcc on windows 2012-01-04 01:10:56 +01:00
oy cc94472f04 fixed mac osx 2012-01-04 00:52:24 +01:00
oy 213b88835e fixed compiling on windows 2012-01-04 00:48:04 +01:00
oy 7328098f8d Merge pull request #912 from matricks/threadedflip
Threadedflip
2012-01-03 15:40:30 -08:00
Magnus Auvinen 7393151b6d fixed the osx opengl make current thingie.. I think... 2012-01-03 22:53:24 +01:00
Magnus Auvinen 666401e309 added osx implementation. not tested, not even compiled once. hope it works 2012-01-03 22:49:31 +01:00
Magnus Auvinen 2991f4071e fixed kicking of command buffer if it's full when rendering. fixed compile error on windows 2012-01-03 22:01:37 +01:00
Magnus Auvinen 50d872531a cleaned up the code. fixed so that SDL is inited on main thread and then transfers the gl context to the render thread 2012-01-03 21:39:10 +01:00
Magnus Auvinen e59b24d8db fixed atomics and semaphore for windows. can't test it correctly however due to that I only have a virtual box machine 2012-01-01 15:56:28 +01:00
Magnus Auvinen c31c82a584 added support for video modes 2012-01-01 14:30:45 +01:00
Magnus Auvinen d7fe3ddaab fixed shutdown and screenshot functionallity 2012-01-01 14:15:35 +01:00
Magnus Auvinen c1942ca6cb fixed the render frame time and cleaned up some more code 2012-01-01 13:38:46 +01:00
Ravomavain 1392c35bb4 Fix banmaster 2012-01-01 04:55:33 +02:00
Ravomavain ebf64758b1 Make spectators see the same thing as the player they spectate 2012-01-01 00:15:16 +02:00
Ravomavain 02372ac0b0 Don't allow kill if player is paused 2012-01-01 00:15:16 +02:00
Ravomavain c85d7bcc0f Make spectators hear the same thing as the player they spectate 2012-01-01 00:15:16 +02: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
GreYFoX 250b3b9416 i was scared that @heinrich5991 may send people to kill me while i sleep for hard coding something into DDRace 2011-12-31 19:16:40 +02:00
Magnus Auvinen 8b76105cfa cleaned up some of the code 2011-12-31 14:00:49 +01:00
oy c975390195 made vote ban check if the ip matches an authed player 2011-12-31 12:11:48 +01:00
Magnus Auvinen 6e57620c2c added flags for mipmap generation on textures. fixes missing texts 2011-12-31 11:18:55 +01:00
Magnus Auvinen b31abc4053 fixed so that you can select graphics backend via gfx_threaded 2011-12-31 10:29:25 +01:00
Magnus Auvinen 4e923442e4 fixed the broken damage indicators 2011-12-31 10:15:54 +01:00
Magnus Auvinen 7a36a103ae fixed so that the rendering can be done async from the input, network and update 2011-12-31 10:04:46 +01:00
Magnus Auvinen 8a91bfa1dd fixed texture upload support. removed raw gl calls from the text render 2011-12-31 09:40:11 +01:00
Magnus Auvinen 50e75da333 fixed so that the resolusion is set correctly on init 2011-12-31 01:23:04 +01:00
Magnus Auvinen 09b785a290 splitted out the graphics threaded into a separate header 2011-12-31 01:11:24 +01:00
Magnus Auvinen 8e56885795 initial commit of the threaded graphics. can start game and render the gui. no textures at the moment. still waits for the swap for now 2011-12-31 01:06:04 +01:00
Ravomavain 9de29f3775 Paused players can hear sounds. Fix #127. 2011-12-31 01:44:37 +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
GreYFoX 21be03f3c6 fixed messages 2011-12-31 01:34:48 +02:00
GreYFoX 7820e48ec6 Minor changes 2011-12-31 01:33:11 +02:00
oy ccaec79567 made it possible to automatically swap teams between rounds 2011-12-30 22:47:26 +01:00
oy 11cc0e78d7 removed chat spam for the team commands 2011-12-30 22:30:28 +01:00
oy ed4158e837 fixed last commit 2011-12-30 22:17:51 +01:00
BeaR afb1d5e201 Swap and Shuffle Teams 2011-12-30 21:52:01 +01:00
oy 8052ddf0ff fixed compiling 2011-12-30 19:35:57 +01:00
oy de3e94d901 clean up temp commands on logout in the client 2011-12-30 19:21:00 +01:00
oy ec4bb94537 added logout command for econ 2011-12-30 19:12:31 +01:00
Magnus Auvinen 8ffe582615 ugly incomplete hack to put the rendering into another thread so we don't have to wait for the flip 2011-12-30 16:02:22 +01:00
GreYFoX 7d462b565d Fixed the bugs i know of with the last few commits 2011-12-30 16:51:08 +02: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
heinrich5991 72d5ef329b added tileset_borderrem and renamed tileset_bordercopy -> tileset_borderset 2011-12-29 14:36:00 +01:00
heinrich5991 5722592916 added tileset_borderadd, aesthetical changes 2011-12-29 14:35:51 +01:00
heinrich5991 f76c7a8873 fixed a bug with constants, made the macro more readable 2011-12-29 14:35:45 +01:00
heinrich5991 41daa3b110 added tileset_bordercopy tool 2011-12-29 14:35:33 +01:00
oy 80835d2c11 added version files for pnglite and wavepack(both up-to-date). Closes #900 2011-12-29 14:00:28 +01:00
oy 353f5cc8d6 fixed that the flag grab sound is played several times in a server side demo. Closes #901 2011-12-29 13:56:24 +01:00
GreYFoX 2baa440866 Happy New Year, all tees are now born happy, Version v1.11 2011-12-29 14:39:51 +02:00
GreYFoX 9af4f1e172 Added race started check 2011-12-29 14:35:14 +02:00
oy 4c73eab869 fixed empty player names based on utf8 characters. Closes #904 2011-12-29 13:34:13 +01: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
oy 988b1c22cf fixed that the server browser list gets sorted twice on a new entry 2011-12-29 13:06:53 +01:00
oy af9775f400 fixed texture increasing in the text renderer 2011-12-29 13:03:06 +01:00
oy 4f0ee26fcf removed some unused code 2011-12-29 12:37:28 +01:00
GreYFoX ff6b9609f3 sv_nameless_score default 0 Whether nameless tee has a score or not. Closes #100. 2011-12-29 11:39:01 +02:00
GreYFoX 66c321c547 Added sv_eye_emote_change_delay default to 1 to Close #94. 2011-12-27 12:20:12 +02:00
GreYFoX 539b686f85 Let's see if this helps #85 or not! 2011-12-26 15:31:05 +02:00
GreYFoX 49e875e3a3 v1.1a 2011-12-26 14:07:57 +02:00
GreYFoX 41eed130cd removed TODO 2011-12-26 13:56:51 +02:00
GreYFoX b68f5facea Fixed DDRace hud.cpp 2011-12-26 13:56:24 +02:00
GreYFoX 6bedea0c6a DDRace Score in Time Format 2011-12-26 13:45:41 +02:00
GreYFoX 8b09813288 old useless todo 2011-12-26 11:56:12 +02:00
GreYFoX e96da00103 Fixed Some Todos in the code 2011-12-26 11:15:43 +02:00
GreYFoX cdab951296 Increasing the Readability on primitive editors of DDRace Specific files (All files that does not exist in oy/teeworlds) 2011-12-25 15:51:47 +02:00
GreYFoX ee115b5346 Version update 2011-12-25 15:34:07 +02:00
GreYFoX bfed5bad1a Added License INfo to missing files and updated the old ones 2011-12-25 15:33:05 +02:00
GreYFoX 4da271df56 Deleted a useless state and added onTeamStateChanged Event 2011-12-25 15:19:03 +02:00
GreYFoX 8a7c0df1d5 Mini performance improvement 2011-12-25 15:00:47 +02:00
GreYFoX 28cd7afa24 You srsly REALLY can't join teams that fast! 2011-12-25 13:20:10 +02:00
Learath2 81b34086e2 Fix for zoom issue. 2011-12-23 10:43:46 +02:00
Shereef Marzouk 1871207bfe Version and Credits 2011-12-14 17:05:48 +02:00
Shereef Marzouk f5f706ca6d Merge branch 'DDRace' of github.com:GreYFoX/teeworlds into DDRace 2011-12-14 17:02:45 +02:00
Shereef Marzouk c496bf3c4e Merge branch 'master' of https://github.com/oy/teeworlds into DDRace
Conflicts:
	bam.lua
	scripts/make_release.py
2011-12-14 17:01:47 +02:00
eeeee 385be8a716 updating existing bans' expiration would break ordering in bans sorted list 2011-12-14 13:48:41 +01:00
eeeee 0c16a58563 enforce upper limit on minutes to prevent unix timestamp from overflowing 2011-12-14 13:47:49 +01:00
eeeee 8f5f45c18f keep lifebans at the tail of bans list. Fixes #131 2011-12-14 13:47:23 +01:00
oy 6e20c32859 removed some resource loading spam. Closes #894 2011-12-10 18:23:29 +01:00
oy 99f04a7f87 let the server check if the input aims the center. Closes #889 2011-12-10 18:21:12 +01:00
XXLTomate 26e7a5888f compile fix 2011-12-09 23:00:40 +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
Choupom 1efb494169 fixed #791 Ability to disable the magnetic behaviour of the grid 2011-12-04 22:44:06 +01:00
Choupom 713dd3bc08 fixed controls rendering with low ui scale 2011-12-04 22:43:41 +01:00
oy f12095fb51 fixed win64 building 2011-12-04 22:28:58 +01:00
oy 55fe59fa8a updated zlib to 1.2.5 2011-12-04 17:50:52 +01:00
oy 9221f3dda2 added missing close for a file search handle 2011-12-04 17:21:34 +01:00
oy c3a91f19b3 fixed debug message, c&p... 2011-12-04 17:12:44 +01:00
oy c057f96540 fixed error message for socket creation on windows 2011-12-04 17:09:30 +01:00
oy 8e0ce38e29 fixed sv_max_client usage 2011-12-04 16:51:33 +01:00
oy 9a03989e84 added "Make an option for each envelope: (a) synchronized (b) starting at join" by Choupom 2011-12-04 14:39:47 +01:00
Choupom b2a825652d added a command to unban all 2011-12-04 14:22:59 +01:00
Choupom 873c5a77bc some trivial fixes 2011-12-04 14:21:20 +01:00
oy 0fdc9c1b8e cleaned up few things 2011-12-04 14:17:05 +01:00
oy b99ac459be fixed envelope rendering when seeking in the demo player 2011-12-04 14:04:12 +01:00
SushiTee e411d8f591 made envelope rendering more smooth 2011-12-04 13:15:24 +01:00
Shereef Marzouk 198334ef66 Merge pull request #125 from XXLTomate/PullVictims2
Pull victims2
2011-12-01 10:03:48 -08:00
GreYFoX 077217a802 incremented version 2011-12-01 19:51:51 +02:00
GreYFoX 5ebf60891c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 2011-12-01 19:48:09 +02:00
oy df4e11dc82 fixed fixed camera position when chatting as spectator. Closes #880 2011-11-30 01:47:35 +01:00
oy 05f77f64af added caching for the play command. Closes #891 2011-11-30 01:41:00 +01:00
oy 48d367db20 added faster way of inverting the sorted serverlist by KillaBilla. Closes #885 2011-11-29 22:34:47 +01:00
oy 8238853b8c added a todo note 2011-11-29 22:18:40 +01:00
eeeee 1452b6811c Replaced sorting implementation with stable one to prevent annoying flickering on server browser update. 2011-11-29 22:16:41 +01:00
oy e858c9396b renamed a variable 2011-11-29 22:15:27 +01:00
SushiTee c22b6c4b4f fixed selecting of quad points 2011-11-29 22:03:10 +01:00
SushiTee 48d21b61a2 fixed links between tile layer color envelopes when deleting envelopes 2011-11-29 22:01:03 +01:00
XXLTomate 17e633f00e Remove two unused config lines 2011-11-08 22:39:36 +01:00
XXLTomate 9a59dd4158 victims at force_vote; cmd description updated 2011-11-08 22:08:37 +01:00
GreYFoX 323e63453b fixed team cheat. Closes #103 2011-11-08 15:21:03 +02:00
GreYFoX df0798a673 Fixed pickup sounds. Closes #111 2011-11-08 14:15:31 +02:00
GreYFoX 09232125b4 Ability to disable emotes. Closes #115 2011-11-08 14:09:42 +02:00
GreYFoX d6845f0502 Vote enforcer as command executer
Force pause doesn't need the client id to be positive
Fixed force pause parameter reading

partially helps #124
2011-11-08 13:56:08 +02:00
XXLTomate 137a447065 Victims without callback(s) 2011-11-08 12:30:54 +02:00
Ravomavain 24fc16543c Fix chat commands being too verbose if console_output_level is set on config file. Close #116 2011-10-31 19:16:43 +01:00
XXLTomate 771293a922 Fixing muteID 2011-10-12 21:31:33 +02:00
Shereef Marzouk b5f8738acd Merge pull request #118 from XXLTomate/ddracePullSqlFix
fixing sql score by @Laxa
unrevised untested @XXLTomate thanks but please test and maintain i didn't even see the changed code
2011-10-12 10:29:12 -07:00
XXLTomate a2cec1b990 fixing sql score by @Laxa 2011-10-12 19:17:48 +02:00
GreYFoX 116daa67d3 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 2011-09-13 01:01:25 +02:00
Ian Wilson 5dd2d189ad Fixes for compiling with Solaris kernel.
Fixed typo in CONF_PLATFORM_SOLARIS. Made sure that we don't try to use
the gcc endianness for Solaris. Included sys/filio.h for Solaris so that
FIONBIO is defined. Added linking flags -lsocket and -lnsl for Solaris
in bam.
2011-09-12 00:16:31 +02:00
GreYFoX 1837c76a07 fixed a crash 2011-09-08 01:02:09 +02:00
GreYFoX d9f973b8da SQL Fix 2011-09-08 00:51:55 +02:00
GreYFoX eda127392a 0.6 trunk, 1.096a 2011-09-05 15:51:58 +02:00
GreYFoX 9f16db0969 Fixed tuning reset 2011-09-05 13:55:47 +02:00
Sergey b326fc245f Count change_map in sv_vote_map_delay too. 2011-09-04 22:24:40 +02:00
GreYFoX df5a63948a Fixed warning: src/game/server/teams.cpp:206: suggest parentheses around && within || 2011-09-03 01:10:08 +02:00
Ravomavain 7b8575f755 There is a variable for that, use it! :p 2011-09-03 01:08:37 +02:00
Ravomavain 04981004d5 Improve Checkpoint-teleporters: if no matching destination is found for the current checkpoint, check previous ones 2011-09-03 01:08:37 +02:00
GreYFoX fe5e9f4ad7 Removed redundant command from console 2011-09-03 00:28:56 +02:00
GreYFoX 37d3bfee81 0.6 trunk, 1.095a 2011-09-02 22:25:38 +02:00
GreYFoX 6c99ea2104 CMDList 2011-09-02 22:25:16 +02:00
GreYFoX abfd5555b0 DDRace tuning vars reset every map, but default Teeworlds tuning vars don't 2011-09-02 20:37:03 +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
Ravomavain 5b44fae0ce Remove unneeded variables 2011-09-02 12:05:14 +02:00
Ravomavain b24b67518a Allow chat commands to be used in remote console 2011-09-02 12:05:14 +02:00
GreYFoX 5035506825 Fixed team collision and 0.6 trunk, 1.094a 2011-09-01 20:29:08 +02:00
GreYFoX d960765552 fixed warning: src/game/server/entities/laser.cpp:93: 'f' may be used uninitialized in this function 2011-09-01 02:14:05 +02:00
GreYFoX f845f271ad Fixed warning: src/game/server/ddracechat.cpp:267: unused variable 'pSelf' 2011-09-01 00:30:37 +02:00
GreYFoX dd3568338f 0.6 trunk, 1.093a 2011-08-31 23:37:04 +02:00
GreYFoX b7e3bbb824 added fix for #82 by BeaR 2011-08-31 23:36:41 +02:00
GreYFoX aad11d2cae 0.6 trunk, 1.092a 2011-08-31 23:00:00 +02:00
Ravomavain 7d1a392f03 Fix chat command and close #81 2011-08-31 22:58:48 +02:00
GreYFoX ff696bad6c Mac Loves Cyclic Includes 2011-08-31 13:56:04 +02:00
GreYFoX 71239fadb2 no more victims 2011-08-31 13:12:46 +02:00
GreYFoX 3ad8284716 Fixed #77. top5 2011-08-31 12:30:18 +02:00
GreYFoX 7e24be5d83 Version 1.091a 2011-08-31 12:10:15 +02:00
GreYFoX bf5374adbf Reverted a change 2011-08-31 02:48:58 +02:00
GreYFoX f2e34075b8 Fixed the /cmd crash Fixes #76
deleted the chat console on destruction
2011-08-31 02:39:08 +02:00
eeeee cfde5a20ec allow usage of eyeemotes in freeze 2011-08-31 02:36:47 +02:00
GreYFoX 03bd3823ec Fixed SQL Compilation 2011-08-27 23:32:40 +02:00
GreYFoX 4ca0681689 Added chat commands for only chat and available to all users
Thanks @heinrich5991 for this idea of a separate console object to handle it
2011-08-27 17:11:39 +02:00
GreYFoX 7e19f1bca3 Fixed rendering of maps like Hardcore_02
Since the game layers are allowed only once, there is not way for this to run twice
2011-08-27 15:05:28 +02:00
GreYFoX 7e6f6465b7 typo 2011-08-27 14:12:13 +02:00
eeeee 2d4c965c7e prevent excess draggers snapping to save loads of traffic 2011-08-27 14:09:06 +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 c7d9b289e7 Added a command to check user status commands 2011-08-26 23:37:10 +02:00
GreYFoX 9fe96f6b04 Test Commands check and feedback on command not executed 2011-08-26 23:24:46 +02:00
GreYFoX 94c0088c1b Set the AccessLevel at login 2011-08-26 20:23:47 +02:00
Ravomavain 8bd82a3550 Fix DDRace layers in editor 2011-08-26 20:05:18 +02:00
GreYFoX b75a26eed9 Fixed the console 2011-08-26 20:03:30 +02:00
Ravomavain e8229f537f Fix loading of old maps 2011-08-26 16:34:25 +02:00
Ravomavain 15d0a40825 Add user level access and use this level for /cmds if player is not authed. 2011-08-26 16:28:14 +02:00
Ravomavain 5912395554 Clarify this if statement. 2011-08-26 16:28:14 +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
oy b1e7797b19 fixed compiling with mingw 2011-08-19 00:12:30 +02:00
SushiTee 2ceb0fde91 fixed editor zooming if gui is not active 2011-08-16 23:15:51 +02:00
oy 2708256186 fixed quad selection via envelope preview 2011-08-16 21:35:00 +02:00
oy f36cc57bdd fixed last commit 2011-08-15 20:12:31 +02:00
Alexandre de5eccef3f Fix Stuffs & clean comments 2011-08-15 18:07:09 +02:00
Alexandre 367bb4b837 Map Editor: Envelope Preview 2011-08-15 18:07:05 +02:00
oy c38c632d06 fixed multiple popup creation in the editor. Closes #836 2011-08-13 19:22:01 +02:00
oy 4e830a71a1 decreased top offset of image add button in the editor. Closes #834 2011-08-13 18:53:41 +02:00
oy 7058726236 changed default UiPage to PAGE_INTERNET. Closes #839 2011-08-13 18:50:17 +02:00
GreYFoX 06afe36db4 Removed old hook through prediction as 0.5.2 servers are no longer compatible
made it possible to load old maps
Enumerated layers
2011-08-13 02:12:40 +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
Shereef Marzouk 2084febca7 Removed outdated comment 2011-08-11 10:43:27 +02:00
oy 5fc5b63dac just list the correct envelope types(colour/pos) when linking an envelope to a quad/tile layer 2011-08-06 22:30:18 +02:00
oy de05682d87 fixed play hooking when tune player_collision is 0. Closes #825 2011-08-06 13:57:59 +02:00
oy 003c0aa281 fixed aspect ratio in the editor's image preview. Closes #784 2011-08-06 13:08:29 +02:00
oy f1ea039df7 added separator in image menu. Closes #785 2011-08-05 19:52:39 +02:00
oy 2b2ddde04f sort players in kick/move to spec vote and player options by team. Closes #809 2011-08-05 19:52:38 +02:00
oy e5395f00b3 fixed that activating a quad point doesn't align it on the grid and made moving the pivot use the grid. Closes#792 2011-08-05 19:52:37 +02:00
oy fee2c2c452 fixed an overlapping in the editor. Closes #794 2011-08-05 19:52:36 +02:00
oy b7605dd0b5 reset quad point selection when activating a different quad. Closes #819 2011-08-05 19:52:34 +02:00
oy 72eb98c75e changed to trunk again 2011-08-05 19:52:33 +02:00
oy 709c05bb37 improved description for restart command. Closes #796 2011-08-05 19:52:32 +02:00
oy 2aee50d5b1 fixed a nasty noise problem. Closes #812 2011-08-05 18:37:59 +02:00
oy dfd9e142d5 Merge pull request #801 from fisted/fix_srs
here is clevar solution for serious design flaw
2011-08-03 13:54:48 -07:00
oy 435639636e Merge pull request #808 from SushiTee/master
fixed a warning
2011-08-03 13:53:18 -07:00
Shereef Marzouk 8877cf2293 Refactored some pointers 2011-08-02 12:35:14 +02:00
Shereef Marzouk 2b5c532589 converted white spaces to tabs 2011-08-02 12:14:49 +02:00
Shereef Marzouk c1b23535ff fixed typo 2011-08-02 12:14:23 +02:00
Shereef Marzouk 29de27f9dd Used the enum const TILESLAYERFLAG_GAME instead of 1 2011-08-02 12:14:00 +02:00
SushiTee 83652c91ec fixed a warning in client (mac) 2011-08-01 21:03:51 +02:00
SushiTee 370b93d8e1 fixed a warning 2011-08-01 12:11:10 +02:00
oy 50edfd37c0 made 0.6.1 release 2011-07-31 23:17:00 +02:00
oy b25fc26c1c zero out client memory on startup to prevent more bad surprises 2011-07-31 18:39:48 +02:00
oy 9cf4facd05 fixed a client crash in debug. Closes #806 2011-07-31 17:07:10 +02:00
oy 3209aec45f fixed compiling error on osx 2011-07-31 13:17:38 +02:00
oy 9418802150 protected econ authentication against brute force 2011-07-31 13:05:12 +02:00
oy 1705c90e14 fixed ban for life on the server 2011-07-31 12:43:35 +02:00
oy aabac3dcfc send notification to enter a password when a client connects to econ. Closes #803 2011-07-31 02:25:55 +02:00
oy 9349af0085 clean up econ sockets on shutdown. Closes #804 2011-07-31 02:20:46 +02:00
oy 10c3e844d7 show alpha2 country code strings next to the flag in the country code selectors. Closes #805 2011-07-31 02:04:46 +02:00
oy 8d0cc2a825 reduced stack memory usage of CDataFileWriter 2011-07-31 01:40:28 +02:00
oy 34132ce244 fixed client crash in debug 2011-07-31 01:38:45 +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 7db6d1e056 fixed problem with player collision. Closes #722 2011-07-30 18:08:24 +02:00
oy b3e8506f20 create client on heap. Closes #744 2011-07-30 13:50:22 +02:00
oy a0a62bcd70 fixed econ feature and tcp 2011-07-30 13:40:01 +02:00
heinrich5991 b0fdc40959 deleted unnecessary empty files 2011-07-29 17:51:19 +02:00
heinrich5991 2ba6fbd731 added econ functionality 2011-07-29 17:51:14 +02:00
oy 65d312fd06 fixed problem with lineinput. Closes #802 2011-07-28 22:01:14 +02:00
GreYFoX 74462d4611 enumerated laser types, made it possible to choose which weapon to disable using switch layer delay variable 2011-07-25 22:16:20 +02:00
GreYFoX 831aea796e Saving hitting status on pause 2011-07-25 21:15:51 +02:00
fisted 7197d7bc13 extensive source layout enhancement 2011-07-25 18:28:02 +02:00
Choupom b7aa8af7aa thats why magic values sux 2011-07-23 18:42:51 +02:00
GreYFoX 344944c9d4 --b * 2 2011-07-22 16:23:03 +02:00
GreYFoX d965eb7453 utter noobness 2011-07-22 16:15:39 +02:00
GreYFoX cdbbf9e74b Removed a useless line
ps. commiting from the car while driving via iPhone xD
2011-07-22 16:02:56 +02:00
GreYFoX dd015c33c0 Fixing the sound for the laser when a player DCs after shooting it 2011-07-22 15:03:15 +02:00
GreYFoX 8f927a6033 Fixed a crash 2011-07-22 14:52:28 +02:00
GreYFoX d7fe844690 1.082a 2011-07-22 14:33:07 +02:00
GreYFoX 2964919bf2 Some logic fixes 2011-07-22 14:29:27 +02:00
GreYFoX b0420e66ee used Teams() instead of ((CGameControllerDDRace*)GameServer()->m_pController)->m_Teams 2011-07-22 00:01:12 +02:00
GreYFoX 3d07ffdbdd Added the Missing Single Tee No Hitting Logic 2011-07-21 03:13:59 +02:00
oy 6312a2d71c fixed few things in th editor 2011-07-20 22:18:31 +02:00
Choupom 84e5c53432 added color envelope feature for tilemaps 2011-07-20 22:04:13 +02:00
Choupom c2e8bf5035 made a constant for game layer flag 2011-07-20 21:54:23 +02:00
Choupom 188e622373 fixed auto_map.h header guard 2011-07-20 21:54:19 +02:00
Choupom 6b2dc40570 fixed a rcon authentication issue 2011-07-20 21:49:38 +02:00
GreYFoX 959b11b13d Admin protection closes #59 2011-07-20 03:18:03 +02:00
GreYFoX a6922db418 1.081a 2011-07-19 23:33:46 +02:00
GreYFoX 1dfd2882d2 Added Hit as a tile
Entities are in the previous commit
2011-07-19 23:33:12 +02:00
SushiTee f7a9e80163 added possibility to collapse groups by double clicking them 2011-07-15 01:03:22 +02:00