Commit graph

10057 commits

Author SHA1 Message Date
Learath e567fde9d7 Names aren't unique, thinner popup 2020-01-23 21:24:48 +01:00
Learath a2eee9a8db Truncate properly 2020-01-23 20:48:42 +01:00
Emir Marincic 5c4fd72073
Merge pull request #2046 from 12pm/pr_fix_env_append
Modify envelope index when appending maps
2020-01-23 20:28:04 +01:00
Learath 2abe4fbcfb Display envelope name 2020-01-23 20:27:01 +01:00
bors[bot] 4ef9866b84
Merge #2047
2047: Try fix bors r=Learath2 a=Learath2



Co-authored-by: Learath <learath2@gmail.com>
2020-01-23 18:31:39 +00:00
Learath 62105bc3d7 Try fix bors 2020-01-23 19:29:58 +01:00
12pm 9dcfcc8f10 Modify envelope index when appending maps
fixes #2044
2020-01-23 18:30:55 +01:00
Emir Marincic 87c71b8270
Update badges 2020-01-23 16:32:42 +01:00
Emir Marincic 2335959161
Merge pull request #2045 from Learath2/dd_pr_actions
Migrate to github actions
2020-01-23 16:25:05 +01:00
Learath 696532689c Fix package names 2020-01-23 16:13:54 +01:00
Learath 4451fed535 Fix missing include 2020-01-23 16:07:40 +01:00
Learath a9e3a4029a Migrate to Github Actions 2020-01-23 16:01:52 +01:00
bors[bot] a47a94ee0e
Merge #2042
2042: Check snap r=def- a=ChillerDragon



Co-authored-by: oy <Tom_Adams@web.de>
Co-authored-by: ChillerDragon <ChillerDragon@gmail.com>
2020-01-22 13:02:04 +00:00
ChillerDragon 610976eddd Fix max snapshot size 2020-01-22 13:44:05 +01:00
ChillerDragon ee825f42e9 Add snap check for dummy 2020-01-21 22:20:09 +01:00
oy 49168da784 fixed typo
(cherry picked from commit 3deb58d409)
2020-01-21 22:17:20 +01:00
oy ef3bce204c added some checks to snap handling
(cherry picked from commit a09d498bc9)
2020-01-21 22:16:28 +01:00
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