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

1248 commits

Author SHA1 Message Date
Zwelf a8abc3937b Make game less dependend on score backend 2020-06-25 12:36:01 +02:00
bors[bot] 1750bb09f7
Merge #2335 #2336 #2340 #2342 #2349 
2335: Make it more clear that this is a sixup translation server r=heinrich5991 a=def-



2336: Set skill level for Sixup (fixes #2334) r=heinrich5991 a=def-



2340: Keeping multiple states consistent is hard (fixes #2315) r=heinrich5991 a=def-

let's go recount every time

2342: Don't forget video recorder fps setting r=heinrich5991 a=def-

after switching to non-videorecorder client

2349: Document which MySQL/MariaDB versions we require (fixes #2343) r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-06-24 14:37:53 +00:00
def ef61793854 Don't forget video recorder fps setting 
after switching to non-videorecorder client
 2020-06-24 14:50:25 +02:00
def a8a2b41f3a Set skill level for Sixup (fixes #2334) 2020-06-23 22:47:29 +02:00
bors[bot] 160a7b71fb
Merge #2279 #2327 
2279: Only forbid resizing when videorecorder is recording r=heinrich5991 a=def-



2327: List data files in `CMakeLists.txt` r=def- a=heinrich5991

This fixes missing files for people recompiling when we add new data
files.

Co-authored-by: def <dennis@felsin9.de>
Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2020-06-23 08:48:05 +00:00
heinrich5991 0db5c51ed9 Add a simple CSV writer for Python's "excel" csv dialect 2020-06-23 09:11:59 +02:00
def 83c820db09 Fix some naming conventions in videorecorder 2020-06-23 08:00:03 +02:00
def 252cda2d49 Use str_comp instead of strcmp 
error: ‘strcmp’ was not declared in this scope
 2020-06-22 14:47:49 +02:00
Learath 28905c4659 Disable timeout for 0.7 clients 2020-06-20 19:52:23 +03:00
bors[bot] 4a810091b1
Merge #2284 
2284: Remove sv_spectator_votes r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-06-20 10:46:03 +00:00
def c53528b92f Allow spectators to start votes 2020-06-20 11:20:54 +02:00
bors[bot] 5b4227fbba
Merge #2283 
2283: teehistorian: Track whether clients join via the 0.7 protocol r=Learath2 a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2020-06-19 20:31:40 +00:00
heinrich5991 e294da41ba teehistorian: Track whether clients join via the 0.7 protocol 2020-06-19 22:06:39 +02:00
Learath da68923ac3 Implement a switch for 0.7 compatibility 2020-06-19 22:08:41 +03:00
Learath 75e96aa5d3 Get rid of more magic constants, adapt to 0.7 2020-06-19 21:48:48 +03:00
Learath d200ef0bb0 Remove ugly hack 2020-06-19 21:42:19 +03:00
Learath 444bd93437 Fix recvmmsg again... 2020-06-19 20:28:55 +03:00
Learath d794520748 Remove forgotten debug messages 2020-06-19 20:28:55 +03:00
Learath 32fb6718dd Allow joining TEAM_SPECTATOR 2020-06-19 20:28:55 +03:00
Learath 2f760e3e40 Forgot to drop port 2020-06-19 20:28:55 +03:00
Learath 88ca573682 Serverinfo and Register support for 0.7 
Co-authored-by: Tim Schumacher <tim@timakro.de>
 2020-06-19 20:28:55 +03:00
Learath e81c718180 Rework netobjs, fix chat 2020-06-19 20:28:55 +03:00
Learath f9cc634683 Fix recvmmsg issue 2020-06-19 20:28:54 +03:00
Learath 807c92f1a4 Generate the 0.7 protocol 2020-06-19 20:27:15 +03:00
Learath f7e9df7abf Move the rest of the translation to CServer 2020-06-19 20:27:15 +03:00
Learath b0e5a37fa9 Do message translation differently 2020-06-19 20:27:15 +03:00
Tim Schumacher 442148a194 Begin work on 0.7 support 2020-06-19 20:27:15 +03:00
Learath e9ba23b53a Migrate to 0.6.5 flags 2020-06-19 20:27:15 +03:00
def 47e6c7cce2 Only forbid resizing when videorecorder is recording 2020-06-19 08:19:40 +02:00
12pm 01092a30c1 add sv_tele_others_auth_level 2020-06-14 19:21:12 +03:00
bors[bot] 92fc95d742
Merge #2202 
2202: Send DDNet version early in the connection process r=Learath2 a=heinrich5991

This gets rid of the problem that we don't know whether we should send
full snapshots to clients because they haven't told us about them being
DDNet yet.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2020-05-27 17:49:31 +00:00
heinrich5991 f339fea748
Merge pull request #2139 from edg-l/pr_add_upnp 
Add UPnP support
 2020-05-24 22:23:20 +02:00
Edgar 3569e174f2
refactor upnp code 2020-05-24 11:36:43 +02:00
heinrich5991 0d7872c79e Send DDNet version early in the connection process 
This gets rid of the problem that we don't know whether we should send
full snapshots to clients because they haven't told us about them being
DDNet yet.
 2020-05-22 17:58:41 +02:00
Zwelf cd015c5e37 Fix storing incomplete game uuid on /save 
Previously the formatted game uuid was cut off after 15 bytes.
Therefore only 52 out of 128 bit of the uuid were stored.

introduced in 69fd7f1767
 2020-05-20 22:18:14 +02:00
heinrich5991 afe2fc930e Fix ITIS, IDONTKNOW not being system messages 2020-05-16 00:41:03 +02:00
Ryozuki b647c1e978
Add UPnP support 2020-04-14 12:11:50 +02:00
Ryozuki 588f8a833f
Fix snapshot storage leak 2020-04-11 13:38:02 +02:00
Learath 388d792205 Add an option for highdpi 2020-04-07 23:47:15 +03:00
def f7e8b10bff Make gfx_resizable default to 0 
because of common graphics issues. As suggested by Jupstar
 2020-04-06 12:04:53 +02:00
def a8c3d192d1 Add cl_unpredicted_shadow -1 value (fixes #2100) 
to disasble unpredicted shadow even in debug mode
 2020-03-31 18:00:20 +02:00
sirius 3c085b53ed fix bug that demo can't play when demo pause and use start_video 2020-03-26 18:25:50 +08:00
bors[bot] 048ca9fe0a
Merge #2070 
2070: Fix demo recording with broken maps r=heinrich5991 a=Learath2

Apparently there are maps out there with broken headers advertising the wrong map size. This allows demos to be recorded on those.

Example of such a map is `ctf4_old_d668e9fa_2f472051b26b6bffaa4af8990cf882cafd6364e00e1333b77762cb9911e49464.map`
Hosted on `Allround Network`

Reported by teini94 on discord

Co-authored-by: Learath <learath2@gmail.com>
 2020-03-23 16:58:01 +00:00
bors[bot] bf821fe391
Merge #2071 
2071: Add an option to only start a new demo when connect while automatically record demos r=def- a=sirius1242

Origin auto demo recording of ddnet will generate lots of demo files especially when playing in mods which have shorter rounds, such as infclass. I added a new option to open a new demo file only when connect to server (include map changing), this is disabled by default, and can use `cl_auto_demo_on_connect 1` to open. It works only when `cl_auto_demo_record` open.

Co-authored-by: sirius <sirius.ustc@gmail.com>
 2020-03-23 16:38:17 +00:00
def 2319151fb4 Disable currently broken sv_vanilla_antispoof 2020-02-27 22:53:56 +01:00
sirius 72fd0f9a21 forget to check CONF_VIDEORECORDER defined or not for video rendering pause 2020-02-27 20:32:42 +08:00
sirius b5c931279f add option to pause video rendering when demo playing pause 2020-02-27 18:50:18 +08:00
sirius 50b980ea16 add an option to only start a new demo when connect while automatically record demos 2020-02-21 17:01:31 +08:00
Learath c52bbb6c02 Fix demo recording with broken maps 2020-02-19 15:38:58 +03:00
def 31ae4c4d5a use pid in file names of temporary files 
to prevent race conditions with multiple clients running when saving
maps, config on quit, during upgrade
 2020-02-12 23:14:30 +01:00
Dennis Felsing 50d848ec43
Merge pull request #1928 from sirius1242/demo_render2 
Demo to video converter function.
 2020-01-25 21:01:08 +01:00
oy ef3bce204c added some checks to snap handling 
(cherry picked from commit a09d498bc9)
 2020-01-21 22:16:28 +01:00
sirius 483885b6b1 try to solve the problem that video not fluent caused by previous commits 2020-01-08 14:25:06 +08:00
Learath d2fad6c79a Fix demo bug 2020-01-03 12:13:40 +03:00
def 017b8c3621 Move DDNet-custom json code out of external directory (fixes #2022) 2020-01-01 20:07:04 +01:00
sirius 7710b88670 Merge branch 'master' of https://github.com/ddnet/ddnet into demo_render2 2020-01-01 18:36:49 +08:00
Learath a882cf5196 Fix bug with slices 2019-12-22 19:09:14 +03:00
Learath 65ec25a8a1 Fix small bug with demos that don't include a map 2019-12-18 13:51:08 +01:00
Dennis Felsing 4171e8751f
Merge pull request #1939 from Learath2/dd_pr_demoload 
Always try extracting map before fail. Fix #1886
 2019-12-17 21:20:10 +01:00
Learath2 3784f5bea4 Use a UUID, Cleanup code and UI 2019-12-17 15:44:54 +01:00
bors[bot] 4a83a42f14
Merge #1981 
1981: Fix: background colors being set to white r=def- a=Aerll

After changing either of background colors in ddnet tab in settings and reopening the client, both become white.

Co-authored-by: Aerll <31746984+aerll@users.noreply.github.com>
 2019-12-10 12:34:48 +00:00
def 8639c902ae map_convert_07: use regular paths 2019-12-08 23:14:56 +01:00
Aerll ff685ac1e0
fix ub 2019-12-08 20:08:00 +01:00
ChillerDragon 1a957f0abe Fix typo 'user' -> 'use' 2019-11-05 09:16:54 +01:00
def 258eaf5a98 Fix uninitialized variable 
As reported by valgrind --tool=memcheck:

[201==344082== Conditional jump or move depends on uninitialised value(s)
==344082==    at 0x483BC85: strlen (vg_replace_strmem.c:461)
==344082==    by 0x5B9E61D: __vfprintf_internal (in /usr/lib/libc-2.30.so)
==344082==    by 0x5BB0409: __vsnprintf_internal (in /usr/lib/libc-2.30.so)
==344082==    by 0x222AE7: str_format (system.c:2350)
==344082==    by 0x2196AB: CStorage::GetPath(int, char const*, char*, unsigned int) (storage.cpp:274)
==344082==    by 0x219DDD: CStorage::RemoveFile(char const*, int) (storage.cpp:409)
==344082==    by 0x255D3C: CClient::DemoRecorder_Stop(int, bool) (client.cpp:3546)
==344082==    by 0x2569E7: CClient::ConchainReplays(IConsole::IResult*, void*, void (*)(IConsole::IResult*, void*), void*) (client.cpp:3727)
==344082==    by 0x1F4659: CConsole::Con_Chain(IConsole::IResult*, void*) (console.cpp:1169)
==344082==    by 0x1E4C2C: CConsole::ExecuteLineStroked(int, char const*, int, bool) (console.cpp:504)
==344082==    by 0x1E4F37: CConsole::ExecuteLine(char const*, int, bool) (console.cpp:558)
==344082==    by 0x1E5240: CConsole::ExecuteFile(char const*, int, bool, int) (console.cpp:604)
 2019-11-03 18:05:42 +01:00
sirius 8c48e7d633 some small changes 2019-11-03 11:20:24 +08:00
sirius 4cc03af9a9 remove useless functions for previous audio sync 2019-11-02 18:32:48 +08:00
sirius e910fe404f Direct mix when recording audio now, and seems solve the stuck problem when 
DDNet is not the focusing window
 2019-11-02 18:21:47 +08:00
Sirius 45263ebdd0
Merge branch 'master' into demo_render2 2019-10-31 22:08:49 +08:00
sirius ae1ff28579 not abort sample when sync now 2019-10-31 22:01:12 +08:00
sirius 5ad8028aa4 sync audio frame with video frame number 2019-10-31 20:02:41 +08:00
sirius 99f6b66fbd solve sync between video and audio by magic number 2019-10-31 17:37:38 +08:00
sirius 9866a73b1c sync audio and video 2019-10-26 19:54:25 +08:00
Learath 7cdd050fee Add SHA to demos. Bump Demo Version 2019-10-14 02:27:08 +02:00
Learath b2cefb20ed Always try extracting map before fail. Fix #1886 2019-10-13 18:46:28 +02:00
12pm 36df86fcd2 Add toggle keyboard shortcuts button to demo player 
Demo shortcuts can be annoying if you have other binds on them.

Icons made by eNJi
 2019-10-05 18:06:58 +02:00
bors[bot] e7ea336a94
Merge #1925 #1929 
1925: Don't bundle libcurl for Linux r=Learath2 a=heinrich5991

It's installed basically everywhere and just increases release size.
They're serious about backward compatibility and haven't had a breaking
change in ages.

1929: Remove space at end of cfg description r=Learath2 a=ChillerDragon

Happy hacktoberfest :octocat: 

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-10-02 17:25:02 +00:00
ChillerDragon 3777021383 Remove space at end of cfg description 2019-10-02 17:15:42 +02:00
sirius 1375fbb95d add a button to render whole demo 2019-09-30 20:52:24 +08:00
HMH 41da2f4497 removed superfluous const 2019-09-30 20:48:50 +08:00
H-M-H 4b86630b42 fps for videos configurable and videos are stored at a proper location 2019-09-30 20:48:47 +08:00
H-M-H 2f71720fb1 correct time after stopping recording a video 2019-09-30 20:48:47 +08:00
H-M-H ab9e716444 fixed compiling on linux 2019-09-30 20:48:47 +08:00
H-M-H 7ae4b39574 made recording demos work 
- videorecorder only works for recording demos now
- demoplayer was modified to allow controll over the time that passed
  in order to get perfect fps, IVideo controlls how much time passed,
  basically every rendercall sets the time to record the next frame
 2019-09-30 20:48:47 +08:00
trml bb5eab0cc0 Add tunezone prediction 2019-09-09 00:53:07 +02:00
def cb738ffed0 Fix show_ips to show regular formatting (fixes #1873) 2019-08-01 20:24:30 +02:00
fokkonaut 5c280a3c9d
Fix blockZ and infectionZ 
I talked to coffee (creator of both mods) and he said it is okay to use zoom on the mods, also: eye emotes work there so the eye wheel is also supported. I have updated both mods to ddnet master so they have all the new stuff
 2019-07-24 06:52:32 +02:00
bors[bot] 658efe776b Merge #1845 
1845: Fix infectionZ gamemode seen as DDNet r=heinrich5991 a=fokkonaut

InfectionZ's gametype is somehow infection, instead of infectionZ

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2019-07-21 08:32:59 +00:00
fokkonaut a8756f99e0 Fix infectionZ gamemode seen as DDNet 2019-07-21 10:03:27 +02:00
bors[bot] ebeeace65e Merge #1841 
1841: Restart required message when changing Show console r=heinrich5991 a=fokkonaut



Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2019-07-19 00:16:01 +00:00
fokkonaut 78f52629e4 fix build 2019-07-19 01:58:49 +02:00
Learath2 8469949257 Remove debug message 2019-07-02 14:56:02 +02:00
Learath2 1993989067 Fix toggle not working with colors 2019-07-02 14:54:06 +02:00
heinrich5991 62846821da Revert "Implement ISDDNET. Deprecates #1320" 
This reverts commit 1929bc6739.
 2019-06-14 00:28:59 +02:00
heinrich5991 f31e081bd4 Remove all checking for the gametype in the game 
OK, maybe not actually remove because it is kept for fallback when the
new method isn't available.

The whole gametype parsing business had the same downsides as user agent
parsing on the web, hence I removed it while keeping behavior the same.

This allows servers to explicitly opt in or out of certain bug
workarounds and other client behavior. This increases the complexity of
different configurations that are available in the client (which is a
bad thing).
 2019-06-14 00:28:59 +02:00
bors[bot] f8ba394c5d Merge #1781 
1781: sv_server_info_per_second, sv_van_conn_per_second: allow 0 to disable r=heinrich5991 a=def-

Clean up code a bit, also allow larger values

Co-authored-by: def <dennis@felsin9.de>
 2019-06-12 20:23:27 +00:00
Dennis Felsing 0d9952b32a
Merge pull request #1748 from archimede67/pr_replays 
Replay system (demo after-the-fact)
 2019-06-11 18:13:26 +02:00
def 85bb376bdc sv_server_info_per_second, sv_van_conn_per_second: allow 0 to disable 
Clean up code a bit, also allow larger values
 2019-06-11 18:12:43 +02:00
Dennis Felsing 0992e3c7c4
Merge pull request #1777 from ChillerDragon/pr_demo_wrong_hash 
Prefer downloadedmaps over maps ( #1702 )
 2019-06-11 18:05:12 +02:00
Dennis Felsing bbb1b2cdef
Merge pull request #1733 from Learath2/dd_pr_colorsigned 
Store colors unsigned
 2019-06-11 12:26:28 +02:00
ChillerDragon 839009fc93 Prefer downloadedmaps over maps ( #1702 ) 
Fixes corrupted demos if there is a different version of the current map in the maps/ folder.
Thanks to @archimede67 for initial research.
 2019-06-05 22:24:17 +02:00
archimede67 929bf57bf6 infinite length and a lot of changes including notifications are now chat messages 2019-06-05 19:17:55 +02:00
Corantin H 2e27a22927 typo + added an optional argument to save_replay + changed max replay length and fixed cl_notification_time values 2019-06-02 15:34:01 +02:00
Corantin H 761e73a131 should be thread safe now + moved demoedit to a new file 2019-05-31 20:42:28 +02:00
Corantin H e35951dedc demo slicing is now done in a separate task to prevent ingame freeze 2019-05-25 00:24:13 +02:00
Corantin H bf435e8b72 coding style + added cl_notification_time 2019-05-23 23:17:12 +02:00
Corantin H 858a85e7b5 fixed some typo errors, fixed code style and added a slider setting to set the replay length 2019-05-21 23:59:57 +02:00
Corantin H b6b8f7e536 Somehow build failed because of that 2019-05-21 18:04:37 +02:00
Learath 1929bc6739 Implement ISDDNET. Deprecates #1320 2019-05-21 10:25:15 +02:00
Learath 23255a04b3 Remove time-score 2019-05-21 10:24:07 +02:00
Corantin H 817bdaf9cd initial work on a replay system 2019-05-20 23:55:40 +02:00
Kpro998 f3ff81e5ab fix IsBlockInfectionZ duplication 2019-05-19 22:35:56 +01:00
Kpro998 0856fec38e fix particles, emote wheel, zoom and score for blockworlds 2019-05-19 22:11:16 +01:00
Learath db5c17ce71 Avoid implementation-defined behaviour 2019-05-15 18:11:22 +02:00
Learath 0d39eb128d Use unsigned integers for colors 2019-05-15 18:05:19 +02:00
Learath2 e608e2f34f Add Hex display 2019-05-11 02:32:37 +02:00
Learath2 0dd67c92f1 Abbreviate alpha 2019-05-11 02:16:48 +02:00
Learath2 82e6d180e4 Use % and ° 2019-05-11 02:12:37 +02:00
Learath2 b059ac256e Show Alpha only if it's relevant 2019-05-11 02:12:36 +02:00
Dennis Felsing 2396096e3b
Merge branch 'master' into pr-rename-col 2019-05-10 23:46:38 +02:00
12pm ea324592c6 Change col to color in variable names 2019-05-10 23:34:21 +02:00
12pm eda002993e Restore old echo default color 2019-05-10 23:07:32 +02:00
trml 8eb4b7fd71 Add setting cl_predict_freeze 2 for having a small amount of misprediction while frozen 2019-05-05 12:32:06 +02:00
Learath b86c457c91 Remember whether a color is lit or not 2019-05-01 23:35:29 +03:00
Learath f479f69735 Add a flag for colors with alpha 2019-05-01 13:58:51 +03:00
Learath 324c389e87 Accept negatives aswell, don't clamp 2019-05-01 13:41:58 +03:00
Learath 588acdda0d Consolidate color configs, extend debugging 2019-04-27 02:02:31 +03:00
Learath 93d14a1eca Inconvenience for windows 2019-04-26 22:36:49 +03:00
Learath ffa07d88cb Please -WError 2019-04-26 19:11:34 +03:00
Learath 69d78c21b4 Lighten tee colors 2019-04-26 16:38:16 +03:00
Learath 93265dbb9c Please MSVC 2019-04-25 21:09:32 +03:00
Learath e637064a68 Don't store HSL separately 2019-04-25 19:49:27 +03:00
Learath 95a3a69e08 Start phasing out vectors for colors 2019-04-25 18:21:35 +03:00
Learath cc319e0152 Fix warnings and style 2019-04-25 15:04:36 +03:00
Learath 0f781df1dd Try handling colors in console 2019-04-25 14:48:53 +03:00
trml 0b3f3b03b5 Rewrite of prediction code, with additional prediction 2019-04-21 16:12:20 +02:00
12pm 6e880644af Add some demo player shortcuts 2019-04-15 21:08:12 +02:00
Dennis Felsing cde07b420b Implement changes suggested by -Wuseless-cast 
But don't enable it yet because I'm not sure what the best way is.
 2019-04-11 19:54:43 +02:00
bors[bot] 279eeed9fc Merge #1614 
1614: Remove unmaintained Android code (fixes #1575) r=heinrich5991 a=def-

Thoughts?

Co-authored-by: def <dennis@felsin9.de>
 2019-04-11 00:02:17 +00:00
def b91530eedc Console: Can't deallocate temp entries, so don't even try 2019-04-10 23:32:45 +02:00
def 94f3d97ddf Remove unmaintained Android code (fixes #1575) 2019-04-10 19:40:50 +02:00
Jordy Ruiz 1e0cc51ba1 Add bound check in datafile.cpp anywhere m_ppDataPtrs is accessed as an array. Should fix #2073 
(cherry picked from commit e086f4b35b)
 2019-04-07 13:10:07 +02:00
heinrich5991 e3657ab2d5 Use SHA256 instead of MD5 in some places 
This only works in places where the actual choice of hashing function
doesn't matter.
 2019-04-06 02:56:29 +02:00
heinrich5991 e44b1ca986 Use OpenSSL md5 if it is available 
Fixes #1582.
 2019-04-06 02:56:29 +02:00
Dennis Felsing fc76c2219f
Merge pull request #1566 from def-/pr-demo-speed 
Demo speed improvements
 2019-04-03 19:02:42 +02:00
def 989726db00 Allow demo speeds up to 256 2019-04-02 23:16:01 +02:00
def 392fe03844 Enable gun sound by default 2019-04-02 21:52:02 +02:00
Dennis Felsing 0b578c4330 Fix cl_confirm_disconnect/quit_time (fixes #1550) 
-1 now works as described
Split into two settings
 2019-03-29 14:56:02 +01:00
Dennis Felsing 95cc357dd6
Merge pull request #1540 from def-/pr-disconnect-time 
Add cl_confirm_disconnect_quit_time (fixes #1530)
 2019-03-28 23:38:16 +01:00
def 8908102536 Add cl_confirm_disconnect_quit_time (fixes #1530) 
Number of minutes of active racing time before being asked to confirm
disconnecting, disconnecting dummy or quitting through GUI. Defaults to
20 minutes, -1 to disable, 0 to always enable.

Also removed confirmation to quit when in main menu, except when having
an unsaved map in editor.

Spectate and kill should already be safe thanks to server-side kill
protection.
 2019-03-25 20:10:38 +01:00