Commit graph

2090 commits

Author SHA1 Message Date
heinrich5991 a2e64f0a16 Don't send token to harmless vanilla clients 2016-06-07 15:52:57 +02:00
H-M-H ada3b9a5db Merge pull request #378 from H-M-H/sqlmasters
separate sqlwrite and sqlread server
2016-05-28 23:00:16 +02:00
heinrich5991 4d6657e3f1 Fix CRC of dummy map 2016-05-26 11:06:56 +02:00
heinrich5991 b075f1ff1b Use a dummy map with background 2016-05-25 23:47:34 +02:00
heinrich5991 702ed7e023 Reduce dummy map size from 549 bytes to 191 bytes
Also include a tool to generate said map; the map is generated without
any hacks. It could likely be made smaller using a few tricks.
2016-05-24 01:47:04 +02:00
heinrich5991 e353aa80b2 Don't send uninitialized memory over the network 2016-05-23 11:48:23 +02:00
H-M-H b648b530d5 Merge branch 'master' into sqlmasters 2016-05-20 23:40:29 +02:00
Tim Schumacher 96bcedec29 just set first char of ddnet filter to zero 2016-05-19 15:54:52 +02:00
Tim Schumacher dae855ee9f clear ddnet filter strings before appending 2016-05-19 15:51:48 +02:00
def 1645310750 Keep reading packets after invalid control packet 2016-05-17 23:44:57 +02:00
def bb634d7641 Reconnect to last server address, not the one selected in browser 2016-05-17 18:56:33 +02:00
HMH c4843868c4 do not log the sql-passwords 2016-05-16 15:41:52 +02:00
HMH a073d22509 set timeout for sql-reads/writes 2016-05-16 15:37:51 +02:00
def 695bf346ac Make gfx_refresh_rate functional (fixes #255) 2016-05-10 17:43:27 +02:00
def 2fc2515e0f Fix DDNet server browser to refresh only once on start, not twice 2016-05-10 12:40:33 +02:00
H-M-H 3b6baaa8d3 made CSqlData const for threadfunctions and added a class for sqlstrings
CSqlData is const for threadfunctions now to avoid modification from
within the threadfunctions as these might be called several times.
Previously this was a problem as ClearString could possibily be applied
multiple times to the same string.

To solve this the class CSqlString has been added. This class takes a
const char* and copies it. Additionally a clearstring is created from
the given const char*. This enables access to the original as well as
the cleared string safe for sql-statements.

sql_string_helpers got an own source file now.

A crashbug from CSqlServer has been fixed (pointer has not been set
back to 0)
2016-05-09 23:35:23 +02:00
def f3a4069867 Set gfx_highdpi to 0 as default (needs someone to fix it on Win >= 8.1 and Mac) 2016-05-08 19:40:53 +02:00
Dennis Felsing 6c771f6bff Merge pull request #475 from east/timeoutprotfix
Copy resendbuffer on timeout protection
2016-05-07 23:41:54 +02:00
def 461a09451d Improve handling of multiple screens and missing screens 2016-05-07 23:19:46 +02:00
def 642e7f7671 Still hide window at start (fixes fullscreen in Gnome) 2016-05-07 21:16:31 +02:00
east 1cbaa0c4ef copy resendbuffer on timeout protection 2016-05-07 19:28:16 +02:00
def 9bd30ce447 Make high-dpi screen support optional 2016-05-07 17:47:05 +02:00
def 4631a7cfa6 Try to enable HighDPI (untested) 2016-05-07 16:35:31 +02:00
def 340c4d2398 Leave it up to the WM where to position windows 2016-05-07 15:59:40 +02:00
def c325b08087 Add inp_mouseold for warped mouse input 2016-05-07 15:59:13 +02:00
def f2100fbad7 Change window focus handling (disable input grab when focus lost) 2016-05-06 11:29:34 +02:00
def 939f2136c0 Nicer way of handling Mac fifo rewinding (just don't use high level file streams) 2016-05-05 23:32:55 +02:00
H-M-H 319729e207 ifdef for rewind as it is only required of OS X 2016-05-05 21:15:15 +02:00
H-M-H 491d878a64 always read fifo from start 2016-05-05 20:29:31 +02:00
Dennis Felsing e7af8cfdd7 Merge pull request #466 from Ryozuki/pr_showpred
Fixed cl_showping (now cl_showpred)
2016-05-05 18:59:01 +02:00
def 14f1670fda Fix fifo console to remove newline character at end 2016-05-05 18:48:15 +02:00
Ryozuki 82d2a994ed Fixed cl_showping (now cl_showpred) 2016-05-05 18:07:00 +02:00
H-M-H 931d99e4c2 also destroy locks created by CSqlServer 2016-05-04 23:39:16 +02:00
def 1b668047c8 Clean up auto reconnect and make it independent of rendering 2016-05-04 18:23:00 +02:00
H-M-H 5dc47ede58 put sql_string_helpers into an own namespace 2016-05-04 16:51:18 +02:00
H-M-H a7c0cd58ee fixed birthdaycheck and the format of sql-inserts for the failure-file 2016-05-04 16:47:53 +02:00
H-M-H cd41220a44 wait for score-threads on shutdown 2016-05-04 15:32:24 +02:00
H-M-H 13688bbb2a fixed indentation 2016-05-04 00:27:03 +02:00
H-M-H e351080dd3 removed double semicolons 2016-05-04 00:24:54 +02:00
H-M-H c9e65c7931 Merge branch 'master' into sqlmasters 2016-05-03 23:07:24 +02:00
Henningstone be010ff370 Fixed crashbug in fifo.cpp 2016-05-03 19:17:44 +02:00
def a954241169 style 2016-05-02 23:37:40 +02:00
def 21ac41bfae Clean up fifo console 2016-05-02 23:36:21 +02:00
def 61e47422f6 Clean up debug messages a bit (lower case, no useless errors) 2016-05-02 21:35:32 +02:00
def a8ce73dffa Comment m_InpuIgnoredModifiers a bit 2016-05-02 18:21:54 +02:00
def a9ed7035ee Add inp_ignored_modifiers to ignore set of keyboard modifiers 2016-05-01 23:07:19 +02:00
def 28571e9cb5 Damn Windows XP 2016-05-01 20:23:14 +02:00
def 0bab90aa20 ALT modifier has no special meaning for key input 2016-05-01 19:57:38 +02:00
def 487de16200 Anotehr WinXP fix 2016-05-01 19:56:18 +02:00
def dc45ecbe6d Try to fix du.bat 2016-05-01 19:56:13 +02:00
def a4840cdfd3 Fix ed_showkeys with mousewheel 2016-05-01 19:34:16 +02:00
def faa576e73d Another mouse fix try 2016-05-01 15:34:36 +02:00
def 981533e177 More mouse fixes with SDL2 2016-05-01 15:20:52 +02:00
def 143fd88c2a Ignore relative mouse movement when in absolute mouse mode 2016-05-01 15:02:08 +02:00
def 644a23ba57 Fix folder creation 2016-05-01 14:45:47 +02:00
def ab13a0086d Updater: Support downloading files into new directories 2016-05-01 14:20:55 +02:00
def 779c6d2508 Only move cursor when window has mouse focus 2016-05-01 14:00:53 +02:00
def 32db2e6915 Updater: Support DLLs for win32 and win64 2016-05-01 13:11:51 +02:00
def 88780b8fbc Use new ddnet update server 2016-05-01 12:09:02 +02:00
def 15fa9f7b74 minor fix: false instead of SDL_FALSE 2016-05-01 11:39:40 +02:00
def 6b3e0981a1 Case-insensitive 2016-05-01 11:23:56 +02:00
def 53a7623191 Updater special handling for ttf files (same as dll) 2016-05-01 11:23:32 +02:00
def 13143eac23 Reconnect for timeout instead of bans, some simplification 2016-05-01 11:12:07 +02:00
def cc002d244d Fix gfx_resizable to be on by default with X11 2016-05-01 03:28:41 +02:00
def 72a6e20ba8 Split CInput::NextFrame() from CInput::Update() (fixes #444) 2016-05-01 00:18:25 +02:00
def d1b87e6794 Fix resolution on Mac OSX (fixes #445) 2016-04-30 23:10:09 +02:00
def f79bdf69a5 typo 2016-04-30 22:55:21 +02:00
Dennis Felsing f016a0eb1f Merge pull request #436 from timakro/pr_other_gametype_entities_clear
added entities clear for other gametypes
2016-04-30 20:28:27 +02:00
def 0385c3b520 Workaround for global hotkeys causing SDL keydown events 2016-04-30 20:27:47 +02:00
def 4761608329 Input fixes from TW master for mouse wheel 2016-04-30 20:11:26 +02:00
def 1446adee2c Window resizing only with X11 (not on Windows and Mac OS X) 2016-04-30 19:19:19 +02:00
def 644fec7e55 Resize window without restarting client 2016-04-30 17:59:58 +02:00
def 74f4ad77d6 fixed utf8 text input from tw master 2016-04-30 04:02:32 +02:00
def 502c5aa3cb Ignore keys after window regained focus 2016-04-30 03:32:23 +02:00
def 26c9c39004 Disable HighDPI displays 2016-04-30 03:32:01 +02:00
def 9b20d3a0ad Fix relative mouse 2016-04-30 02:06:41 +02:00
def 2a7aa33830 Normal mouse speed again 2016-04-30 00:52:43 +02:00
def 7a5b79e48a More SDL2 graphics goodness, partially from TW master 2016-04-30 00:43:11 +02:00
def 11e3fd55db seperated ingame input handling from rendering (from TW master) 2016-04-29 23:05:20 +02:00
def 1727dd5a72 Some early SDL2 Android fixes 2016-04-29 22:56:13 +02:00
def e8965bee68 Some keyboard input changes from teeworlds master 2016-04-29 21:56:38 +02:00
def 354696afb7 switch between fullscreen and windowed mode without restarting the client (by oy) 2016-04-29 21:56:38 +02:00
def 6c4e6c5c44 setlocale for XOpenIM with compose key 2016-04-29 21:56:38 +02:00
def 8e3550f9c6 Fix keyboard segfault 2016-04-29 21:56:38 +02:00
def 10d6f69d32 Fix Mouse buttons 4 and 5 2016-04-29 21:56:38 +02:00
def 0155c75cf4 Keyname for mouse9 2016-04-29 21:56:38 +02:00
def cc1f80471b Use same key limit as SDL2 does 2016-04-29 21:56:38 +02:00
def a089d3d36d Fix issue with keys not being recognized on non-English keyboards 2016-04-29 21:56:38 +02:00
def bd2b61f0e5 Initialize m_pClipboardText 2016-04-29 21:56:38 +02:00
def c5db3ef5f4 Use SDL_free instead of free 2016-04-29 21:56:38 +02:00
def ea45173612 Fix NotifiyWindow on Windows 2016-04-29 21:56:38 +02:00
def 3e9b8a62ce Add includes for windows' getenv/putenv/free 2016-04-29 21:56:38 +02:00
def 632db36fe4 Add clipboard copy&paste support (by swick) 2016-04-29 21:56:38 +02:00
def 9918ada2d8 Add comment about mouse sensitivity on X11 2016-04-29 21:56:38 +02:00
def 4111acd309 Add WIP 2016-04-29 21:56:38 +02:00
def 8bfc0008b7 Hide window until OpenGL context is created
Fixes aspect ratio distortion when using multiple screens with different
aspect ratio and switching between them while starting the client
2016-04-29 21:56:38 +02:00
def 6efd028393 Make NotifyWindow work with SDL2 2016-04-29 21:56:38 +02:00
def 38cfe32385 Fix stuck mouse 2016-04-29 21:56:38 +02:00
def 5cdb36ecb0 Debugging with text input handling 2016-04-29 21:56:38 +02:00
def ff2a7272fa Improved window grabbing: only when relative mouse mode is active 2016-04-29 21:56:38 +02:00
def 63a4c804de Grab window, fixes mouse moving out of window and losing control 2016-04-29 21:56:38 +02:00
def 2d70c3e292 Try to get SDL2 on Windows working 2016-04-29 21:55:48 +02:00
def db8a126315 Merge swick's SDL2 branch 2016-04-29 21:55:48 +02:00
Tim Schumacher 4a22e762ff added entities clear for other gametypes 2016-04-29 19:29:19 +02:00
Dennis Felsing 12fa78ca75 Merge pull request #316 from Learath2/pr_dllupdate
Allow for the update of dll files
2016-04-27 22:18:30 +02:00
def 86a0f46937 Add a connection limit (fixes #408) 2016-04-27 22:09:18 +02:00
def c473689be7 Remove VITAL flag in fastdownload map packets (as suggested by heinrich5991) 2016-04-27 19:54:43 +02:00
def ccbdf1d073 Add demo_speed command (fixes #354) 2016-04-27 17:21:40 +02:00
def 0f5611c2f0 Add function to filter chat out of demo when slicing (fixes #382) 2016-04-27 17:05:30 +02:00
Dennis Felsing 8e69f9ac90 Merge pull request #338 from east/mapvital
Added vital flag for mapdata (includes fast download)
2016-04-27 15:57:14 +02:00
east a5de7596fa comments added 2016-04-23 17:44:42 +02:00
east 32ba1c9239 Antispoof dm1 fallback on flood added 2016-04-23 17:23:01 +02:00
def a93e7710e1 Remove hacky security against rcon spoofing because we have a better one now (client-side) 2016-02-22 19:56:30 +01:00
def 91df0a2af0 Remove hacky security against rcon spoofing because we have a better one now 2016-02-22 19:54:45 +01:00
H-M-H 53a004fa74 reset preferred sql-server to the first specified
on map load
2016-02-20 15:33:35 +01:00
H-M-H 2bd6d0c381 do not always try to connect to unreachable sqlservers
but instead remember the last reachable server
- some cleanup
- added timeout of 10 seconds to sql-connections
2016-02-20 15:33:35 +01:00
H-M-H 783c2161f1 sql_score init is threaded now 2016-02-20 15:33:35 +01:00
H-M-H f6be7e20fb updated sql-command usage 2016-02-20 15:33:35 +01:00
H-M-H e35de5a371 whether to setup a db can be configured for each server now 2016-02-20 15:33:35 +01:00
H-M-H 1e302aeb70 'r' and 'w' instead of 0 and 1 for sql read/write servers 2016-02-20 15:33:35 +01:00
H-M-H 88ed7391da handle exceptions from sql properly
- write failed sqlinserts to a file
- improved structure
2016-02-20 15:33:35 +01:00
H-M-H 1314085928 restructured sqlconnection
reading from and writing to several different servers is now possible
TODO:
-handle Exceptions properly (try another sqlserver)
-if everything fails while writing write the insert to a file
2016-02-20 15:33:35 +01:00
H-M-H 7199ae3f22 ConAddSqlMaster will not block the main thread anymore 2016-02-20 15:33:35 +01:00
H-M-H 15f2e07c48 moved sqlserver stuff into CServer-class
as sqlconnections should not last only
until next mapreload
2016-02-20 15:33:35 +01:00
H-M-H 6ba10d2719 mastersqlservers are working now
TODO: move the sqlserver objects somewhere else
so they wont be destroyed on every reload
2016-02-20 15:33:35 +01:00
H-M-H 9ed66f7adc Cleanup of Sqlconnection
-moved all connectionstuff to a new class
-moved sqlstring functions to an own file
-do not give threads access to CSqlScore
2016-02-20 15:33:35 +01:00
Tim Schumacher 9e6e062793 added cl_skin_filter_string for skin quick search 2016-02-14 19:51:49 +01:00
Dennis Felsing 269bd3df4b Merge pull request #412 from heinrich5991/pr_ddnet_overlong_utf8_server
Kick people using overlong UTF-8 sequences
2016-01-27 02:15:19 +01:00
def 0a49428e21 Veto considers time on server not in current race 2016-01-27 02:14:46 +01:00
heinrich5991 a1923b154b Only ignore messages on invalid UTF-8, don't kick players 2016-01-27 01:48:19 +01:00
heinrich5991 d4eefefa26 Kick people using overlong UTF-8 sequences
This works around the bug in older clients (including vanilla) that
interpret those sequences incorrectly.
2016-01-27 01:24:02 +01:00
def 52224875b4 Style cleanup 2016-01-23 21:44:45 +01:00
def 51504d2bd2 Switch dummy snapshots as well to prevent snapshot accumulation (fixes #400) 2016-01-23 21:42:35 +01:00
def 56ca49f1de More conservative default for sv_server_info_per_second 2016-01-23 15:14:22 +01:00
def b77e95090e Reset m_ServerInfoFirstRequest on map change 2016-01-22 17:53:46 +01:00
heinrich5991 96f0eddbb8 Add sv_max_server_info_per_second
This controls how many complete server info responses are sent per
second.
2016-01-22 16:42:54 +01:00
heinrich5991 b29a733c4f Add DoS protection to server info requests
Only allow 10 requests per second before falling back to smaller server
info responses.
2016-01-22 16:42:46 +01:00
def 8636e6004a Print client ID as decimal number, not hexadecimal 2016-01-20 16:33:02 +01:00
Väinö Mäkelä f1038b0092 Obey the Teeworlds code formatting rules. 2016-01-18 18:20:47 +02:00
Väinö Mäkelä cb84cf2216 Improve the handling of invalid skins.
CDataFileReader::Open(): Check the return status of io_read()
before reading the buffer, to avoid reading uninitialized data
in case the file was shorter than a full header.

CSkins::SkinScan(): Check that the image is high enough.
2016-01-17 10:48:21 +02:00
H-M-H e41b4f463d Merge pull request #389 from H-M-H/command_usage
added (console-)command usage fixes #387
2016-01-03 20:59:32 +01:00
def c78ade00c1 Fix bug where timed out people can connect more than sv_max_clients_per_ip times 2016-01-03 01:42:28 +01:00
def 7223d0ecc1 Use a do-while loop instead 2016-01-02 19:51:22 +01:00
east f3f33904f7 secure_rand() as replacement for client source port generation 2016-01-02 15:37:44 +01:00
H-M-H cc2bbd62ca if there is no matching ']' do not attempt to read
beyond the given string
2015-12-29 00:45:51 +01:00
H-M-H 8e24ef8020 commanddescription can now be placed directly in
the commandparamsstring: "s[file]"
2015-12-28 16:19:52 +01:00
H-M-H 927c9d1999 forgot to adjust one usage 2015-12-23 14:51:55 +01:00
H-M-H 11a426c18b added (console-)command usage 2015-12-23 14:29:31 +01:00
H-M-H 80531130e5 made it beautiful ^^ 2015-12-18 13:17:45 +01:00
H-M-H 830726f392 prevent serverlogspam 2015-12-17 16:27:35 +01:00