Commit graph

9940 commits

Author SHA1 Message Date
heinrich5991 8c4569991d Fix indentation and formatting of str_clean_whitespaces
(cherry picked from commit b9c4086382)
2020-01-19 22:38:08 +01:00
KillaBilla 75d076b3bc changed str_clean_whitespace implementation to pkoerner's one
(cherry picked from commit a9cc1e8de2)
2020-01-19 22:37:57 +01:00
KillaBilla ba1abac52f remove leading and trailing space from server name and forbit the use of multiple spaces
(cherry picked from commit a9cc1e8de2)
2020-01-19 22:28:19 +01:00
oy 1b4131a7fd fixed faulty message id
(cherry picked from commit 9023796d27)
2020-01-19 21:30:12 +01:00
bors[bot] 1e257deb26
Merge #2039
2039: Add set_src to be more teeworlds compatible r=heinrich5991 a=ChillerDragon

thanks to @heinrich5991

Co-authored-by: ChillerDragon <ChillerDragon@gmail.com>
2020-01-19 19:38:54 +00:00
ChillerDragon 01f42089f3 Add set_src to be more teeworlds compatible
thanks to @heinrich5991
2020-01-19 20:38:11 +01:00
bors[bot] 8f9fc8c3d4
Merge #2038
2038: Overkill optimize editor code runs 200 fps faster r=Learath2 a=ChillerDragon



Co-authored-by: ChillerDragon <ChillerDragon@gmail.com>
2020-01-19 17:09:59 +00:00
ChillerDragon 949aa124e9 Overkill optimize editor code runs 200 fps faster 2020-01-19 17:48:07 +01:00
bors[bot] 77a4cd5b01
Merge #2035
2035: Fix rotating rotatable tiles in switch layer r=def- a=12pm



Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
2020-01-17 18:21:10 +00:00
12pm 82ac6091eb Fix rotating rotatable tiles in switch layer 2020-01-17 18:22:41 +01:00
bors[bot] f24369b8f6
Merge #2034
2034: Fix del key removing commands while in editbox r=def- a=archimede67

This fixes a problem in the editor server settings, if you were to press the del key in the editbox while having a command selected, it deletes it.

Now you can press that key in the editbox without any worry of deleting any selected command.

Co-authored-by: Corantin H <archi0670@gmail.com>
2020-01-16 14:11:29 +00:00
Corantin H a73525361b Fix del key removing commands while in editbox 2020-01-16 15:01:45 +01:00
Dennis Felsing dcd8148d9a
Merge pull request #2033 from def-/pr-fix-crash
Fix crash on pDDNetCharacter
2020-01-16 12:41:42 +01:00
Dennis Felsing fcc25dfc65 Fix crash on pDDNetCharacter 2020-01-16 12:35:26 +01:00
bors[bot] 693b085a9c
Merge #2032
2032: Restore rcon `rifle` compatibility shim r=def- a=heinrich5991

Two more lines to keep backward compatibility.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2020-01-12 16:55:13 +00:00
heinrich5991 fe1cf90327 Restore rcon rifle compatibility shim
Two more lines to keep backward compatibility.
2020-01-12 13:59:55 +01:00
sirius d6dc811674 seems fluent problem solved, and fix a error when compile by msvs 2020-01-12 16:57:40 +08:00
def 50f3023b34 Fix ddnet-libs subproject hash 2020-01-10 21:40:28 +01:00
Dennis Felsing fd0b9bc8ba
Merge pull request #2013 from heinrich5991/pr_ddnet_stub_curl
Eliminate static libcurl dependency, second try
2020-01-10 21:38:43 +01:00
bors[bot] 68739eea1f
Merge #2029
2029: Properly display hdiutil status in CMake r=Learath2 a=heinrich5991

(cherry picked from commit cc2be456d4)

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2020-01-08 09:38:50 +00:00
bors[bot] 173ca2e179
Merge #2026
2026: Only start showing emoticons after their start tick has passed (fixes #2025) r=Learath2 a=def-

Since we can go back in time in demo player

Co-authored-by: def <dennis@felsin9.de>
2020-01-08 09:27:09 +00:00
sirius 483885b6b1 try to solve the problem that video not fluent caused by previous commits 2020-01-08 14:25:06 +08:00
sirius d45b66938d make latter to wait when write_frame collision between audio and video 2020-01-07 11:32:56 +08:00
bors[bot] 7d7b51011d
Merge #2030
2030: Move /list to ddracechat r=def- a=fokkonaut



Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
2020-01-06 21:39:19 +00:00
fokkonaut c27e28b7ad Move /list to ddracechat 2020-01-06 17:29:31 +01:00
sirius 3baba93ed2 fix the problem of audio when video fps is low 2020-01-06 11:57:24 +08:00
heinrich5991 c3b79c7d7f Eliminate static libcurl dependency, second try
Last try was #1925.
2020-01-05 17:59:37 +01:00
heinrich5991 96069f42a9 Add a script to generate a stub libcurl library
Linking to this library will make DDNet compatible with all distros that
ship libcurl.so.4 with arbitrary version data attached. Distros
sometimes add versioning information to the symbols exported by curl
that artificially (because they're compatible with each other) limit
where our releases can be executed if dynamically linked.

This should reduce release size a bit and let's us take advantage of
automatically updated libraries.
2020-01-05 17:58:52 +01:00
heinrich5991 2fa80d0a67 Properly display hdiutil status in CMake
(cherry picked from commit cc2be456d4)
2020-01-05 17:51:19 +01:00
bors[bot] 77957c00b9
Merge #2028
2028: Simplify anti stuck code more r=def- a=fokkonaut



Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
2020-01-05 14:53:47 +00:00
fokkonaut f5b8bbc2ff Simplify anti stuck code more 2020-01-05 11:49:21 +01:00
sirius 779afcb771 crf and preset can be set by variables 2020-01-05 11:18:51 +08:00
bors[bot] 19779ccf94
Merge #2027
2027: Distance can't be negative r=def- a=fokkonaut

This removes code duplication and D can never be negative:

```template<typename T>
inline T distance(const vector2_base<T> &a, const vector2_base<T> &b)
{
	return length(a-b);
}
inline float length(const vector2_base<float> &a)
{
	return sqrtf(a.x*a.x + a.y*a.y);
}```

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
2020-01-04 22:42:32 +00:00
fokkonaut e2b252b714 Distance can't be negative 2020-01-04 16:32:51 +01:00
sirius 0be4629cc1 forget to deal with pError 2020-01-04 17:44:12 +08:00
sirius 3967ddba00 replace same operations by call Demoplay_Play() when rendering video by render button 2020-01-04 17:08:00 +08:00
def 54d4aef145 Only start showing emoticons after their start tick has passed (fixes #2025)
Since we can go back in time in demo player
2020-01-04 10:07:14 +01:00
sirius 521e822bbb update map fix part when rendering video 2020-01-04 17:02:00 +08:00
sirius 5350a12185 fix wired sound 2020-01-04 10:17:16 +08:00
def 600a3b0bad Fix preprocessor 2020-01-03 22:07:02 +01:00
def 511c9d248e Fix alignment of pixels for reading to video recorder 2020-01-03 21:43:15 +01:00
def 1e36b4df15 Move some code out as a small optimization 2020-01-03 21:42:53 +01:00
def 8d716452ba Fix sizes so that we don't write too far 2020-01-03 21:42:19 +01:00
def 54ae929b2f Disallow resizing windows when videorecorder is compiled in 2020-01-03 21:40:41 +01:00
def a0362019f0 Initialize m_NextaFrame 2020-01-03 20:37:27 +01:00
bors[bot] af6d463fb6
Merge #2024
2024: Fix demo bug r=def- a=Learath2

Since no one else was willing to fix it, I whipped up a quick patch. This isn't the correct way to do this though. We should probably add a function in storage to search for maps, so that things can't end up out of sync ever again.

Co-authored-by: Learath <learath2@gmail.com>
2020-01-03 09:43:40 +00:00
Learath d2fad6c79a Fix demo bug 2020-01-03 12:13:40 +03:00
sirius 6803726209 extend sound buffer, try to solve segment fault problem 2020-01-03 10:26:10 +08:00
bors[bot] cfbe8f3a8d
Merge #2020
2020: Bundled libs update r=heinrich5991 a=def-

- ogg 1.3.3 -> 1.3.4
- freetype 2.10.0 -> 2.10.1
- curl 7.65.0 -> 7.67.0, openssl 1.1.1c -> 1.1.1d

Co-authored-by: Dennis Felsing <dennis@felsin9.de>
2020-01-01 19:29:37 +00:00
bors[bot] 1649c566ab
Merge #2023
2023: Move DDNet-custom json code out of external directory (fixes #2022) r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
2020-01-01 19:17:13 +00:00